全協業終了対応

public_new/js/chat-websocket.js

@@ -205,7 +205,13 @@ function setSocketAction () {
         let type;
         let type;
         let collaborationType;
         let collaborationType;
         if (message.text == DATA_MESSAGE_SCHEME + FINISH_ALL_COLLABORATION_SIGNAL) {
         if (message.text == DATA_MESSAGE_SCHEME + FINISH_ALL_COLLABORATION_SIGNAL) {
-          console.log('allFINISH');
+          $('.collabo_area.start').each(function (index, collaborationMessage) {
+            $(collaborationMessage).removeClass('start');
+            $(collaborationMessage).addClass('end');
+            $(collaborationMessage).addClass('disable');
+            $(collaborationMessage).find('.collaboation_join_button').attr('disabled', 'disabled');
+            $(collaborationMessage).find('.collaboration_join_message').text(getLocalizedString('message_ended'));
+          });
           return;
           return;
         }
         }
         if ( message.text.includes(messageSeperator) ) {
         if ( message.text.includes(messageSeperator) ) {

public_new/js/language_en.js

@@ -61,6 +61,7 @@ $.lang.en = {
     "groupChatRoom":"Group",
     "groupChatRoom":"Group",
     "myGroup":"My Group",
     "myGroup":"My Group",
     "allGroup":"All Group",
     "allGroup":"All Group",
+    "message_ended" : "End",
     "returnToRootGroup":"Return to Root Group",
     "returnToRootGroup":"Return to Root Group",
     "returnToParentGroup":"Return to Parent Group",
     "returnToParentGroup":"Return to Parent Group",
     "quickBtn":"Quick Button",
     "quickBtn":"Quick Button",

public_new/js/language_ja.js

@@ -61,6 +61,7 @@ $.lang.ja = {
     "groupChatRoom":"グループ",
     "groupChatRoom":"グループ",
     "myGroup":"マイグループ",
     "myGroup":"マイグループ",
     "allGroup":"全グループ",
     "allGroup":"全グループ",
+    "message_ended" : "終了しました",
     "returnToRootGroup":"トップグループに戻る",
     "returnToRootGroup":"トップグループに戻る",
     "returnToParentGroup":"上位グループに戻る",
     "returnToParentGroup":"上位グループに戻る",
     "quickBtn":"クイックボタン",
     "quickBtn":"クイックボタン",

public_new/js/language_ko.js

@@ -61,6 +61,7 @@ $.lang.ko = {
     "groupChatRoom":"그룹",
     "groupChatRoom":"그룹",
     "myGroup":"내그룹",
     "myGroup":"내그룹",
     "allGroup":"전그룹",
     "allGroup":"전그룹",
+    "message_ended" : "종료되었습니다.",
     "returnToRootGroup":"최상위그룹으로 돌아가기",
     "returnToRootGroup":"최상위그룹으로 돌아가기",
     "returnToParentGroup":"상위그룹으로 돌아가기",
     "returnToParentGroup":"상위그룹으로 돌아가기",
     "quickBtn":"퀵버튼",
     "quickBtn":"퀵버튼",

public_new/js/share.js

@@ -119,7 +119,12 @@ $(function () {
     console.log("=============> READY : ready for coview api");
     console.log("=============> READY : ready for coview api");
     Coview_addLoginId(globalUserInfo.loginId);
     Coview_addLoginId(globalUserInfo.loginId);
     coview_api.Login(globalUserInfo.loginId);
     coview_api.Login(globalUserInfo.loginId);
-    initCollaborationUI(joinCollaborationType)
+    initCollaborationUI(joinCollaborationType);
+    if (CHAT_UTIL.isAndroid()) {
+      android.setHostRequestFlg(HOST_REQUEST_FLG.DONE);
+    } else {
+      webkit.messageHandlers.setHostRequestFlg.postMessage(HOST_REQUEST_FLG.DONE);
+    }
     fw.socket.on('message', async function(data) {
     fw.socket.on('message', async function(data) {
       console.log('====> message::data: ', data);
       console.log('====> message::data: ', data);
       if (data.type ==="CHANGE_COLLABORATION") {
       if (data.type ==="CHANGE_COLLABORATION") {
@@ -132,6 +137,7 @@ $(function () {
         }
         }
 
 
         if (CHAT_UTIL.isAndroid() && data.payload.collaborationType == COLLABORATION_TYPE.DOCUMENT && androidVersion < ANDROID_SDK_VERSION.O) {
         if (CHAT_UTIL.isAndroid() && data.payload.collaborationType == COLLABORATION_TYPE.DOCUMENT && androidVersion < ANDROID_SDK_VERSION.O) {
+          coview_api.HeartBeatUser(globalUserInfo.loginId);
           alert(getLocalizedString('not_support_version'));
           alert(getLocalizedString('not_support_version'));
           joinCollaborationType = COLLABORATION_TYPE.CAMERA;
           joinCollaborationType = COLLABORATION_TYPE.CAMERA;
         } else {
         } else {
@@ -182,6 +188,7 @@ $(function () {
         var isAndroid = data.payload.isAndroid;
         var isAndroid = data.payload.isAndroid;
         var isAble = data.payload.isAble
         var isAble = data.payload.isAble
         if (g_isMainMan && isAndroid && !isAble && joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
         if (g_isMainMan && isAndroid && !isAble && joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
+          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){
           Coview_changeHost(getFermiLoginId(data.payload.loginId));
           Coview_changeHost(getFermiLoginId(data.payload.loginId));
@@ -199,6 +206,7 @@ $(function () {
           webkit.messageHandlers.setHostRequestFlg.postMessage(HOST_REQUEST_FLG.DOING);
           webkit.messageHandlers.setHostRequestFlg.postMessage(HOST_REQUEST_FLG.DOING);
         }
         }
         if (g_isMainMan) {
         if (g_isMainMan) {
+          coview_api.HeartBeatUser(globalUserInfo.loginId);
           if(confirm(getLocalizedString('norify_request_host_change', data.payload.hostId))) {
           if(confirm(getLocalizedString('norify_request_host_change', data.payload.hostId))) {
             Coview_changeHost(getFermiLoginId(data.payload.hostId));
             Coview_changeHost(getFermiLoginId(data.payload.hostId));
             if (CHAT_UTIL.isAndroid()) {
             if (CHAT_UTIL.isAndroid()) {
@@ -571,6 +579,11 @@ function Coview_exitCollaboration(isDocument = false) {
       android.exitMeetingRoom();
       android.exitMeetingRoom();
     }
     }
   }
   }
+  if (socket != null && socket.connected) {
+    socket.emit('createMessage', {
+      text: DATA_MESSAGE_SCHEME + FINISH_ALL_COLLABORATION_SIGNAL
+    }, 0);
+  }
   if ($('#recordBtn').hasClass('bg_red')) {
   if ($('#recordBtn').hasClass('bg_red')) {
     recordStop(Coview_finishCollaboration);
     recordStop(Coview_finishCollaboration);
   } else {
   } else {