画面キャプチャーリクエスト実装

7857f5fa · Lee Munkyeong · 0d218888 · 7857f5fa · 7857f5fa · 7857f5fa
Commit 7857f5fa authored May 20, 2021 by Lee Munkyeong
9 changed files
--- a/public_new/collaboration.html
+++ b/public_new/collaboration.html
@@ -125,7 +125,7 @@
          </a>
        </div>
      </div>
-      <div class="d-flex align-items-center h-100 collaboration_contents video_contents">
+      <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">
@@ -135,6 +135,16 @@
          </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>
  <!-- フッター -->

--- a/public_new/css/share.css
+++ b/public_new/css/share.css
@@ -28,6 +28,9 @@
    width: 100%;
    height: 100%;
 }
+.coview_on_media_btn_back {
+    display: none !important;
+}
 .coview_share_dropdown_bar{
    display: none;

--- a/public_new/icon/icon_display_off_chatroom.png
+++ b/public_new/icon/icon_display_off_chatroom.png
--- a/public_new/js/collaboration.js
+++ b/public_new/js/collaboration.js
@@ -115,7 +115,11 @@ $(function () {
  })
  $('#captureBtn').click(function () {
-    $('#coviewCaptureCtrBtn').click();
+    coview_api.Capture(CMS_SERVER_URL + '/chatapi/file/uploadArchive');
+  })
+  $('#captureRequestBtn').click(function () {
+    fw.sendToMsg('others', 'CAPTURE_REQUEST', {"name": CHAT.globalLoginParameter.loginId});
  })
  $('#recordBtn').click(function () {

--- a/public_new/js/language_en.js
+++ b/public_new/js/language_en.js
@@ -93,5 +93,6 @@ $.lang.en = {
    "collaboration_end":"collaboration end",
    "notify_not_released" : "It will be released later.",
    "error_empty_room_name" : "Please input room name.",
-    "inform_exit_host_collaboration" : "The host has terminated the collaboration."
+    "inform_exit_host_collaboration" : "The host has terminated the collaboration.",
+    "request_capture" : " request Screen capture.(if you confirm this request, capture the screen and change the host)"
 }
--- a/public_new/js/language_ja.js
+++ b/public_new/js/language_ja.js
@@ -93,5 +93,6 @@ $.lang.ja = {
    "collaboration_end":"協業終了",
    "notify_not_released" : "今後リリース予定です。",
    "error_empty_room_name" : "ルーム名を入力してください。",
-    "inform_exit_host_collaboration" : "ホストが協業を終了しました。"
+    "inform_exit_host_collaboration" : "ホストが協業を終了しました。",
+    "request_capture" : "様がキャプチャーをリクエストしました。（確認時画面をキャプチャーし、ホストを変更します。）"
 }
--- a/public_new/js/language_ko.js
+++ b/public_new/js/language_ko.js
@@ -93,5 +93,6 @@ $.lang.ko = {
    "collaboration_end":"협업종료",
    "notify_not_released" : "추후 공개예정입니다.",
    "error_empty_room_name" : "룸명을 입력해주세요.",
-    "inform_exit_host_collaboration" : "호스트가 협업을 종료하였습니다."
+    "inform_exit_host_collaboration" : "호스트가 협업을 종료하였습니다.",
+    "request_capture" : "님이 화면캡처를 요청하셨습니다.(확인시 화면을캡처하고 호스트를 변경합니다.)"
 }
--- a/public_new/js/share.js
+++ b/public_new/js/share.js
@@ -118,11 +118,6 @@ $(function () {
    console.log("=============> READY : ready for coview api");
    Coview_addLoginId(globalUserInfo.loginId);
    coview_api.Login(globalUserInfo.loginId);
-  });
-  coview_api.addEventListener("start", function () {
-    console.log("=============> START : share start");
-    $("#loadingIndicator").removeClass("full_active");
    fw.socket.on('message', async function(data) {
      console.log('====> message::data: ', data);
      if (data.type ==="CHANGE_COLLABORATION") {
@@ -144,9 +139,33 @@ $(function () {
          joinMeetingId = data.payload.newMeetingId;
        }
      }
+      if (data.type ==="SHARE_FILE") {
+        if (joinCollaborationType != collaborationType.CAMERA) {
+          initCollaborationUI(collaborationType.CAMERA);
+          joinCollaborationType = collaborationType.CAMERA;
+          fw.sendToMsg('others', 'SHARE_FILE_HOST', {"collaborationType": collaborationType.CAMERA});
+        }
+      }
+      if (data.type ==="SHARE_FILE_HOST") {
+        if (joinCollaborationType != collaborationType.CAMERA && g_isMainMan) {
+          initCollaborationUI(collaborationType.CAMERA);
+          joinCollaborationType = collaborationType.CAMERA;
+        }
+      }
+      if (data.type === "CAPTURE_REQUEST" && g_isMainMan) {
+        if (confirm(data.payload.name + getLocalizedString("request_capture"))) {
+          coview_api.Capture(CMS_SERVER_URL + '/chatapi/file/uploadArchive');
+        }
+      }
    });
  });
+  coview_api.addEventListener("start", function () {
+    console.log("=============> START : share start");
+    $("#loadingIndicator").removeClass("full_active");
+  });
  coview_api.addEventListener("allbye", function () {
    console.log("=============> ALL BYE : share allbye");
    $("#loadingIndicator").removeClass("full_active");
@@ -506,11 +525,19 @@ function hostSearchInterval() {
      if (joinCollaborationType == collaborationType.CAMERA) {
        $('.photo_select_button').removeClass('none');
      }
+      if (joinCollaborationType == collaborationType.VIDEO) {
+        $('.video_contents_host').removeClass('none');
+        $('.video_contents_user').addClass('none');
+      }
    } else {
      $('.host_contents').addClass('none');
      if (joinCollaborationType == collaborationType.CAMERA) {
        $('.photo_select_button').addClass('none');
      }
+      if (joinCollaborationType == collaborationType.VIDEO) {
+        $('.video_contents_user').removeClass('none');
+        $('.video_contents_host').addClass('none');
+      }
    }
    if (hostName != g_isMainManUsername) {
      if (hostName != "") {
@@ -531,5 +558,5 @@ function hostSearchInterval() {
      }
    }
  }
-  timeInterval = setInterval(hostSearch, 3000);
+  timeInterval = setInterval(hostSearch, 2000);
 }
\ No newline at end of file
--- a/public_new/modal_chat_menu.html
+++ b/public_new/modal_chat_menu.html
@@ -13,7 +13,7 @@
          <li><a href="chat_change_room_name.html"><img src="icon/icon_change_room_name.png" alt="ルーム名変更">ルーム名変更</a>
          </li>
          <li><a href="chat_add_user.html"><img src="icon/icon_add_user.png" alt="ユーザー招待">ユーザー招待</a></li>
-          <li ><a href="javascript:return false;" onclick="CHAT_UI.roomDisplayOff();"><img src="icon/icon_chat_gray.png" alt="ユーザー招待">部屋非表示</a></li>
+          <li ><a href="javascript:return false;" onclick="CHAT_UI.roomDisplayOff();"><img src="icon/icon_display_off_chatroom.png" alt="ユーザー招待">部屋非表示</a></li>
        </ul>
      </div>
    </div>