Merge branch 'develop_kim-ec' into 'develop'

# Conflicts:
#   public_new/js/sockets/chat-websocket-message.js

public_new/js/common/common.js

@@ -169,7 +169,7 @@ Common.startCollaboration = function (collaborationType) {
       return;
     }
     const sendData = DATA_MESSAGE_SCHEME + FINISH_ALL_COLLABORATION_SIGNAL;
-    CHAT_SOCKET.emitCreateMessage(sendData, 0);
+    CHAT_SOCKET.emitCreateMessage(SOCKET_KEY.CREATE_MESSAGE, sendData);
     NativeBridgeDelegate.finishAllCollaboration();
   }
   NativeBridgeDelegate.startCollaboration(collaborationType);

public_new/js/common/constant.js

@@ -131,6 +131,7 @@ const SOCKET_KEY = {
   DISCONNECT: "disconnect",
   CONNECT_ERROR: "connect_error",
   NEW_MESSAGE: "newMessage",
+  NEW_COMMUNICATION: "newCommunication",  
   NEW_NOTIFICATION: "newNotification",
   REFRESH_GROUPLIST: "refreshGroupList",
   REFRESH_USERLIST_INGROUP: "refreshUserListInGroup",
@@ -138,6 +139,10 @@ const SOCKET_KEY = {
   RETRY_JOIN_PROCESS: "retryJoinProcess",
   JOIN: "join",
   CREATE_MESSAGE: "createMessage",
+  CREATE_TEXT: "createText",
+  CREATE_IMAGE: "createImage",
+  CREATE_VIDEO: "createVideo",
+  CREATE_COMMUNICATIONSTART: "createCommunicationStart",  
   GET_GROUP_LIST: "getGroupList",
   LEAVE_ROOM: "leaveRoom",
 };

public_new/js/sockets/chat-websocket-message.js

@@ -2,50 +2,57 @@ CHAT_SOCKET.bindOnNewMessage = function () {
   // New Message
   // #36170
   socket.on(SOCKET_KEY.NEW_MESSAGE, function (message, roomID, roomName) {
-    const systemMessageTemplate = getTemplate(TemplateURL.SYSTEM_MESSAGE);
-
-    const unwrappedMessageInfo = CHAT_SOCKET.decodeMessage(message.text);
-    if (
-      unwrappedMessageInfo ==
-      DATA_MESSAGE_SCHEME + FINISH_ALL_COLLABORATION_SIGNAL
-    ) {
-      CHAT_SOCKET.cleanUpCollaborationMessage();
-      return;
-    }
-
-    if (unwrappedMessageInfo.includes(messageSeperator)) {
-      const messageInfo = unwrappedMessageInfo.split(messageSeperator);
-      const messageText = messageInfo[0];
-      const messageType = messageInfo[1];
-
-      if (
-        messageType == MessageType.COMMUNICATIONSTART ||
-        messageType == MessageType.COMMUNICATIONEND
-      ) {
-        CHAT_SOCKET.addCollaborationMessage(
-          messageInfo,
-          message.userId,
-          roomName,
-          message.insertDate,
-          message.createdAt
-        );
-      } else {
-        CHAT_SOCKET.addTextMessage(messageText, message, socket.id);
-      }
-    }
-
-    if (typeof ChatRoom !== "undefined") {
-      // 画像、動画の描画を待ってからスクロール
-      setTimeout(function () {
-        ChatRoom.scrollToBottom();
-      }, 300);
-    } else {
-      Common.dismissLoadingIndicator();
-    }
+    handleMessage(message, roomName, SOCKET_KEY.NEW_MESSAGE)
+  });
+
+  socket.on(SOCKET_KEY.NEW_COMMUNICATION, function (message, roomID, roomName) {
+    handleMessage(message, roomName, SOCKET_KEY.NEW_COMMUNICATION)
   });
 };
 
-CHAT_SOCKET.decodeMessage = function (text) {
+var handleMessage = function (message, roomName, socketKey) {
+  const systemMessageTemplate = getTemplate(TemplateURL.SYSTEM_MESSAGE);
+
+  const unwrappedMessageInfo = decodeMessage(message.text);
+  if (
+    unwrappedMessageInfo ==
+    DATA_MESSAGE_SCHEME + FINISH_ALL_COLLABORATION_SIGNAL
+  ) {
+    cleanUpCollaborationMessage();
+    return;
+  }
+
+  const messageInfo = unwrappedMessageInfo.split(messageSeperator);
+  const messageType = socketKey;
+  let messageText = unwrappedMessageInfo;
+
+  if (unwrappedMessageInfo.includes(messageSeperator)) {
+    messageText = messageInfo[0];
+  }
+
+  if (
+    messageType == SOCKET_KEY.NEW_COMMUNICATION
+  ) {
+    addCollaborationMessage(
+      messageInfo,
+      message.userId,
+      roomName,
+      message.insertDate,
+      message.createdAt
+    );
+  } else {
+    addTextMessage(messageText, message, socket.id);
+  }
+
+  if (typeof ChatRoom !== "undefined") {
+    // 画像、動画の描画を待ってからスクロール
+    setTimeout(function () {
+      ChatRoom.scrollToBottom();
+    }, 300);
+  }
+}
+
+var decodeMessage = function (text) {
   try {
     return decodeURIComponent(text);
   } catch (e) {

public_new/js/sockets/chat-websocket.js

@@ -188,14 +188,30 @@ var bindOnRefreshUserListInGroup = function () {
   );
 };
 
-CHAT_SOCKET.emitCreateMessage = function (sendData, offset) {
-  socket.emit(SOCKET_KEY.CREATE_MESSAGE, { text: sendData }, offset);
+CHAT_SOCKET.emitCreateMessage = function (socketKey, sendData) {
+  socket.emit(socketKey, { text: sendData });
+};
+
+CHAT_SOCKET.emitCreateText = function (sendData) {
+  CHAT_SOCKET.emitCreateMessage(SOCKET_KEY.CREATE_TEXT, sendData);
+};
+
+CHAT_SOCKET.emitCreateImage = function (sendData) {
+  CHAT_SOCKET.emitCreateMessage(SOCKET_KEY.CREATE_IMAGE, sendData);
+};
+
+CHAT_SOCKET.emitCreateVideo = function (sendData) {
+  CHAT_SOCKET.emitCreateMessage(SOCKET_KEY.CREATE_VIDEO, sendData);
+};
+
+CHAT_SOCKET.emitCreateCommunicationStart = function (sendData, collaborationType, meetingID) {
+  socket.emit(SOCKET_KEY.CREATE_COMMUNICATIONSTART, { text: sendData }, collaborationType, meetingID);
 };
 
 CHAT_SOCKET.emitCollaborationFinishMessage = function () {
   if (socket != null && socket.connected) {
     const sendData = DATA_MESSAGE_SCHEME + FINISH_ALL_COLLABORATION_SIGNAL;
-    CHAT_SOCKET.emitCreateMessage(sendData, 0);
+    CHAT_SOCKET.emitCreateMessage(SOCKET_KEY.CREATE_MESSAGE, sendData);
   }
 };
 

public_new/js/utils/chat-media-handler.js

@@ -168,8 +168,8 @@ ChatMediaHandler.videoEncodeEnd = function (encodedUri) {
         } catch (e) {
           encodedText = text;
         }
-        const sendData = encodedText + messageSeperator + MessageType.VIDEO;
-        CHAT_SOCKET.emitCreateMessage(sendData, 1);
+        const sendData = encodedText;
+        CHAT_SOCKET.emitCreateVideo(sendData);
 
         $(".overlay").removeClass("active undismissable");
         $(".loader").removeClass("active");
@@ -319,8 +319,8 @@ ChatMediaHandler.uploadImage = function (formData) {
         } catch (e) {
           encodedText = text;
         }
-        const sendData = encodedText + messageSeperator + MessageType.IMAGE;
-        CHAT_SOCKET.emitCreateMessage(sendData, 1);
+        const sendData = encodedText;
+        CHAT_SOCKET.emitCreateImage(sendData);
       } else {
         // 動画の処理
         if (res.thumbnailPath && res.thumbnailPath.length > 0) {
@@ -369,8 +369,8 @@ ChatMediaHandler.uploadImage = function (formData) {
         } catch (e) {
           encodedText = text;
         }
-        const sendData = encodedText + messageSeperator + MessageType.VIDEO;
-        CHAT_SOCKET.emitCreateMessage(sendData, 1);
+        const sendData = encodedText;
+        CHAT_SOCKET.emitCreateVideo(sendData);
       }
 
       $(".overlay").removeClass("active undismissable");

public_new/js/views/chats/chat-room-message.js

@@ -65,8 +65,8 @@ ChatRoom.sendMessage = function (e) {
   messageTextBox.val("");
 
   if (message.length > 0) {
-    const sendData = message + messageSeperator + MessageType.TEXT;
-    CHAT_SOCKET.emitCreateMessage(sendData, 0);
+    const sendData = message;
+    CHAT_SOCKET.emitCreateText(sendData);
   }
   $(".message_input_form").focus();
 };

public_new/js/views/collaboration/share-event-listener.js

@@ -206,18 +206,15 @@ CollaborationFeature.didReceiveLoginResponseMessage = async function () {
 };
 
 CollaborationFeature.didReceiveCreateRoomResponseMessage = function () {
-  let coviewInviteMessage =
-    "" +
-    messageSeperator +
-    MessageType.COMMUNICATIONSTART +
-    messageSeperator +
-    CHAT_UTIL.getCollaborationTypeNumber(globalUserInfo.collaborationType);
+  let coviewInviteMessage = "";
+  let collaborationType = CHAT_UTIL.getCollaborationTypeNumber(globalUserInfo.collaborationType);
+  let meetingID = null
 
   if (globalUserInfo.collaborationType == COLLABORATION_TYPE.DOCUMENT) {
-    coviewInviteMessage += messageSeperator + globalUserInfo.meetingID;
+    meetingID = globalUserInfo.meetingID;
   }
 
-  CHAT_SOCKET.emitCreateMessage(coviewInviteMessage, 0);
+  CHAT_SOCKET.emitCreateCommunicationStart(coviewInviteMessage, collaborationType, meetingID);
 };
 
 CollaborationFeature.didReceivedJoinRoomInfoResponseMessage = function () {