Commit ab9731a0 by Kim Jinsung

Merge branch 'develop_kimjs' into 'develop'

Bug #44079【ABook Communication】協業接続中にホストを一度切り替えて行ってから、参加者側でホストリクエストすると、「既にホストリクエストが実行中です。」アラート表示し、リクエストができない

See merge request !250
parents cbd17702 633fda6a
...@@ -72,6 +72,7 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) { ...@@ -72,6 +72,7 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
FermiWebSocketMessageHandler.apiSendOwnerChangeComplete(data); FermiWebSocketMessageHandler.apiSendOwnerChangeComplete(data);
CollaborationFeature.updateHost(); CollaborationFeature.updateHost();
FermiWebSocketBridge.hostUpdated(); FermiWebSocketBridge.hostUpdated();
FermiWebSocketMessageHandler.hostRequestDone();
break; break;
case "API_SEND_OWNER_CHANGE_CONFIRM": case "API_SEND_OWNER_CHANGE_CONFIRM":
if (globalUserInfo.collaborationType == COLLABORATION_TYPE.CAMERA) { if (globalUserInfo.collaborationType == COLLABORATION_TYPE.CAMERA) {
...@@ -255,6 +256,10 @@ FermiWebSocketMessageHandler.changeHostApplyForHost = function (data) { ...@@ -255,6 +256,10 @@ FermiWebSocketMessageHandler.changeHostApplyForHost = function (data) {
NativeBridgeDelegate.setHostRequestFlg(HostRequestFlag.DONE); NativeBridgeDelegate.setHostRequestFlg(HostRequestFlag.DONE);
} else { } else {
FermiWebSocketBridge.hostRequestReject(hostID); FermiWebSocketBridge.hostRequestReject(hostID);
//上の実行した後、「CHANGE_HOST_APPLY」が受信され、ステータスが「DOING」になるので1秒後に実行
setTimeout(function () {
NativeBridgeDelegate.setHostRequestFlg(HostRequestFlag.DONE);
}, 1000);
} }
FermiWebSocketBridge.hostRequestDone(hostID); FermiWebSocketBridge.hostRequestDone(hostID);
}, 500); }, 500);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment