Merge branch 'communication/#43232_in-camera' into 'develop'

#43232_in-camera_画像協業に切り替えるとインカメラの映像が共有されるバグを修正

See merge request !187

public_new/js/chat-ui.js

@@ -2251,6 +2251,9 @@ CHAT_UI.refreshForOffline = function () {
     alertString = getLocalizedString("err_weak_network_exit_collaboration");
     alertString = getLocalizedString("err_weak_network_exit_collaboration");
   }
   }
   alert(alertString);
   alert(alertString);
+  if (CHAT_UTIL.isIOS()) {
+    webkit.messageHandlers.finishCollaboration.postMessage({});
+  }
   if (collaborationJoinFlg != "2") {
   if (collaborationJoinFlg != "2") {
     CHAT_UI.joinRoom(
     CHAT_UI.joinRoom(
       CHAT.globalLoginParameter.roomId,
       CHAT.globalLoginParameter.roomId,

public_new/js/share.js

@@ -256,6 +256,11 @@ document.addEventListener("DOMContentLoaded", function () {
         } else {
         } else {
           micOn();
           micOn();
         }
         }
+      } else if (data.type === "API_SEND_OWNER_CHANGE_CONFIRM") {
+        if (joinCollaborationType == COLLABORATION_TYPE.CAMERA) {
+          await new Promise(done => setTimeout(() => done(), 500));
+          removeOldLocalVideo(g_localStream);
+        }
       } else if (data.type === "CHANGE_HOST_APPLY") {
       } else if (data.type === "CHANGE_HOST_APPLY") {
         if (g_isMainMan) {
         if (g_isMainMan) {
           coview_api.HeartBeatUser(globalUserInfo.loginId);
           coview_api.HeartBeatUser(globalUserInfo.loginId);
@@ -623,6 +628,7 @@ function changeCollaboration(changeCollaborationType) {
           coview_api.ChangeCollaboration("audio");
           coview_api.ChangeCollaboration("audio");
           break;
           break;
         case COLLABORATION_TYPE.CAMERA:
         case COLLABORATION_TYPE.CAMERA:
+          removeOldLocalVideo(g_localStream);
           coview_api.ChangeCollaboration("image");
           coview_api.ChangeCollaboration("image");
           break;
           break;
         case COLLABORATION_TYPE.VIDEO:
         case COLLABORATION_TYPE.VIDEO: