ABCOMM-76-協業転換実装中

public_new/collaboration.html

@@ -26,7 +26,7 @@
       </div>
       <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 user_btn collaboration_contents picture_contents video_contents board_contents document_contents"></button>
           <button type="button" name="button" class="btn menu_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> -->
@@ -79,6 +79,13 @@
     <button type="button" name="button" class="footer_menu_btn"></button>
     <div class="footer_menu-wrap d-flex justify-content-around h-100">
       <div class="d-flex align-items-center h-100">
+        <div class="footer_menu_item photo_select_button collaboration_contents picture_contents">
+          <a href="#">
+            <div class="img_wrap bg_blue" id="photo_open_place_holder">
+              <img src="icon/icon_collabo_picture.png" alt="写真">
+            </div>
+          </a>
+        </div>
         <div class="footer_menu_item">
           <a href="#">
             <div class="img_wrap bg_red" id="penBtn">
@@ -117,11 +124,24 @@
           </a>
         </div>
       </div>
+      <div class="d-flex align-items-center h-100 collaboration_contents video_contents">
+        <div class="footer_menu_item">
+          <a href="#">
+            <div class="img_wrap wide bg_blue" id="captureBtn">
+              <img src="icon/icon_collabo_capture.png" alt="キャプチャ">
+              <span>キャプチャ</span>
+            </div>
+          </a>
+        </div>
+      </div>
     </div>
   </footer>
   <!-- フッター -->
   <div id="footer_collabo"></div>
-
+  <div class="pip_indicator none">
+    <div style="vertical-align: middle;display: table-cell;">協業中
+    </div>
+  </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>
@@ -178,6 +198,13 @@
         $('.add_user_btn').removeClass('none');
     }
 
+    function startPipMode() {
+      if (typeof(android) != "undefined") {
+        android.startPipMode();
+      } else {
+      }
+    }
+
     async function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
       CHAT_SERVER_URL = chatServerUrl;
       CMS_SERVER_URL = cmsServerUrl;
@@ -192,7 +219,10 @@
         console.log(joinCollaborationType);
         collaborationJoinFlg = android.getCollaborationJoinFlg();
       }
+      initCollaborationUI(joinCollaborationType);
       globalUserInfo.coWorkType = CHAT_UTIL.getCoviewTypeFromCollaborationType(joinCollaborationType);
+      console.log('----coWorkType ---');
+      console.log(globalUserInfo.coWorkType);
       if (collaborationJoinFlg != '2') {
         CHAT_SOCKET.connectSocket();
         socket.emit('join', CHAT.globalLoginParameter, function() {

public_new/collaboration_overlay_menu.html

@@ -22,7 +22,7 @@
             </a>
           </div>
           <div class="item collaboration_contents video_contents voice_contents document_contents board_contents">
-            <a href="javascript:coview_api.ChangeCollaboration('image');"
+            <a href="javascript:changeCollaboration(collaborationType.CAMERA);"
                class="d-flex flex-column align-items-center">
               <div class="img_wrap">
                 <img src="icon/icon_collabo_picture.png" alt="写真共有">

public_new/css/collaboration_board.css

+#canvasRemote {
+   background-color: white !important;
+}

public_new/js/chat-util.js

@@ -132,11 +132,13 @@ CHAT_UTIL.getCollaborationType = function(key) {
     }
 }
 
-CHAT_UTIL.getCoviewTypeFromCollaborationType = function(collaborationType) {
-    switch(key) {
+CHAT_UTIL.getCoviewTypeFromCollaborationType = function(joinCollaborationType) {
+    switch(joinCollaborationType) {
         case collaborationType.AUDIO:
+            console.log(collaborationTypeKey.AUDIO);
             return collaborationTypeKey.AUDIO;
         case collaborationType.CAMERA:
+            console.log(collaborationTypeKey.CAMERA);
             return collaborationTypeKey.CAMERA;
         case collaborationType.VIDEO:
             return collaborationTypeKey.VIDEO;

public_new/js/chat-websocket.js

@@ -160,6 +160,7 @@ function setSocketAction () {
     // New Message
     // #36170
     socket.on('newMessage', function(message, roomId, roomName) {
+        console.log(message);
         var userMessageTemplate;
         $.get({ url: "./template/template_user_message.html", async: false }
           , function(text) {

public_new/js/share.js

@@ -158,9 +158,6 @@ $(function () {
     let loginIdList = new Array();
     switch (json.api) {
       case "LoginResponse":
-        console.log("------------------------------");
-        console.log(globalUserInfo.coWorkType);
-        console.log(collaborationJoinFlg);
         if (globalUserInfo.coWorkType == collaborationTypeKey.DOCUMENT) {
           isDocument = true;
           globalUserInfo.coWorkType = collaborationTypeKey.AUDIO;
@@ -325,14 +322,29 @@ function changeCollaboration(changeCollaborationType) {
       coview_api.ChangeCollaboration('audio');
       break;
   }
+  var collaborationChangeMessage = dataMessageScheme + messageSeperator + collaborationChangeMessage;
+  socket.emit("createMessage", {text: collaborationChangeMessage}, 0);
+  changeCollaborationType
+
+  if (CHAT_UTIL.isIOS()) {
+    //TODO Nativeに変換するCollaborationTypeを保存。
+  } else if (CHAT_UTIL.isAndroid()) {
+    android.setJoinCollaborationType(changeCollaborationType);
+  }
   initCollaborationUI(changeCollaborationType);
 }
 
 function initCollaborationUI(changeCollaborationType){
+  if ($('.user_btn').hasClass("hide")) {
+    $('.user_btn').click();
+  }
+  $(".menu_btn").click();
+  $("link[href='./css/collaboration_board.css']").remove();
   switch (changeCollaborationType) {
     case collaborationType.AUDIO:
       $('.collaboration_contents').addClass('none');
       $('.voice_contents').removeClass('none');
+      $('.user_btn').click();
       break;
     case collaborationType.CAMERA:
       $('.collaboration_contents').addClass('none');
@@ -345,10 +357,12 @@ function initCollaborationUI(changeCollaborationType){
     case collaborationType.DOCUMENT:
       $('.collaboration_contents').addClass('none');
       $('.document_contents').removeClass('none');
+      $('.user_btn').click();
       break;
     case collaborationType.BOARD:
       $('.collaboration_contents').addClass('none');
       $('.board_contents').removeClass('none');
+      $('head').append('<link rel="stylesheet" href="./css/collaboration_board.css">');
       break;
   }
 }
@@ -417,8 +431,14 @@ function hostSearchInterval() {
   let hostName = "";
   if (g_isMainMan) {
       $('.host_contents').removeClass('none');
+      if (joinCollaborationType == collaborationType.CAMERA) {
+          $('.photo_select_button').removeClass('none');
+      }
   } else {
       $('.host_contents').addClass('none');
+      if (joinCollaborationType == collaborationType.CAMERA) {
+          $('.photo_select_button').addClass('none');
+      }
   }
   function hostSearch() {
     if (hostName != g_isMainManUsername) {