Merge branch 'bug/#44048_picture_select_on_picture_collaboration' into debug/console_logs

# Conflicts:
#	public_new/js/common/common.js

public_new/collaboration_overlay_menu.html

@@ -6,7 +6,7 @@
           <div class="item hide rounded-circle shadow m-2 item01">
             <span class="item-overlay rounded-circle collaboration_contents voice_contents"></span>
             <a href="javascript:changeCollaboration(COLLABORATION_TYPE.AUDIO);"
-               class="d-flex flex-column align-items-center">
+              class="d-flex flex-column align-items-center">
               <div class="img_wrap">
                 <img src="icon/icon_collabo_headset.svg" alt="音声共有">
               </div>
@@ -16,7 +16,7 @@
           <div class="item hide rounded-circle shadow m-2 item02">
             <span class="item-overlay rounded-circle collaboration_contents video_contents"></span>
             <a href="javascript:changeCollaboration(COLLABORATION_TYPE.VIDEO);"
-               class="d-flex flex-column align-items-center">
+              class="d-flex flex-column align-items-center">
               <div class="img_wrap m-0">
                 <img src="icon/icon_collabo_videocam.svg" alt="動画共有">
               </div>
@@ -26,7 +26,7 @@
           <div class="item hide rounded-circle shadow m-2 item03">
             <span class="item-overlay rounded-circle collaboration_contents picture_contents"></span>
             <a href="javascript:changeCollaboration(COLLABORATION_TYPE.CAMERA);"
-               class="d-flex flex-column align-items-center">
+              class="d-flex flex-column align-items-center">
               <div class="img_wrap">
                 <img src="icon/icon_collabo_picture.svg" alt="写真共有">
               </div>
@@ -36,7 +36,7 @@
           <div class="item hide rounded-circle shadow m-2 item04">
             <span class="item-overlay rounded-circle collaboration_contents document_contents"></span>
             <a href="javascript:changeCollaboration(COLLABORATION_TYPE.DOCUMENT);"
-               class="d-flex flex-column align-items-center">
+              class="d-flex flex-column align-items-center">
               <div class="img_wrap">
                 <img src="icon/icon_collabo_document.svg" alt="文書共有">
               </div>
@@ -46,7 +46,7 @@
           <div class="item hide rounded-circle shadow m-2 item05">
             <span class="item-overlay rounded-circle collaboration_contents board_contents"></span>
             <a href="javascript:changeCollaboration(COLLABORATION_TYPE.BOARD);"
-               class="d-flex flex-column align-items-center">
+              class="d-flex flex-column align-items-center">
               <div class="img_wrap m-0">
                 <img src="icon/icon_collabo_whiteboard.svg" alt="落書き">
               </div>

public_new/js/common/common.js

@@ -153,7 +153,12 @@ Common.getProfileImgUrl = function (path) {
       if (receivedString == "" || receivedString == undefined) {
         return Common.generateProfileImgURLFromServer(userInfo[0], userInfo[1]);
       }
-      return "data:image/"+userInfo[0].split('.').pop()+";base64," + receivedString;
+      return (
+        "data:image/" +
+        userInfo[0].split(".").pop() +
+        ";base64," +
+        receivedString
+      );
     }
     return Common.generateProfileImgURLFromServer(userInfo[0], userInfo[1]);
   } else {
@@ -196,7 +201,9 @@ Common.startCollaboration = function (collaborationType) {
     }
   }
 
-  CHAT_SOCKET.emitCollaborationFinishMessage();
+  if (typeof CHAT_SOCKET != "undefined") {
+    CHAT_SOCKET.emitCollaborationFinishMessage();
+  }
   NativeBridgeDelegate.finishAllCollaboration();
   NativeBridgeDelegate.startCollaboration(collaborationType);
   Common.dismissLoadingIndicator();

public_new/js/views/collaboration/fermi-web-socket-message-handler.js

@@ -112,7 +112,7 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
       if (globalUserInfo.joinType != COLLABORATION_JOIN_TYPE.INVITED) {
         FermiWebSocketMessageHandler.apiWelcome();
       } else {
-        FermiWebSocketBridge.getCollaborationType()
+        FermiWebSocketBridge.getCollaborationType();
       }
       CollaborationFeature.updateHost();
       break;
@@ -174,6 +174,7 @@ FermiWebSocketMessageHandler.shareFile = function () {
   CollaborationUI.updateScreen(COLLABORATION_TYPE.CAMERA);
   globalUserInfo.collaborationType = COLLABORATION_TYPE.CAMERA;
   FermiWebSocketBridge.shareFileHost(COLLABORATION_TYPE.CAMERA);
+  CollaborationFeature.updateHost();
 };
 
 // SHARE_FILE_HOST
@@ -181,6 +182,7 @@ FermiWebSocketMessageHandler.shareFileHost = function () {
   console.log("peacekim:: FermiWebSocketMessageHandler.shareFileHost");
   CollaborationUI.updateScreen(COLLABORATION_TYPE.CAMERA);
   globalUserInfo.collaborationType = COLLABORATION_TYPE.CAMERA;
+  CollaborationFeature.updateHost();
 };
 
 // CAPTURE_REQUEST

public_new/js/views/collaboration/share-event-listener.js

@@ -197,6 +197,21 @@ CoviewBridge.bindMessageEvent = function () {
 };
 
 CollaborationFeature.didReceiveLoginResponseMessage = async function () {
+  try {
+    await navigator.mediaDevices.getUserMedia({ audio: true, video: true });
+    if (globalUserInfo.collaborationType == COLLABORATION_TYPE.CAMERA) {
+      setTimeout(function () {
+        togglePhotoOpenPlaceHolder();
+      }, 8000);
+    }
+
+  } catch (err) {
+    if (err.name == "NotAllowedError") {
+      CoviewBridge.exitCollaboration();
+      return;
+    }
+  }
+
   const isDocument =
     globalUserInfo.collaborationType == COLLABORATION_TYPE.DOCUMENT;
   const isAttendee =
@@ -347,6 +362,9 @@ CollaborationUI.showHostButtons = function () {
   if (globalUserInfo.collaborationType == COLLABORATION_TYPE.VIDEO) {
     $(".video_contents_host").removeClass("none");
     $(".video_contents_user").addClass("none");
+  } else {
+    $(".video_contents_host").addClass("none");
+    $(".video_contents_user").addClass("none");
   }
 };
 
@@ -362,6 +380,9 @@ CollaborationUI.hideHostButtons = function () {
   if (globalUserInfo.collaborationType == COLLABORATION_TYPE.VIDEO) {
     $(".video_contents_user").removeClass("none");
     $(".video_contents_host").addClass("none");
+  } else {
+    $(".video_contents_host").addClass("none");
+    $(".video_contents_user").addClass("none");
   }
 };
 

public_new/js/views/collaboration/share.js

@@ -115,6 +115,8 @@ CollaborationUI.updateScreen = async function (collaborationType) {
       );
       break;
   }
+
+  CollaborationFeature.updateHost();
   await waitMillisecond(1000);
   $(".before_loading_indicator").addClass("none");
 };