43194追加対応

public_new/js/share.js

@@ -321,6 +321,8 @@ document.addEventListener("DOMContentLoaded", function () {
           newMeetingId: joinMeetingId,
           newMeetingId: joinMeetingId,
         });
         });
       } else if (data.type === "GET_COLLABORATION_TYPE_RESPONSE") {
       } else if (data.type === "GET_COLLABORATION_TYPE_RESPONSE") {
+        console.log('------------------123123123--------------------------------------------------------');
+        console.log(data.payload.newMeetingId);
         if (data.payload.loginId == globalUserInfo.loginId) {
         if (data.payload.loginId == globalUserInfo.loginId) {
           if (
           if (
             CHAT_UTIL.isAndroid() &&
             CHAT_UTIL.isAndroid() &&
@@ -355,6 +357,13 @@ document.addEventListener("DOMContentLoaded", function () {
             }
             }
           }
           }
         }
         }
+      } else if (data.type === "API_WELCOME") {
+        if (collaborationJoinFlg == "2") {
+          fw.sendToMsg("others", "GET_COLLABORATION_TYPE", {
+            loginId: globalUserInfo.loginId,
+          });
+          collaborationJoinFlg = "1";
+        }
       }
       }
     });
     });
   });
   });
@@ -362,11 +371,6 @@ 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");
   });
   });
 
 
@@ -436,6 +440,7 @@ document.addEventListener("DOMContentLoaded", function () {
             } else if (CHAT_UTIL.isAndroid()) {
             } else if (CHAT_UTIL.isAndroid()) {
               meetingId = android.createContentView();
               meetingId = android.createContentView();
             }
             }
+            joinMeetingId = meetingId;
           }
           }
         } else if (collaborationJoinFlg == "2") {
         } else if (collaborationJoinFlg == "2") {
           coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
           coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);