Merge branch 'develop' into feature/release_sp3_change_host_function

public_new/css/chat.css

@@ -764,6 +764,11 @@ input[name="tab_item"] {
 }
 }
 
 
 /**************************** modal *************************/
 /**************************** modal *************************/
+#menuModalCenter {
+    width: 70% !important;
+    margin-left: 15% !important;
+}
+
 /* メニューモーダル */
 /* メニューモーダル */
 .modal-body #modal_image {
 .modal-body #modal_image {
     width: 100%;
     width: 100%;

public_new/js/chat-ui.js

@@ -1261,7 +1261,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
         if (message.messageType == messageType.SYSTEM) {
         if (message.messageType == messageType.SYSTEM) {
             template = systemMessageTemplate;
             template = systemMessageTemplate;
         }
         }
-        if (message.messageType == messageType.COMMUNICATIONSTART) {
+        if (message.messageType == messageType.COMMUNICATIONSTART || message.messageType == messageType.COMMUNICATIONEND) {
             template = openCollaborationMessageTemplate;
             template = openCollaborationMessageTemplate;
         }
         }
         let messageTime = CHAT_UTIL.formatDate(message.insertDate);
         let messageTime = CHAT_UTIL.formatDate(message.insertDate);
@@ -1330,7 +1330,8 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
                  createdAtDay: messageTime.createdAtDay,
                  createdAtDay: messageTime.createdAtDay,
                  createdAtTime: messageTime.createdAtTime,
                  createdAtTime: messageTime.createdAtTime,
                  createdAtYear: message.insertDate.substring(0,4) + getLocalizedString('year') + ' ',
                  createdAtYear: message.insertDate.substring(0,4) + getLocalizedString('year') + ' ',
-                 isOtherYear: isOtherYear
+                 isOtherYear: isOtherYear,
+                 isEnded: message.messageType == messageType.COMMUNICATIONEND ? true : false
              });
              });
              html = message.message.includes('attachedImages') || message.message.includes('attachedVideos') ? CHAT_UTIL.htmlDecode(html) : html;
              html = message.message.includes('attachedImages') || message.message.includes('attachedVideos') ? CHAT_UTIL.htmlDecode(html) : html;
              workVal = html + workVal;
              workVal = html + workVal;

public_new/js/share.js

@@ -311,28 +311,29 @@ function Coview_moveToVideoShareArea() {
 }
 }
 
 
 function Coview_exitCollaboration(isDocument = false) {
 function Coview_exitCollaboration(isDocument = false) {
-  if (isDocument) {
-    if (CHAT_UTIL.isIOS()) {
-        webkit.messageHandlers.exitMeetingRoom.postMessage({});
-    } else if (CHAT_UTIL.isAndroid()) {
-        android.exitMeetingRoom();
+    if (isDocument) {
+        if (CHAT_UTIL.isIOS()) {
+            webkit.messageHandlers.exitMeetingRoom.postMessage({});
+        } else if (CHAT_UTIL.isAndroid()) {
+            android.exitMeetingRoom();
+        }
     }
     }
-  }
-  clearInterval(timeInterval);
-  coview_api.LeaveRoom();
-  isLeaved = true;
-  if (collaborationJoinFlg != "2") {
-    CHAT_UI.joinRoom(
-      CHAT.globalLoginParameter.roomId,
-      CHAT.globalLoginParameter.name
-    );
-  } else {
-    if (typeof android != "undefined") {
-      android.openCommunicationHome();
+    clearInterval(timeInterval);
+    coview_api.LeaveRoom();
+    if (coview_api.getRoomUsers()) { android.finishCollaboration() };
+    isLeaved = true;
+    if (collaborationJoinFlg != '2') {
+        CHAT_UI.joinRoom(
+          CHAT.globalLoginParameter.roomId,
+          CHAT.globalLoginParameter.name
+        );
     } else {
     } else {
-      webkit.messageHandlers.openCommunicationHome.postMessage({});
+        if (typeof android != "undefined") {
+          android.openCommunicationHome();
+        } else {
+          webkit.messageHandlers.openCommunicationHome.postMessage({});
+        }
     }
     }
-  }
 }
 }
 
 
 function Coview_changeHost(userId) {
 function Coview_changeHost(userId) {

public_new/template/template_open_collaboration_message.html

@@ -9,7 +9,7 @@
     <span>{{createdAtDay}}</span><span>{{createdAtTime}}</span>
     <span>{{createdAtDay}}</span><span>{{createdAtTime}}</span>
     {{/isToday}}
     {{/isToday}}
   </div>
   </div>
-  <div class="collabo_area">
+  <div class="collabo_area {{#isEnded}} disable {{/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,7 +27,7 @@
         </div>
         </div>
       </div>
       </div>
       <div class="collabo_btn">
       <div class="collabo_btn">
-        <button type="button" name="button" onclick="CHAT_UI.joinCollaboration({{collaborationType}}, {{meetingId}})">
+        <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="通話">
           <span>参加する</span>
           <span>参加する</span>
         </button>
         </button>