ルームの全協業終了処理追加。

public_new/js/chat-ui.js

@@ -2496,13 +2496,27 @@ CHAT_UI.joinCollaboration = function(collaborationType, meetingId = 0) {
 }
 }
 
 
 CHAT_UI.startCollaboration = function(collaborationType) {
 CHAT_UI.startCollaboration = function(collaborationType) {
-    if (CHAT_UTIL.isIOS()) {
-        webkit.messageHandlers.startCollaboration.postMessage(collaborationType);
-    } else if (CHAT_UTIL.isAndroid()) {
+    if (CHAT_UTIL.isAndroid()) {
         if (collaborationType == COLLABORATION_TYPE.DOCUMENT && androidVersion < ANDROID_SDK_VERSION.O) {
         if (collaborationType == COLLABORATION_TYPE.DOCUMENT && androidVersion < ANDROID_SDK_VERSION.O) {
             alert(getLocalizedString('not_support_version'));
             alert(getLocalizedString('not_support_version'));
             return;
             return;
         }
         }
+    }
+
+    if ($('.collabo_area.start').length != 0) {
+        if (!confirm(getLocalizedString('already_exist_collaboration'))) {
+            CHAT_UI.dismissLoadingIndicator();
+            return;
+        }
+        socket.emit('createMessage', {
+            text: encodedText + messageSeperator + messageType.IMAGE
+        }, 1);
+        android.finishAllCollaboration();
+    }
+
+    if (CHAT_UTIL.isIOS()) {
+        webkit.messageHandlers.startCollaboration.postMessage(collaborationType);
+    } else if (CHAT_UTIL.isAndroid()) {
         android.startCollaboration(collaborationType);
         android.startCollaboration(collaborationType);
     }
     }
 }
 }

public_new/js/language_en.js

@@ -99,5 +99,6 @@ $.lang.en = {
     "not_support_version" : "did not support this device version.",
     "not_support_version" : "did not support this device version.",
     "err_target_android_version_not_support" : "did not support document collaboration on this user's device version.",
     "err_target_android_version_not_support" : "did not support document collaboration on this user's device version.",
     "err_not_exist_room" : "this room is not exist.",
     "err_not_exist_room" : "this room is not exist.",
-    "norify_request_host_change" : "%@ request host permission \ndo you want to approve?"
+    "norify_request_host_change" : "%@ request host permission \ndo you want to approve?",
+    "already_exist_collaboration" : "already exist collaboration. do you want finish already exist collaboration and start new one?"
 }
 }

public_new/js/language_ja.js

@@ -99,5 +99,6 @@ $.lang.ja = {
     "not_support_version" : "現在の端末バージョンでは利用できません。",
     "not_support_version" : "現在の端末バージョンでは利用できません。",
     "err_target_android_version_not_support" : "対象ユーザの端末バージョンでは文書協業が利用できません。",
     "err_target_android_version_not_support" : "対象ユーザの端末バージョンでは文書協業が利用できません。",
     "err_not_exist_room" : "該当のルームが存在しません。",
     "err_not_exist_room" : "該当のルームが存在しません。",
-    "norify_request_host_change" : "%@様からホスト変更リクエストがあります。\n承認しますか？"
+    "norify_request_host_change" : "%@様からホスト変更リクエストがあります。\n承認しますか？",
+    "already_exist_collaboration" : "現在進行中の協業があります。進行中の協業を終了し、新たな協業を開始しますか？"
 }
 }
\ No newline at end of file

public_new/js/language_ko.js

@@ -99,5 +99,6 @@ $.lang.ko = {
     "not_support_version" : "현재단말버전에서는 지원되지않는기능입니다.",
     "not_support_version" : "현재단말버전에서는 지원되지않는기능입니다.",
     "err_target_android_version_not_support" : "해당 유저의 단말버전에서는 문서협업이 이용불가능합니다.",
     "err_target_android_version_not_support" : "해당 유저의 단말버전에서는 문서협업이 이용불가능합니다.",
     "err_not_exist_room" : "해당 룸이 존재하지않습니다.",
     "err_not_exist_room" : "해당 룸이 존재하지않습니다.",
-    "norify_request_host_change" : "%@님이 호스트변경을 요청하셨습니다.\n승인하시겠습니까?"
+    "norify_request_host_change" : "%@님이 호스트변경을 요청하셨습니다.\n승인하시겠습니까?",
+    "already_exist_collaboration" : "현재 진행중인 협업이 있습니다. 진행중인 협업을 강제종료하고 새로 개시하시겠습니까?"
 }
 }

public_new/js/share.js

@@ -511,7 +511,7 @@ function Coview_exitCollaboration(isDocument = false) {
     if (CHAT_UTIL.isIOS()) {
     if (CHAT_UTIL.isIOS()) {
       webkit.messageHandlers.finishCollaboration.postMessage({});
       webkit.messageHandlers.finishCollaboration.postMessage({});
     } else if (CHAT_UTIL.isAndroid()) {
     } else if (CHAT_UTIL.isAndroid()) {
-      android.finishCollaboration() 
+      android.finishCollaboration();
     }
     }
   };
   };
   isLeaved = true;
   isLeaved = true;

public_new/template/template_open_collaboration_message.html

@@ -9,7 +9,12 @@
     <span>{{createdAtDay}}</span><span>{{createdAtTime}}</span>
     <span>{{createdAtDay}}</span><span>{{createdAtTime}}</span>
     {{/isToday}}
     {{/isToday}}
   </div>
   </div>
-  <div class="collabo_area {{#isEnded}} disable {{/isEnded}}">
+  {{#isEnded}}
+  <div class="collabo_area end disable">
+  {{/isEnded}}
+  {{^isEnded}}
+  <div class="collabo_area start">
+  {{/isEnded}}
     <div class="collabo_desc">
     <div class="collabo_desc">
       <div class="collabo_room_name d-flex flex-row">
       <div class="collabo_room_name d-flex flex-row">
         <span>{{roomName}}</span>
         <span>{{roomName}}</span>
@@ -27,13 +32,13 @@
         </div>
         </div>
       </div>
       </div>
       <div class="collabo_btn">
       <div class="collabo_btn">
-        <button type="button" name="button" onclick="CHAT_UI.joinCollaboration({{collaborationType}}, {{meetingId}})" {{#isEnded}} disabled {{/isEnded}}>
+        <button class="collaboation_join_button" type="button" name="button" onclick="CHAT_UI.joinCollaboration({{collaborationType}}, {{meetingId}})" {{#isEnded}} disabled {{/isEnded}}>
           <img src="icon/icon_profile_phone.png" alt="通話">
           <img src="icon/icon_profile_phone.png" alt="通話">
           {{#isEnded}}
           {{#isEnded}}
-          <span>終了しました</span>
+          <span class="collaboration_join_message">終了しました</span>
           {{/isEnded}}
           {{/isEnded}}
           {{^isEnded}}
           {{^isEnded}}
-          <span>参加する</span>
+          <span class="collaboration_join_message">参加する</span>
           {{/isEnded}}
           {{/isEnded}}
         </button>
         </button>
       </div>
       </div>