Merge branch 'release_sp3' into 'release_sp3_host_exit_event'

# Conflicts:
#   public_new/js/share.js

public_new/collaboration_picture.html

@@ -27,6 +27,7 @@
       <div class="collabo_nav_r">
         <div class="text-right d-flex align-items-center">
           <button type="button" name="button" class="btn user_btn"></button>
+          <button type="button" name="button" class="btn add_user_btn none"></button>
           <!-- <button type="button" name="button" class="btn exit_btn" onclick="Coview_exitCollaboration();"></button> -->
         </div>
       </div>
@@ -53,6 +54,7 @@
 
   <!-- ユーザー追加オーバーレイ -->
   <div id="add_user_list"></div>
+  <div id="modal_add_user_confirm" ></div>
 
   <!-- オーバーレイ　メニュー -->
   <div id="collaboration_picture_overlay_menu"></div>
@@ -118,7 +120,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 +136,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,8 +149,8 @@
     $("#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");
+    $("#add_user_list").load("./modal_add_user_list.html");
     $("#zoom").load("./zoom.html");
 
     let CHAT_SERVER_URL = '';
@@ -160,13 +160,20 @@
     let IS_MOBILE = true;
     let IS_ONLINE = false;
     let collaborationJoinFlg = 0;
+    let roomType;
 
     if (typeof(android) != "undefined") {
       android.getLoginParameter();
       android.getGlobalParameter();
+      roomType = android.getRoomType();
     } else {
       webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
       webkit.messageHandlers.getGlobalParameter.postMessage({});
+      roomType = CHAT_DB.getRoomType();
+    }
+
+    if (roomType == chatRoomType.DM) {
+        $('.add_user_btn').removeClass('none');
     }
 
     async function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
@@ -182,9 +189,11 @@
         console.log(collaborationJoinFlg);
       }
       globalUserInfo.coWorkType = collaborationTypeKey.CAMERA;
+      if (collaborationJoinFlg != '2') {
         CHAT_SOCKET.connectSocket();
         socket.emit('join', CHAT.globalLoginParameter, function() {
         });
+      }
     };
   </script>
 </body>

public_new/collaboration_video.html

@@ -26,6 +26,7 @@
       <div class="collabo_nav_r">
         <div class="text-right d-flex align-items-center">
           <button type="button" name="button" class="btn user_btn"></button>
+          <button type="button" name="button" class="btn add_user_btn none"></button>
           <!-- <button type="button" name="button" class="btn exit_btn" onclick="Coview_exitCollaboration();"></button> -->
         </div>
       </div>
@@ -52,6 +53,7 @@
 
   <!-- ユーザー追加オーバーレイ -->
   <div id="add_user_list"></div>
+  <div id="modal_add_user_confirm" ></div>
 
   <!-- オーバーレイ　メニュー -->
   <div id="collaboration_video_overlay_menu"></div>
@@ -112,7 +114,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 +129,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,8 +144,8 @@
     $("#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");
+    $("#add_user_list").load("./modal_add_user_list.html");
     $("#zoom").load("./zoom.html");
 
     let CHAT_SERVER_URL = '';
@@ -155,13 +155,20 @@
     let IS_MOBILE = true;
     let IS_ONLINE = false;
     let collaborationJoinFlg = 0;
+    let roomType;
 
     if (typeof(android) != "undefined") {
       android.getLoginParameter();
       android.getGlobalParameter();
+      roomType = android.getRoomType();
     } else {
       webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
       webkit.messageHandlers.getGlobalParameter.postMessage({});
+      roomType = CHAT_DB.getRoomType();
+    }
+
+    if (roomType == chatRoomType.DM) {
+        $('.add_user_btn').removeClass('none');
     }
 
     async function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
@@ -177,9 +184,11 @@
         console.log(collaborationJoinFlg);
       }
       globalUserInfo.coWorkType = collaborationTypeKey.VIDEO;
+      if (collaborationJoinFlg != '2') {
         CHAT_SOCKET.connectSocket();
         socket.emit('join', CHAT.globalLoginParameter, function() {
         });
+      }
     };
   </script>
 </html>
\ No newline at end of file

public_new/collaboration_voice.html

@@ -27,7 +27,7 @@
       </div>
       <div class="collabo_nav_r">
         <div class="text-right d-flex align-items-center">
-          <button type="button" name="button" class="btn add_user_btn"></button>
+          <button type="button" name="button" class="btn add_user_btn none"></button>
           <!--<button type="button" name="button" class="btn menu_btn"></button>-->
         </div>
       </div>
@@ -52,17 +52,16 @@
   <!-- プロフィールモーダル -->
   <div id="userProfileModalInCollaboration"></div>
   <div id="modal_collabo_profile2"></div>
+  <!-- ユーザー追加オーバーレイ -->
   <div id="add_user_list" ></div>
-  <div id="modal_add_user_confirm" ></div>
+  <div id="modal_add_user_confirm"></div>
   <!-- ホスト変更モーダル -->
   <div id="modal_collabo_change_host"></div>
-
   <!-- ホストリクエストモーダル -->
   <div id="modal_collabo_host_request"></div>
 
   <!-- フッター -->
   <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");
 
@@ -103,13 +100,20 @@
     let IS_MOBILE = true;
     let IS_ONLINE = false;
     let collaborationJoinFlg = 0;
+    let roomType;
 
     if (typeof(android) != "undefined") {
       android.getLoginParameter();
       android.getGlobalParameter();
+      roomType = android.getRoomType();
     } else {
       webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
       webkit.messageHandlers.getGlobalParameter.postMessage({});
+      roomType = CHAT_DB.getRoomType();
+    }
+
+    if (roomType == chatRoomType.DM) {
+        $('.add_user_btn').removeClass('none');
     }
 
     async function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
@@ -125,10 +129,11 @@
         console.log(collaborationJoinFlg);
       }
       globalUserInfo.coWorkType = collaborationTypeKey.AUDIO;
+      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

@@ -173,6 +173,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;