Commit 9ec78f17 by Kang Donghun

[チャットルーム]のチャット履歴から現在協業が進行中なのか終了されたのか確認できる

parent a1097bef
...@@ -1261,7 +1261,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) { ...@@ -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);
...@@ -1326,7 +1326,8 @@ CHAT_UI.loadMessages = function(roomId, roomName) { ...@@ -1326,7 +1326,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;
......
...@@ -269,6 +269,7 @@ function Coview_exitCollaboration(isDocument = false) { ...@@ -269,6 +269,7 @@ function Coview_exitCollaboration(isDocument = false) {
} }
} }
coview_api.LeaveRoom(); coview_api.LeaveRoom();
if (coview_api.getRoomUsers()) { android.finishCollaboration() };
isLeaved = true; isLeaved = true;
if (collaborationJoinFlg != '2') { if (collaborationJoinFlg != '2') {
CHAT_UI.joinRoom(CHAT.globalLoginParameter.roomId, CHAT.globalLoginParameter.name); CHAT_UI.joinRoom(CHAT.globalLoginParameter.roomId, CHAT.globalLoginParameter.name);
......
...@@ -9,7 +9,7 @@ ...@@ -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 @@ ...@@ -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}})"> <button type="button" name="button" onclick="CHAT_UI.joinCollaboration({{collaborationType}})" {{#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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment