協業内ユーザー招待機能追加実装

public_new/collaboration_picture.html

@@ -118,7 +118,6 @@
   </footer>
   <!-- フッター -->
   <div id="footer_collabo"></div>
-  <div id="loadingArea"></div>
 
   <script src="./js/libs/jquery-3.3.1.min.js"></script>
   <script src="./js/libs/socket.io.js"></script>
@@ -135,7 +134,6 @@
   <script src="./js/chat-ui.js"></script>
   <script src="./js/chat-util.js"></script>
   <script src="./js/chat-db.js"></script>
-  <script src="./js/loading.js"></script>
   <script src="./js/language.js"></script>
   <script src="./js/language_ko.js" charset="UTF-8"></script>
   <script src="./js/language_ja.js" charset="UTF-8"></script>
@@ -149,7 +147,6 @@
     $("#modal_collabo_change_host").load("./modal_collabo_change_host.html");
     $("#modal_collabo_capture").load("./modal_collabo_capture.html");
     $("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
-    $("#loadingArea").load("./loading.html");
     $("#collaboration_picture_overlay_menu").load("./collaboration_picture_overlay_menu.html");
     $("#zoom").load("./zoom.html");
 

public_new/collaboration_video.html

@@ -112,7 +112,6 @@
   </footer>
   <!-- フッター -->
   <div id="footer_collabo"></div>
-  <div id="loadingArea"></div>
 
   <script src="./js/libs/jquery-3.3.1.min.js"></script>
   <script src="./js/libs/socket.io.js"></script>
@@ -128,7 +127,6 @@
   <script src="./js/chat.js"></script>
   <script src="./js/chat-ui.js"></script>
   <script src="./js/chat-util.js"></script>
-  <script src="./js/loading.js"></script>
   <script src="./js/chat-db.js"></script>
   <script src="./js/language.js"></script>
   <script src="./js/language_ko.js" charset="UTF-8"></script>
@@ -144,7 +142,6 @@
     $("#modal_collabo_change_host").load("./modal_collabo_change_host.html");
     $("#modal_collabo_capture").load("./modal_collabo_capture.html");
     $("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
-    $("#loadingArea").load("./loading.html");
     $("#collaboration_video_overlay_menu").load("./collaboration_video_overlay_menu.html");
     $("#zoom").load("./zoom.html");
 
@@ -177,9 +174,6 @@
         console.log(collaborationJoinFlg);
       }
       globalUserInfo.coWorkType = collaborationTypeKey.VIDEO;
-      CHAT_SOCKET.connectSocket();
-      socket.emit('join', CHAT.globalLoginParameter, function() {
-      });
     };
   </script>
 </html>
\ No newline at end of file

public_new/collaboration_voice.html

@@ -62,7 +62,6 @@
 
   <!-- フッター -->
   <div id="footer_collabo"></div>
-  <div id="loadingArea"></div>
   <script src="./js/libs/jquery-3.3.1.min.js"></script>
   <script src="./js/libs/socket.io.js"></script>
   <script src="./js/libs/moment.js"></script>
@@ -74,7 +73,6 @@
   <script src="./js/constant.js"></script>
   <script src="./js/collaboration.js"></script>
   <script src="./js/common.js"></script>
-  <script src="./js/loading.js"></script>
   <script src="./js/chat.js"></script>
   <script src="./js/chat-ui.js"></script>
   <script src="./js/chat-util.js"></script>
@@ -92,7 +90,6 @@
     $("#modal_collabo_change_host").load("./modal_collabo_change_host.html");
     $("#modal_collabo_capture").load("./modal_collabo_capture.html");
     $("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
-    $("#loadingArea").load("./loading.html");
     $("#collaboration_voice_overlay_menu").load("./collaboration_voice_overlay_menu.html");
     $("#add_user_list").load("./modal_add_user_list.html");
 
@@ -125,10 +122,11 @@
         console.log(collaborationJoinFlg);
       }
       globalUserInfo.coWorkType = collaborationTypeKey.AUDIO;
-      CHAT_SOCKET.connectSocket();
-      socket.emit('join', CHAT.globalLoginParameter, function() {
-      });
-
+      if (collaborationJoinFlg != '2') {
+        CHAT_SOCKET.connectSocket();
+        socket.emit('join', CHAT.globalLoginParameter, function() {
+        });
+      }
     };
   </script>
 </body>

public_new/js/chat-ui.js

@@ -2837,7 +2837,7 @@ CHAT_UI.confirmInviteUserListInCollaboration = function() {
             userIdList.push(user.shopMemberId);
         })
         if (typeof(android) != "undefined") {
-            android.inviteUsers(userIdList.join(','), true);
+            android.inviteCollaboration(userIdList.join(','), CHAT_UTIL.getCollaborationType(globalUserInfo.coWorkType));
         } else {
             webkit.messageHandlers.inviteUsers.postMessage({"userIdList": userIdList.join(',')});
         }

public_new/js/share.js

@@ -154,6 +154,8 @@ $(function() {
                     coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
                 } else if (collaborationJoinFlg == '0') {
                     coview_api.CreateRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
+                } else if (collaborationJoinFlg == '2') {
+                    coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
                 }
                 Coview_moveToVideoShareArea();
                 break;
@@ -216,7 +218,11 @@ function Coview_moveToVideoShareArea() {
 
 function Coview_exitCollaboration() {
     coview_api.LeaveRoom();
-    CHAT_UI.joinRoom(CHAT.globalLoginParameter.roomId, CHAT.globalLoginParameter.name);
+    if (collaborationJoinFlg != '2') {
+        CHAT_UI.joinRoom(CHAT.globalLoginParameter.roomId, CHAT.globalLoginParameter.name);
+    } else {
+        android.openCommunicationHome();
+    }
 }
 
 function Coview_changeHost(userId) {