Merge branch 'develop_change_collaboration' into 'develop'

レコード、協業変更実装 See merge request !128

Merge branch 'develop_change_collaboration' into 'develop'
レコード、協業変更実装 See merge request !128
2fc3ca18 · Kim Peace · 0ef45e70 · 26680153 · 2fc3ca18 · 2fc3ca18
Commit 2fc3ca18 authored May 17, 2021 by Kim Peace
13 changed files
--- a/public_new/collaboration_documents.html
+++ b/public_new/collaboration_documents.html
@@ -28,6 +28,7 @@
    <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 menu_btn"></button>
        <button type="button" name="button" class="btn start_pip_btn" onclick="startPipMode();"></button>
      </div>
    </div>

--- a/public_new/collaboration_documents_overlay_menu.html
+++ b/public_new/collaboration_documents_overlay_menu.html
@@ -4,7 +4,7 @@
      <div class="menu_wrap">
        <div class="menu d-flex flex-row flex-wrap">
          <div class="item">
-            <a href="collaboration_picture.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_picture.png" alt="写真共有">
              </div>
@@ -12,7 +12,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_video.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('video');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_videocam.png" alt="動画共有">
              </div>
@@ -20,7 +20,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_documents.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('docs');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_document.png" alt="文書共有">
              </div>
@@ -28,7 +28,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_whiteboard.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_whiteboard.png" alt="落書き">
              </div>

--- a/public_new/collaboration_picture.html
+++ b/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 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> -->
        </div>

--- a/public_new/collaboration_picture_overlay_menu.html
+++ b/public_new/collaboration_picture_overlay_menu.html
@@ -4,7 +4,7 @@
      <div class="menu_wrap">
        <div class="menu d-flex flex-row flex-wrap">
          <div class="item">
-            <a href="collaboration_voice.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('audio');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_headset.png" alt="音声共有">
              </div>
@@ -12,7 +12,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_video.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('video');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_videocam.png" alt="動画共有">
              </div>
@@ -20,7 +20,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_documents.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('docs');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_document.png" alt="文書共有">
              </div>
@@ -28,7 +28,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_whiteboard.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_whiteboard.png" alt="落書き">
              </div>

--- a/public_new/collaboration_video.html
+++ b/public_new/collaboration_video.html
@@ -27,6 +27,7 @@
        <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 menu_btn"></button>
          <!-- <button type="button" name="button" class="btn exit_btn" onclick="Coview_exitCollaboration();"></button> -->
        </div>
      </div>

--- a/public_new/collaboration_video_overlay_menu.html
+++ b/public_new/collaboration_video_overlay_menu.html
@@ -4,7 +4,7 @@
      <div class="menu_wrap">
        <div class="menu d-flex flex-row flex-wrap">
          <div class="item">
-            <a href="collaboration_voice.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('audio');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_headset.png" alt="音声共有">
              </div>
@@ -12,7 +12,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_picture.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_picture.png" alt="写真共有">
              </div>
@@ -20,7 +20,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_documents.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('docs');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_document.png" alt="文書共有">
              </div>
@@ -28,7 +28,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_whiteboard.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_whiteboard.png" alt="落書き">
              </div>

--- a/public_new/collaboration_voice.html
+++ b/public_new/collaboration_voice.html
@@ -28,6 +28,7 @@
      <div class="collabo_nav_r">
        <div class="text-right d-flex align-items-center">
          <button type="button" name="button" class="btn add_user_btn none"></button>
+          <button type="button" name="button" class="btn menu_btn"></button>
          <!--<button type="button" name="button" class="btn menu_btn"></button>-->
        </div>
      </div>

--- a/public_new/collaboration_voice_overlay_menu.html
+++ b/public_new/collaboration_voice_overlay_menu.html
@@ -4,7 +4,7 @@
      <div class="menu_wrap">
        <div class="menu d-flex flex-row flex-wrap">
          <div class="item">
-            <a href="collaboration_picture.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_picture.png" alt="写真共有">
              </div>
@@ -12,7 +12,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_video.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('video');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_videocam.png" alt="動画共有">
              </div>
@@ -20,7 +20,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_documents.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('docs');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_document.png" alt="文書共有">
              </div>
@@ -28,7 +28,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_whiteboard.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_whiteboard.png" alt="落書き">
              </div>

--- a/public_new/collaboration_whiteboard.html
+++ b/public_new/collaboration_whiteboard.html
@@ -27,6 +27,7 @@
        <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 menu_btn"></button>
          <!-- <button type="button" name="button" class="btn exit_btn" onclick="Coview_exitCollaboration();"></button> -->
        </div>
      </div>

--- a/public_new/collaboration_whiteboard_overlay_menu.html
+++ b/public_new/collaboration_whiteboard_overlay_menu.html
@@ -4,7 +4,7 @@
      <div class="menu_wrap">
        <div class="menu d-flex flex-row flex-wrap">
          <div class="item">
-            <a href="collaboration_voice.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('audio');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_headset.png" alt="音声共有">
              </div>
@@ -12,7 +12,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_video.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('video');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_videocam.png" alt="動画共有">
              </div>
@@ -20,7 +20,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_picture.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_picture.png" alt="写真共有">
              </div>
@@ -28,7 +28,7 @@
            </a>
          </div>
          <div class="item">
-            <a href="collaboration_documents.html" class="d-flex flex-column align-items-center">
+            <a href="javascript:coview_api.ChangeCollaboration('docs');" class="d-flex flex-column align-items-center">
              <div class="img_wrap">
                <img src="icon/icon_collabo_document.png" alt="文書共有">
              </div>

--- a/public_new/footer_collabo.html
+++ b/public_new/footer_collabo.html
@@ -8,7 +8,7 @@
          </div>
        </a>
      </div>
-      <div class="footer_item none">
+      <div class="footer_item none host_contents">
        <a href="#">
          <div class="img_wrap bg_gray" id="recordBtn">
            <img src="icon/icon_record.png" alt="録音">

--- a/public_new/js/collaboration.js
+++ b/public_new/js/collaboration.js
@@ -118,16 +118,17 @@ $(function () {
  $('#captureBtn').click(function () {
    $('#coviewCaptureCtrBtn').click();
-    })
+  })
-    $('#recordBtn').click(function () {
+  $('#recordBtn').click(function () {
-        $('#coviewRecCtrBtn').click();
+    if ($('#recordBtn').hasClass('bg_gray')) {
-        if ($('#recordBtn').hasClass('bg_gray')) {
+      MainManRecord('on');
-            $('#recordBtn').removeClass('bg_gray');
+      $('#recordBtn').removeClass('bg_gray');
-            $('#recordBtn').addClass('bg_red');
+      $('#recordBtn').addClass('bg_red');
-        } else {
+    } else {
-            $('#recordBtn').addClass('bg_gray');
+      MainManRecord('stop', CMS_SERVER_URL + '/chatapi/file/uploadArchive');
-            $('#recordBtn').removeClass('bg_red');
+      $('#recordBtn').addClass('bg_gray');
-        }
+      $('#recordBtn').removeClass('bg_red');
-      })
+    }
+  })
 });
--- a/public_new/js/share.js
+++ b/public_new/js/share.js
@@ -161,6 +161,7 @@ $(function () {
        console.log("------------------------------");
        console.log(globalUserInfo.coWorkType);
        console.log(collaborationJoinFlg);
+        hostSearchInterval();
        if (globalUserInfo.coWorkType == collaborationTypeKey.DOCUMENT) {
          isDocument = true;
          globalUserInfo.coWorkType = collaborationTypeKey.AUDIO;
@@ -384,6 +385,12 @@ function hostSearchInterval() {
        if (!$("#collaboration_user_" + hostName).hasClass('host')) {
          $("#collaboration_user_" + hostName).addClass("host");
        }
+        if (g_isMainMan) {
+            $('.host_contents').removeClass('none');
+        } else {
+            $('.host_contents').addClass('none');
+        }
      }
    }
  }