Merge branch 'feature/43212' into 'develop'

43212対応。

See merge request !180

public_new/collaboration.html

@@ -185,6 +185,7 @@
     let IS_MOBILE = true;
     let IS_MOBILE = true;
     let IS_ONLINE = false;
     let IS_ONLINE = false;
     let collaborationJoinFlg = 0;
     let collaborationJoinFlg = 0;
+    let isInvited = 0;
     let roomType;
     let roomType;
     let joinCollaborationType = 0;
     let joinCollaborationType = 0;
     let joinMeetingId = 0;
     let joinMeetingId = 0;

public_new/js/constant.js

@@ -58,6 +58,11 @@ const PagingSize = {
   MESSAGE: 100
   MESSAGE: 100
 };
 };
 
 
+const InvitedFlag = {
+  NONE: 0,
+  INVITED: 1,
+};
+
 const messageSeperator = "<::split>";
 const messageSeperator = "<::split>";
 const DATA_MESSAGE_SCHEME = "::NOT_MESSAGE";
 const DATA_MESSAGE_SCHEME = "::NOT_MESSAGE";
 const FINISH_ALL_COLLABORATION_SIGNAL = "::ALL_COLLABORATION_END";
 const FINISH_ALL_COLLABORATION_SIGNAL = "::ALL_COLLABORATION_END";

public_new/js/share.js

@@ -367,6 +367,7 @@ document.addEventListener("DOMContentLoaded", function () {
             loginId: globalUserInfo.loginId,
             loginId: globalUserInfo.loginId,
           });
           });
           collaborationJoinFlg = "1";
           collaborationJoinFlg = "1";
+          isInvited = InvitedFlag.INVITED;
         }
         }
       }
       }
     });
     });
@@ -447,6 +448,7 @@ document.addEventListener("DOMContentLoaded", function () {
             joinMeetingId = meetingId;
             joinMeetingId = meetingId;
           }
           }
         } else if (collaborationJoinFlg == "2") {
         } else if (collaborationJoinFlg == "2") {
+          isInvited = InvitedFlag.INVITED;
           coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
           coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
         }
         }
         Coview_moveToVideoShareArea();
         Coview_moveToVideoShareArea();
@@ -766,7 +768,7 @@ function Coview_finishCollaboration() {
     }
     }
   }
   }
   isLeaved = true;
   isLeaved = true;
-  if (collaborationJoinFlg != "2") {
+  if (isInvited == InvitedFlag.NONE) {
     CHAT_UI.joinRoom(
     CHAT_UI.joinRoom(
       CHAT.globalLoginParameter.roomId,
       CHAT.globalLoginParameter.roomId,
       CHAT.globalLoginParameter.name
       CHAT.globalLoginParameter.name