ルームタイプによって協業中にユーザー招待ボタンを非表示にするように修正

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>
@@ -148,6 +150,7 @@
     $("#modal_collabo_capture").load("./modal_collabo_capture.html");
     $("#modal_collabo_profile2").load("./modal_collabo_profile2.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 = '';
@@ -157,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) {
@@ -179,9 +189,11 @@
         console.log(collaborationJoinFlg);
       }
       globalUserInfo.coWorkType = collaborationTypeKey.CAMERA;
-      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/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>
@@ -143,6 +145,7 @@
     $("#modal_collabo_capture").load("./modal_collabo_capture.html");
     $("#modal_collabo_profile2").load("./modal_collabo_profile2.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 = '';
@@ -152,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) {
@@ -174,6 +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,11 +52,11 @@
   <!-- プロフィールモーダル -->
   <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_collabo_change_host"></div>
-
   <!-- ホストリクエストモーダル -->
   <div id="modal_collabo_host_request"></div>
 
@@ -100,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) {