Merge branch 'feature/43156' into 'develop'

43156対応。

See merge request !174

public_new/js/share.js

@@ -121,10 +121,10 @@ document.addEventListener("DOMContentLoaded", function () {
     coview_api.Login(globalUserInfo.loginId);
     coview_api.Login(globalUserInfo.loginId);
     initCollaborationUI(joinCollaborationType);
     initCollaborationUI(joinCollaborationType);
     if (CHAT_UTIL.isAndroid()) {
     if (CHAT_UTIL.isAndroid()) {
-      android.setHostRequestFlg(HOST_REQUEST_FLG.DONE);
+      android.setHostRequestFlg(HostRequestFlag.DONE);
     } else {
     } else {
       webkit.messageHandlers.setHostRequestFlg.postMessage(
       webkit.messageHandlers.setHostRequestFlg.postMessage(
-        HOST_REQUEST_FLG.DONE
+        HostRequestFlag.DONE
       );
       );
     }
     }
     fw.socket.on("message", async function (data) {
     fw.socket.on("message", async function (data) {
@@ -224,8 +224,21 @@ document.addEventListener("DOMContentLoaded", function () {
           coview_api.HeartBeatUser(globalUserInfo.loginId);
           coview_api.HeartBeatUser(globalUserInfo.loginId);
           alert(getLocalizedString("err_target_android_version_not_support"));
           alert(getLocalizedString("err_target_android_version_not_support"));
         } else if (g_isMainMan) {
         } else if (g_isMainMan) {
+          fw.sendToMsg("others", "PIP_END_REQUEST", {
+            loginId: getFermiLoginId(data.payload.loginId),
+          });
+          await new Promise(done => setTimeout(() => done(), 500));
           Coview_changeHost(getFermiLoginId(data.payload.loginId));
           Coview_changeHost(getFermiLoginId(data.payload.loginId));
         }
         }
+      } else if (data.type === "PIP_END_REQUEST") {
+        if (data.payload.loginId == globalUserInfo.loginId && joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
+          if (CHAT_UTIL.isAndroid()) {
+            android.finishPip();
+            mChatWebView.loadUrl("javascript:$('.pip_indicator').addClass('none');");
+          } else {
+            webkit.messageHandlers.finishPipMode.postMessage({});
+          }
+        }
       } else if (data.type === "API_SEND_OWNER_CHANGE_COMPLETE") {
       } else if (data.type === "API_SEND_OWNER_CHANGE_COMPLETE") {
         penOff();
         penOff();
         if ($("#recordBtn").hasClass("bg_red")) {
         if ($("#recordBtn").hasClass("bg_red")) {
@@ -239,6 +252,15 @@ document.addEventListener("DOMContentLoaded", function () {
           micOn();
           micOn();
         }
         }
       } else if (data.type === "CHANGE_HOST_APPLY") {
       } else if (data.type === "CHANGE_HOST_APPLY") {
+        if (g_isMainMan) {
+          coview_api.HeartBeatUser(globalUserInfo.loginId);
+          if (CHAT_UTIL.isAndroid()) {
+            $(".pip_indicator").addClass("none");
+            android.finishPip();
+          } else {
+            webkit.messageHandlers.finishPipMode.postMessage({});
+          }
+        }
         if (CHAT_UTIL.isAndroid()) {
         if (CHAT_UTIL.isAndroid()) {
           android.setHostRequestFlg(HostRequestFlag.DOING);
           android.setHostRequestFlg(HostRequestFlag.DOING);
         } else {
         } else {
@@ -246,8 +268,8 @@ document.addEventListener("DOMContentLoaded", function () {
             HostRequestFlag.DOING
             HostRequestFlag.DOING
           );
           );
         }
         }
+        await new Promise(done => setTimeout(() => done(), 500));
         if (g_isMainMan) {
         if (g_isMainMan) {
-          coview_api.HeartBeatUser(globalUserInfo.loginId);
           if (
           if (
             confirm(
             confirm(
               getLocalizedString(
               getLocalizedString(
@@ -573,7 +595,7 @@ var scrollLock = function (e) {
   }
   }
 };
 };
 
 
-// let collaboScreen = document.getElementById("collabo_main");
+ let collaboScreen = document.getElementById("collabo_main");
 
 
 function scrollLockON() {
 function scrollLockON() {
   collaboScreen.addEventListener("touchmove", scrollLock, { passive: false });
   collaboScreen.addEventListener("touchmove", scrollLock, { passive: false });