Merge branch 'feature/develop_end_recording_on_change_host_and_collaboration' into 'develop'

協業切替、ホスト変更の時レコードが終了されるように修正

See merge request !139

public_new/js/collaboration.js

+function recordStart() {
+  MainManRecord('on');
+  $('#recordBtn').removeClass('bg_gray');
+  $('#recordBtn').addClass('bg_red');
+}
+
+function recordStop() {
+  MainManRecord('stop', CMS_SERVER_URL + '/chatapi/file/uploadArchive');
+  $('#recordBtn').addClass('bg_gray');
+  $('#recordBtn').removeClass('bg_red');
+}
+
 $(function () {
 $(function () {
   // メニューオーバーレイ表示
   // メニューオーバーレイ表示
   $(".menu_btn").click(function () {
   $(".menu_btn").click(function () {
@@ -124,13 +136,9 @@ $(function () {
 
 
   $('#recordBtn').click(function () {
   $('#recordBtn').click(function () {
     if ($('#recordBtn').hasClass('bg_gray')) {
     if ($('#recordBtn').hasClass('bg_gray')) {
-      MainManRecord('on');
-      $('#recordBtn').removeClass('bg_gray');
-      $('#recordBtn').addClass('bg_red');
+      recordStart();
     } else {
     } else {
-      MainManRecord('stop', CMS_SERVER_URL + '/chatapi/file/uploadArchive');
-      $('#recordBtn').addClass('bg_gray');
-      $('#recordBtn').removeClass('bg_red');
+      recordStop();
     }
     }
   })
   })
 });
 });

public_new/js/share.js

@@ -177,6 +177,9 @@ $(function () {
           Coview_changeHost(data.payload.loginId);
           Coview_changeHost(data.payload.loginId);
         }
         }
       } else if (data.type === "API_SEND_OWNER_CHANGE_COMPLETE") {
       } else if (data.type === "API_SEND_OWNER_CHANGE_COMPLETE") {
+        if ($('#recordBtn').hasClass('bg_red')) {
+          recordStop();
+        }
         penOff();
         penOff();
       }
       }
     });
     });
@@ -385,6 +388,9 @@ function changeCollaboration(changeCollaborationType) {
     android.setJoinCollaborationType(changeCollaborationType);
     android.setJoinCollaborationType(changeCollaborationType);
   }
   }
   joinCollaborationType = changeCollaborationType;
   joinCollaborationType = changeCollaborationType;
+  if ($('#recordBtn').hasClass('bg_red')) {
+    recordStop();
+  }
   initCollaborationUI(changeCollaborationType);
   initCollaborationUI(changeCollaborationType);
   switch (changeCollaborationType) {
   switch (changeCollaborationType) {
     case COLLABORATION_TYPE.AUDIO:
     case COLLABORATION_TYPE.AUDIO:
@@ -486,6 +492,9 @@ function Coview_exitCollaboration(isDocument = false) {
       android.exitMeetingRoom();
       android.exitMeetingRoom();
     }
     }
   }
   }
+  if ($('#recordBtn').hasClass('bg_red')) {
+    recordStop();
+  }
   clearInterval(timeInterval);
   clearInterval(timeInterval);
   coview_api.LeaveRoom();
   coview_api.LeaveRoom();
   if (coview_api.getRoomUsers()) {
   if (coview_api.getRoomUsers()) {