Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chat_webview
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abookCommunication
chat_webview
Commits
ca256da8
Commit
ca256da8
authored
Jun 01, 2021
by
Takatoshi Miura
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'communication/#42975_ios-host-request' into 'develop'
#42975 iOSのホスト変更ロジック適用 See merge request
!154
parents
95e6d2e1
479b028e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
public_new/js/chat-db.js
+7
-0
public_new/js/share.js
+5
-5
No files found.
public_new/js/chat-db.js
View file @
ca256da8
...
...
@@ -365,3 +365,10 @@ CHAT_DB.getJoinCollaborationType = function() {
return
parseInt
(
callNativeApp
(
"getJoinCollaborationType"
,
{}),
10
);
}
};
CHAT_DB
.
getHostRequestFlg
=
function
()
{
// Androidは実装不要
if
(
CHAT_UTIL
.
isIOS
())
{
return
parseInt
(
callNativeApp
(
"getHostRequestFlg"
,
{}),
10
);
}
};
public_new/js/share.js
View file @
ca256da8
...
...
@@ -186,14 +186,14 @@ $(function () {
if
(
CHAT_UTIL
.
isAndroid
())
{
android
.
setHostRequestFlg
(
HOST_REQUEST_FLG
.
DOING
);
}
else
{
//TODO ホストリクエスト中フラグを設定
webkit
.
messageHandlers
.
setHostRequestFlg
.
postMessage
(
HOST_REQUEST_FLG
.
DOING
);
}
if
(
g_isMainMan
&&
confirm
(
getLocalizedString
(
'norify_request_host_change'
,
data
.
payload
.
hostId
)))
{
Coview_changeHost
(
getFermiLoginId
(
data
.
payload
.
hostId
));
if
(
CHAT_UTIL
.
isAndroid
())
{
android
.
setHostRequestFlg
(
HOST_REQUEST_FLG
.
DONE
);
}
else
{
//TODO ホストリクエスト中フラグを設定
webkit
.
messageHandlers
.
setHostRequestFlg
.
postMessage
(
HOST_REQUEST_FLG
.
DONE
);
}
fw
.
sendToMsg
(
'others'
,
'HOST_REQUEST_DONE'
,
{
"hostId"
:
data
.
payload
.
hostId
});
}
...
...
@@ -201,7 +201,7 @@ $(function () {
if
(
CHAT_UTIL
.
isAndroid
())
{
android
.
setHostRequestFlg
(
HOST_REQUEST_FLG
.
DONE
);
}
else
{
//TODO ホストリクエスト中フラグを設定
webkit
.
messageHandlers
.
setHostRequestFlg
.
postMessage
(
HOST_REQUEST_FLG
.
DONE
);
}
}
});
...
...
@@ -590,7 +590,7 @@ function applyForHostChange() {
if
(
CHAT_UTIL
.
isAndroid
())
{
hostRequestFlg
=
android
.
getHostRequestFlg
();
}
else
{
//TODO ホストリクエスト中フラグを取得
hostRequestFlg
=
CHAT_DB
.
getHostRequestFlg
();
}
if
(
hostRequestFlg
==
HOST_REQUEST_FLG
.
DOING
)
{
alert
(
getLocalizedString
(
'already_processing_host_request'
));
...
...
@@ -599,7 +599,7 @@ function applyForHostChange() {
if
(
CHAT_UTIL
.
isAndroid
())
{
android
.
setHostRequestFlg
(
HOST_REQUEST_FLG
.
DOING
);
}
else
{
//TODO ホストリクエスト中フラグを設定
webkit
.
messageHandlers
.
setHostRequestFlg
.
postMessage
(
HOST_REQUEST_FLG
.
DOING
);
}
fw
.
sendToMsg
(
'others'
,
'CHANGE_HOST_APPLY'
,
{
"hostId"
:
CHAT
.
globalLoginParameter
.
loginId
});
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment