Merge branch 'feature/43084' into 'develop'

動画協業でレコード中にキャプチャーする場合アーカイブ保存するように修正。

See merge request !162

public_new/js/chat-websocket.js

@@ -3,6 +3,14 @@ var socket;
 // 名前空間
 // 名前空間
 var CHAT_SOCKET = {};
 var CHAT_SOCKET = {};
 
 
+
+
+CHAT_SOCKET.socketCheck = function () {
+    if(socket == null || socket.disconnected) {
+        window.location.reload();
+    }
+}
+
 CHAT_SOCKET.connectSocket = function () {
 CHAT_SOCKET.connectSocket = function () {
     if (IS_ONLINE == 'true') {
     if (IS_ONLINE == 'true') {
         socket = io(CHAT_SERVER_URL);
         socket = io(CHAT_SERVER_URL);

public_new/js/chat.js

@@ -382,23 +382,23 @@ $(function() {
         var afterHeight = window.innerHeight;
         var afterHeight = window.innerHeight;
         var afterWidth = window.innerWidth;
         var afterWidth = window.innerWidth;
         var moreScroll = beforeHeight - afterHeight;
         var moreScroll = beforeHeight - afterHeight;
-        if (beforeHeight > afterHeight) {
+        if (beforeHeight > afterHeight && (beforeHeight - afterHeight) > 50) {
             if (beforeWidth == afterWidth) {
             if (beforeWidth == afterWidth) {
                 //キーボード表示時
                 //キーボード表示時
                 $('.room_container').css('margin-bottom', 0);
                 $('.room_container').css('margin-bottom', 0);
                 window.scrollTo(0, beforeScroll + moreScroll - $('.footer_content_b').height());
                 window.scrollTo(0, beforeScroll + moreScroll - $('.footer_content_b').height());
             } else {
             } else {
                 //画面回転時
                 //画面回転時
-                window.scrollTo(0, beforeScroll + moreScroll);
+                window.scrollTo(0, beforeScroll + (moreScroll * 2) - $('.footer_content_b').height());
             }
             }
-        } else {
+        } else if (beforeHeight < afterHeight) {
             $('.room_container').css('margin-bottom', footerHeight);
             $('.room_container').css('margin-bottom', footerHeight);
             if (beforeWidth == afterWidth) {
             if (beforeWidth == afterWidth) {
                 //キーボード非表示
                 //キーボード非表示
                 window.scrollTo(0, beforeScroll + moreScroll + $('.footer_content_b').height());
                 window.scrollTo(0, beforeScroll + moreScroll + $('.footer_content_b').height());
             } else {
             } else {
                 //画面回転時
                 //画面回転時
-                window.scrollTo(0, beforeScroll + moreScroll);
+                window.scrollTo(0, beforeScroll + (moreScroll * 2) + $('.footer_content_b').height());
             }
             }
         }
         }
         beforeHeight = window.innerHeight;
         beforeHeight = window.innerHeight;

public_new/js/collaboration.js

@@ -199,7 +199,11 @@ $(function () {
   })
   })
 
 
   $('#captureBtn').click(function () {
   $('#captureBtn').click(function () {
+    screenLock();
+    recordStop(function() {
+      $('#screenLock').remove();
       coview_api.Capture(CMS_SERVER_URL + '/chatapi/file/uploadArchive');
       coview_api.Capture(CMS_SERVER_URL + '/chatapi/file/uploadArchive');
+    });
   })
   })
 
 
   $('#captureRequestBtn').click(function () {
   $('#captureRequestBtn').click(function () {

public_new/js/share.js

@@ -162,8 +162,16 @@ $(function () {
         }
         }
       } else if (data.type === "CAPTURE_REQUEST" && g_isMainMan) {
       } else if (data.type === "CAPTURE_REQUEST" && g_isMainMan) {
         if (confirm(data.payload.name + getLocalizedString("request_capture"))) {
         if (confirm(data.payload.name + getLocalizedString("request_capture"))) {
+          if ($('#recordBtn').hasClass('bg_red')) {
+            screenLock();
+            recordStop(function() {
+              $('#screenLock').remove();
+              captureAndShareImage(CMS_SERVER_URL + '/chatapi/file/uploadArchive', data.payload.name);
+            });
+          } else {
             captureAndShareImage(CMS_SERVER_URL + '/chatapi/file/uploadArchive', data.payload.name);
             captureAndShareImage(CMS_SERVER_URL + '/chatapi/file/uploadArchive', data.payload.name);
           }
           }
+        }
       } else if (data.type === "HOST_CHANGE_REQUEST") {
       } else if (data.type === "HOST_CHANGE_REQUEST") {
         if (data.payload.loginId == globalUserInfo.loginId) {
         if (data.payload.loginId == globalUserInfo.loginId) {
           fw.sendToMsg('others', 'HOST_CHANGE_RESPONSE', {"isAndroid": CHAT_UTIL.isAndroid(), "isAble" : androidVersion >= ANDROID_SDK_VERSION.O, "loginId": CHAT.globalLoginParameter.loginId});
           fw.sendToMsg('others', 'HOST_CHANGE_RESPONSE', {"isAndroid": CHAT_UTIL.isAndroid(), "isAble" : androidVersion >= ANDROID_SDK_VERSION.O, "loginId": CHAT.globalLoginParameter.loginId});
@@ -226,7 +234,13 @@ $(function () {
   });
   });
 
 
   coview_api.addEventListener("allbye", function () {
   coview_api.addEventListener("allbye", function () {
-    console.log("=============> ALL BYE : share allbye");
+    console.log("=============> HOST BYE : share hostbye");
+    alert(getLocalizedString("inform_exit_host_collaboration"));
+    var isDocument = false;
+    if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
+      isDocument = true;
+    }
+    Coview_exitCollaboration(isDocument);
     $("#loadingIndicator").removeClass("full_active");
     $("#loadingIndicator").removeClass("full_active");
   });
   });
 
 
@@ -237,22 +251,23 @@ $(function () {
 
 
   coview_api.addEventListener("hostbye", function () {
   coview_api.addEventListener("hostbye", function () {
     console.log("=============> HOST BYE : share hostbye");
     console.log("=============> HOST BYE : share hostbye");
-    if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT && CHAT_UTIL.isAndroid()) {
-      android.exitMeetingRoom();
-    }
     alert(getLocalizedString("inform_exit_host_collaboration"));
     alert(getLocalizedString("inform_exit_host_collaboration"));
-    Coview_exitCollaboration();
+    var isDocument = false;
+    if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
+      isDocument = true;
+    }
+    Coview_exitCollaboration(isDocument);
     $("#loadingIndicator").removeClass("full_active");
     $("#loadingIndicator").removeClass("full_active");
   });
   });
 
 
   coview_api.addEventListener("destroy", function () {
   coview_api.addEventListener("destroy", function () {
     console.log("=============> DESTROY : share destroy");
     console.log("=============> DESTROY : share destroy");
-    if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT && CHAT_UTIL.isAndroid()) {
-      android.exitMeetingRoom();
-    }
     alert(getLocalizedString("inform_exit_host_collaboration"));
     alert(getLocalizedString("inform_exit_host_collaboration"));
-    Coview_exitCollaboration();
-    $(".coview_share_area").hide();
+    var isDocument = false;
+    if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
+      isDocument = true;
+    }
+    Coview_exitCollaboration(isDocument);
     $("#loadingIndicator").removeClass("full_active");
     $("#loadingIndicator").removeClass("full_active");
   });
   });