アーカイブ保存ローディング表示追加及び43200,43199対応

20e676f5 · Lee Munkyeong · c605edae · 20e676f5 · 20e676f5 · 20e676f5
Commit 20e676f5 authored Jun 15, 2021 by Lee Munkyeong
Show whitespace changes
Inline Side-by-side

Showing with 20 additions and 24 deletions

public_new/collaboration.html
+3 -17

public_new/css/loading.css
+1 -1

public_new/js/chat-ui-collaboration.js
+1 -0

public_new/js/share.js
+15 -6

No files found.
--- a/public_new/collaboration.html
+++ b/public_new/collaboration.html
@@ -15,6 +15,7 @@
  <link rel="stylesheet" href="./css/footer.css">
  <link rel="stylesheet" href="./css/font-awesome.css">
  <link rel="stylesheet" href="./css/share.css">
+  <link rel="stylesheet" href="./css/loading.css">
 </head>
@@ -84,74 +85,59 @@
    <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">
            <img src="icon/icon_collabo_pen_white.png" alt="ペン">
          </div>
-          </a>
        </div>
        <div class="footer_menu_item none">
-          <a href="#">
          <div class="img_wrap bg_blue">
            <img src="icon/icon_collabo_place_white.png" alt="場所">
          </div>
-          </a>
        </div>
        <div class="footer_menu_item">
-          <a href="#">
          <div class="img_wrap bg_blue" id="eraserBtn">
            <img src="icon/icon_collabo_delete_white.png" alt="削除">
          </div>
-          </a>
        </div>
      </div>
      <div class="d-flex align-items-center h-100 none">
        <div class="footer_menu_item">
-          <a href="#">
          <div class="img_wrap bg_gray">
            <img src="icon/icon_collabo_rewind_white.png" alt="戻る">
          </div>
-          </a>
        </div>
        <div class="footer_menu_item">
-          <a href="#">
          <div class="img_wrap bg_gray">
            <img src="icon/icon_collabo_forward_white.png" alt="進む">
          </div>
-          </a>
        </div>
      </div>
      <div class="d-flex align-items-center h-100 collaboration_contents video_contents_host">
        <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 class="d-flex align-items-center h-100 collaboration_contents video_contents_user">
        <div class="footer_menu_item">
-          <a href="#">
          <div class="img_wrap wide bg_blue" id="captureRequestBtn">
            <img src="icon/icon_collabo_capture.png" alt="キャプチャ">
            <span>キャプチャリクエスト</span>
          </div>
-          </a>
        </div>
      </div>
    </div>
  </footer>
  <!-- フッター -->
  <div id="footer_collabo"></div>
+  <div id="loadingArea"></div>
  <div class="pip_indicator none" onclick="finishPipMode();">
    <div style="vertical-align: middle;display: table-cell;">協業中
    </div>
@@ -191,7 +177,7 @@
    $("#collaboration_picture_overlay_menu").load("./collaboration_overlay_menu.html");
    $("#add_user_list").load("./modal_add_user_list.html");
    $("#zoom").load("./zoom.html");
+    $("#loadingArea").load("./loading.html");
    let CHAT_SERVER_URL = '';
    let CMS_SERVER_URL = '';
    let ASSET_PATH = './';

--- a/public_new/css/loading.css
+++ b/public_new/css/loading.css
@@ -9,7 +9,7 @@
  top: 0px;
  left: 0px;
  background: rgb(255, 255, 255, 0.5);
-  z-index: 2;
+  z-index: 99;
 }
 #loader {
  display: none;

--- a/public_new/js/chat-ui-collaboration.js
+++ b/public_new/js/chat-ui-collaboration.js
@@ -399,6 +399,7 @@ CHAT_UI.confirmInviteUserListInCollaboration = function () {
          ),
        });
      }
+      CHAT_UI.dismissLoadingIndicator();
      $("#modalAddUserConfirm").modal("hide");
    });
 };
--- a/public_new/js/share.js
+++ b/public_new/js/share.js
@@ -559,6 +559,7 @@ function Coview_moveToVideoShareArea() {
 }
 function changeCollaboration(changeCollaborationType) {
+  recordStop(function () {
    var newMeetingId = 0;
      if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
        if (CHAT_UTIL.isIOS()) {
@@ -582,11 +583,6 @@ function changeCollaboration(changeCollaborationType) {
        android.setJoinCollaborationType(changeCollaborationType);
      }
      joinCollaborationType = changeCollaborationType;
-  if ($("#recordBtn").hasClass("bg_red")) {
-    recordStop(function () {
-      console.log("レコードを終了しました");
-    });
-  }
      initCollaborationUI(changeCollaborationType);
      switch (changeCollaborationType) {
        case COLLABORATION_TYPE.AUDIO:
@@ -630,6 +626,7 @@ function changeCollaboration(changeCollaborationType) {
        collaborationType: changeCollaborationType,
        newMeetingId: newMeetingId,
      });
+  });
 }
 var scrollLock = function (e) {
@@ -646,7 +643,7 @@ var scrollLock = function (e) {
  }
 };
- let collaboScreen = document.getElementById("collabo_main");
+let collaboScreen = document.getElementById("collabo_main");
 function scrollLockON() {
  collaboScreen.addEventListener("touchmove", scrollLock, { passive: false });
@@ -1068,6 +1065,11 @@ function recordTogle() {
 }
 function recordStop(callback) {
+  if ($("#recordBtn").hasClass("bg_gray")) {
+    callback();
+    return;
+  }
+  CHAT_UI.showLoadingIndicator();
  // アーカイブ保存中は画面操作不可(協業終了,協業切り替え防止)
  screenLock();
@@ -1080,7 +1082,12 @@ function recordStop(callback) {
 }
 function MainManRecordWithCollaboration(action, url, callback) {
+  try {
    mediaRecorder.stop();
+  } catch(exeption) {
+    console.log("Record fail");
+    callback();
+  }
  console.log("Recorded Blobs: ", recordedBlobs);
  setTimeout(function () {
@@ -1107,11 +1114,13 @@ function MainManRecordWithCollaboration(action, url, callback) {
      processData: false,
      success: function (res) {
        recordFinished();
+        CHAT_UI.dismissLoadingIndicator();
        console.log(res);
        callback();
      },
      error: function (err) {
        recordFinished();
+        CHAT_UI.dismissLoadingIndicator();
        console.log(err);
        callback();
      },