Merge branch 'communication/#42975_ios-host-request' into 'develop'

#42975　iOSのホスト変更ロジック適用

See merge request !154

public_new/js/chat-db.js

@@ -365,3 +365,10 @@ CHAT_DB.getJoinCollaborationType = function() {
         return parseInt(callNativeApp("getJoinCollaborationType", {}), 10);
         return parseInt(callNativeApp("getJoinCollaborationType", {}), 10);
     }
     }
 };
 };
+
+CHAT_DB.getHostRequestFlg = function() {
+    // Androidは実装不要
+    if (CHAT_UTIL.isIOS()) {
+        return parseInt(callNativeApp("getHostRequestFlg", {}), 10);
+    }
+};

public_new/js/share.js

@@ -186,14 +186,14 @@ $(function () {
         if (CHAT_UTIL.isAndroid()) {
         if (CHAT_UTIL.isAndroid()) {
           android.setHostRequestFlg(HOST_REQUEST_FLG.DOING);
           android.setHostRequestFlg(HOST_REQUEST_FLG.DOING);
         } else {
         } else {
-          //TODO ホストリクエスト中フラグを設定
+          webkit.messageHandlers.setHostRequestFlg.postMessage(HOST_REQUEST_FLG.DOING);
         }
         }
         if(g_isMainMan && confirm(getLocalizedString('norify_request_host_change', data.payload.hostId))) {
         if(g_isMainMan && confirm(getLocalizedString('norify_request_host_change', data.payload.hostId))) {
           Coview_changeHost(getFermiLoginId(data.payload.hostId));
           Coview_changeHost(getFermiLoginId(data.payload.hostId));
           if (CHAT_UTIL.isAndroid()) {
           if (CHAT_UTIL.isAndroid()) {
             android.setHostRequestFlg(HOST_REQUEST_FLG.DONE);
             android.setHostRequestFlg(HOST_REQUEST_FLG.DONE);
           } else {
           } else {
-            //TODO ホストリクエスト中フラグを設定
+            webkit.messageHandlers.setHostRequestFlg.postMessage(HOST_REQUEST_FLG.DONE);
           }
           }
           fw.sendToMsg('others', 'HOST_REQUEST_DONE', {"hostId": data.payload.hostId});
           fw.sendToMsg('others', 'HOST_REQUEST_DONE', {"hostId": data.payload.hostId});
         }
         }
@@ -201,7 +201,7 @@ $(function () {
         if (CHAT_UTIL.isAndroid()) {
         if (CHAT_UTIL.isAndroid()) {
           android.setHostRequestFlg(HOST_REQUEST_FLG.DONE);
           android.setHostRequestFlg(HOST_REQUEST_FLG.DONE);
         } else {
         } else {
-          //TODO ホストリクエスト中フラグを設定
+          webkit.messageHandlers.setHostRequestFlg.postMessage(HOST_REQUEST_FLG.DONE);
         }
         }
       }
       }
     });
     });
@@ -590,7 +590,7 @@ function applyForHostChange() {
   if (CHAT_UTIL.isAndroid()) {
   if (CHAT_UTIL.isAndroid()) {
     hostRequestFlg = android.getHostRequestFlg();
     hostRequestFlg = android.getHostRequestFlg();
   } else {
   } else {
-    //TODO ホストリクエスト中フラグを取得
+    hostRequestFlg = CHAT_DB.getHostRequestFlg();
   }
   }
   if (hostRequestFlg == HOST_REQUEST_FLG.DOING) {
   if (hostRequestFlg == HOST_REQUEST_FLG.DOING) {
     alert(getLocalizedString('already_processing_host_request'));
     alert(getLocalizedString('already_processing_host_request'));
@@ -599,7 +599,7 @@ function applyForHostChange() {
   if (CHAT_UTIL.isAndroid()) {
   if (CHAT_UTIL.isAndroid()) {
     android.setHostRequestFlg(HOST_REQUEST_FLG.DOING);
     android.setHostRequestFlg(HOST_REQUEST_FLG.DOING);
   } else {
   } else {
-    //TODO ホストリクエスト中フラグを設定
+    webkit.messageHandlers.setHostRequestFlg.postMessage(HOST_REQUEST_FLG.DOING);
   }
   }
   fw.sendToMsg('others', 'CHANGE_HOST_APPLY', {"hostId": CHAT.globalLoginParameter.loginId});
   fw.sendToMsg('others', 'CHANGE_HOST_APPLY', {"hostId": CHAT.globalLoginParameter.loginId});
 };
 };