43194対応

public_new/js/chat-ui-collaboration.js

@@ -124,7 +124,6 @@ CHAT_UI.refreshMyGroupForAddUserInCollaboration = function () {
 
 
   if (IS_ONLINE == "true") {
   if (IS_ONLINE == "true") {
     if (typeof android != "undefined") {
     if (typeof android != "undefined") {
-      android.updateGroupInfo("0");
       android.updateMyInfo();
       android.updateMyInfo();
       android.updateGroupUser();
       android.updateGroupUser();
       android.updateFavorite();
       android.updateFavorite();
@@ -196,7 +195,7 @@ CHAT_UI.refreshAllGroupForAddUserInCollaboration = function (paramGroupId) {
   //オンライン状態であればサーバから情報更新。
   //オンライン状態であればサーバから情報更新。
   if (IS_ONLINE == "true") {
   if (IS_ONLINE == "true") {
     if (typeof android != "undefined") {
     if (typeof android != "undefined") {
-      android.updateGroupInfo(groupId);
+      android.updateGroupUser();
     } else {
     } else {
       webkit.messageHandlers.updateGroupInfo.postMessage(groupId);
       webkit.messageHandlers.updateGroupInfo.postMessage(groupId);
     }
     }

public_new/js/share.js

@@ -314,6 +314,47 @@ document.addEventListener("DOMContentLoaded", function () {
             HostRequestFlag.DONE
             HostRequestFlag.DONE
           );
           );
         }
         }
+      } else if (data.type === "GET_COLLABORATION_TYPE" && g_isMainMan) {
+        fw.sendToMsg("others", "GET_COLLABORATION_TYPE_RESPONSE", {
+          loginId: data.payload.loginId,
+          collaborationType: joinCollaborationType,
+          newMeetingId: joinMeetingId,
+        });
+      } else if (data.type === "GET_COLLABORATION_TYPE_RESPONSE") {
+        if (data.payload.loginId == globalUserInfo.loginId) {
+          if (
+            CHAT_UTIL.isAndroid() &&
+            data.payload.collaborationType == COLLABORATION_TYPE.DOCUMENT &&
+            androidVersion < ANDROID_SDK_VERSION.O
+          ) {
+            coview_api.HeartBeatUser(globalUserInfo.loginId);
+            alert(getLocalizedString("not_support_version"));
+            joinCollaborationType = COLLABORATION_TYPE.CAMERA;
+          } else {
+            joinCollaborationType = data.payload.collaborationType;
+          }
+          joinMeetingId = data.payload.newMeetingId;
+          initCollaborationUI(joinCollaborationType);
+          if (CHAT_UTIL.isIOS()) {
+            webkit.messageHandlers.joinChangedCollaboration.postMessage({
+              joinCollaborationType: joinCollaborationType,
+              meetingId: data.payload.newMeetingId,
+            });
+            if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
+              webkit.messageHandlers.joinMeetingRoom.postMessage(
+                data.payload.newMeetingId
+              );
+            }
+          } else if (CHAT_UTIL.isAndroid()) {
+            android.joinChangedCollaboration(
+              joinCollaborationType,
+              data.payload.newMeetingId
+            );
+            if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
+              android.joinMeetingRoom(data.payload.newMeetingId);
+            }
+          }
+        }
       }
       }
     });
     });
   });
   });
@@ -321,6 +362,11 @@ document.addEventListener("DOMContentLoaded", function () {
   coview_api.addEventListener("start", function () {
   coview_api.addEventListener("start", function () {
     console.log("=============> START : share start");
     console.log("=============> START : share start");
     scrollLockON();
     scrollLockON();
+    if (collaborationJoinFlg == "2") {
+      fw.sendToMsg("others", "GET_COLLABORATION_TYPE", {
+        loginId: globalUserInfo.loginId,
+      });
+    }
     $("#loadingIndicator").removeClass("full_active");
     $("#loadingIndicator").removeClass("full_active");
   });
   });
 
 
@@ -575,6 +621,7 @@ function changeCollaboration(changeCollaborationType) {
   } else if (CHAT_UTIL.isAndroid()) {
   } else if (CHAT_UTIL.isAndroid()) {
     android.changeCollaboration(changeCollaborationType, newMeetingId);
     android.changeCollaboration(changeCollaborationType, newMeetingId);
   }
   }
+  joinMeetingId = newMeetingId;
   fw.sendToMsg("others", "CHANGE_COLLABORATION", {
   fw.sendToMsg("others", "CHANGE_COLLABORATION", {
     collaborationType: changeCollaborationType,
     collaborationType: changeCollaborationType,
     newMeetingId: newMeetingId,
     newMeetingId: newMeetingId,