Skip to content

C
chat_webview
Commit 9b995d74 by Kim Eunchul
Options

Merge branch 'develop_kim-ec' into 'develop' 

# Conflicts:
#   public_new/js/sockets/chat-websocket-message.js
parents f6859950 2be15710
Showing with 60 additions and 35 deletions
public_new/js/common/common.js
...@@ -169,7 +169,7 @@ Common.startCollaboration = function (collaborationType) { ...@@ -169,7 +169,7 @@ Common.startCollaboration = function (collaborationType) {
return; return;
} }
const sendData = DATA_MESSAGE_SCHEME + FINISH_ALL_COLLABORATION_SIGNAL; 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.finishAllCollaboration();
} }
NativeBridgeDelegate.startCollaboration(collaborationType); NativeBridgeDelegate.startCollaboration(collaborationType);
......
public_new/js/common/constant.js
...@@ -131,6 +131,7 @@ const SOCKET_KEY = { ...@@ -131,6 +131,7 @@ const SOCKET_KEY = {
DISCONNECT: "disconnect", DISCONNECT: "disconnect",
CONNECT_ERROR: "connect_error", CONNECT_ERROR: "connect_error",
NEW_MESSAGE: "newMessage", NEW_MESSAGE: "newMessage",
NEW_COMMUNICATION: "newCommunication",
NEW_NOTIFICATION: "newNotification", NEW_NOTIFICATION: "newNotification",
REFRESH_GROUPLIST: "refreshGroupList", REFRESH_GROUPLIST: "refreshGroupList",
REFRESH_USERLIST_INGROUP: "refreshUserListInGroup", REFRESH_USERLIST_INGROUP: "refreshUserListInGroup",
...@@ -138,6 +139,10 @@ const SOCKET_KEY = { ...@@ -138,6 +139,10 @@ const SOCKET_KEY = {
RETRY_JOIN_PROCESS: "retryJoinProcess", RETRY_JOIN_PROCESS: "retryJoinProcess",
JOIN: "join", JOIN: "join",
CREATE_MESSAGE: "createMessage", CREATE_MESSAGE: "createMessage",
CREATE_TEXT: "createText",
CREATE_IMAGE: "createImage",
CREATE_VIDEO: "createVideo",
CREATE_COMMUNICATIONSTART: "createCommunicationStart",
GET_GROUP_LIST: "getGroupList", GET_GROUP_LIST: "getGroupList",
LEAVE_ROOM: "leaveRoom", LEAVE_ROOM: "leaveRoom",
}; };
......
public_new/js/sockets/chat-websocket-message.js
...@@ -2,27 +2,38 @@ CHAT_SOCKET.bindOnNewMessage = function () { ...@@ -2,27 +2,38 @@ CHAT_SOCKET.bindOnNewMessage = function () {
// New Message // New Message
// #36170 // #36170
socket.on(SOCKET_KEY.NEW_MESSAGE, function (message, roomID, roomName) { socket.on(SOCKET_KEY.NEW_MESSAGE, function (message, roomID, roomName) {
handleMessage(message, roomName, SOCKET_KEY.NEW_MESSAGE)
});
socket.on(SOCKET_KEY.NEW_COMMUNICATION, function (message, roomID, roomName) {
handleMessage(message, roomName, SOCKET_KEY.NEW_COMMUNICATION)
});
};
var handleMessage = function (message, roomName, socketKey) {
const systemMessageTemplate = getTemplate(TemplateURL.SYSTEM_MESSAGE); const systemMessageTemplate = getTemplate(TemplateURL.SYSTEM_MESSAGE);
const unwrappedMessageInfo = CHAT_SOCKET.decodeMessage(message.text); const unwrappedMessageInfo = decodeMessage(message.text);
if ( if (
unwrappedMessageInfo == unwrappedMessageInfo ==
DATA_MESSAGE_SCHEME + FINISH_ALL_COLLABORATION_SIGNAL DATA_MESSAGE_SCHEME + FINISH_ALL_COLLABORATION_SIGNAL
) { ) {
CHAT_SOCKET.cleanUpCollaborationMessage(); cleanUpCollaborationMessage();
return; return;
} }
if (unwrappedMessageInfo.includes(messageSeperator)) {
const messageInfo = unwrappedMessageInfo.split(messageSeperator); const messageInfo = unwrappedMessageInfo.split(messageSeperator);
const messageText = messageInfo[0]; const messageType = socketKey;
const messageType = messageInfo[1]; let messageText = unwrappedMessageInfo;
if (unwrappedMessageInfo.includes(messageSeperator)) {
messageText = messageInfo[0];
}
if ( if (
messageType == MessageType.COMMUNICATIONSTART || messageType == SOCKET_KEY.NEW_COMMUNICATION
messageType == MessageType.COMMUNICATIONEND
) { ) {
CHAT_SOCKET.addCollaborationMessage( addCollaborationMessage(
messageInfo, messageInfo,
message.userId, message.userId,
roomName, roomName,
...@@ -30,8 +41,7 @@ CHAT_SOCKET.bindOnNewMessage = function () { ...@@ -30,8 +41,7 @@ CHAT_SOCKET.bindOnNewMessage = function () {
message.createdAt message.createdAt
); );
} else { } else {
CHAT_SOCKET.addTextMessage(messageText, message, socket.id); addTextMessage(messageText, message, socket.id);
}
} }
if (typeof ChatRoom !== "undefined") { if (typeof ChatRoom !== "undefined") {
...@@ -39,13 +49,10 @@ CHAT_SOCKET.bindOnNewMessage = function () { ...@@ -39,13 +49,10 @@ CHAT_SOCKET.bindOnNewMessage = function () {
setTimeout(function () { setTimeout(function () {
ChatRoom.scrollToBottom(); ChatRoom.scrollToBottom();
}, 300); }, 300);
} else {
Common.dismissLoadingIndicator();
} }
}); }
};
CHAT_SOCKET.decodeMessage = function (text) { var decodeMessage = function (text) {
try { try {
return decodeURIComponent(text); return decodeURIComponent(text);
} catch (e) { } catch (e) {
......
public_new/js/sockets/chat-websocket.js
...@@ -188,14 +188,30 @@ var bindOnRefreshUserListInGroup = function () { ...@@ -188,14 +188,30 @@ var bindOnRefreshUserListInGroup = function () {
); );
}; };
CHAT_SOCKET.emitCreateMessage = function (sendData, offset) { CHAT_SOCKET.emitCreateMessage = function (socketKey, sendData) {
socket.emit(SOCKET_KEY.CREATE_MESSAGE, { text: sendData }, offset); 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 () { CHAT_SOCKET.emitCollaborationFinishMessage = function () {
if (socket != null && socket.connected) { if (socket != null && socket.connected) {
const sendData = DATA_MESSAGE_SCHEME + FINISH_ALL_COLLABORATION_SIGNAL; 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) { ...@@ -168,8 +168,8 @@ ChatMediaHandler.videoEncodeEnd = function (encodedUri) {
} catch (e) { } catch (e) {
encodedText = text; encodedText = text;
} }
const sendData = encodedText + messageSeperator + MessageType.VIDEO; const sendData = encodedText;
CHAT_SOCKET.emitCreateMessage(sendData, 1); CHAT_SOCKET.emitCreateVideo(sendData);
$(".overlay").removeClass("active undismissable"); $(".overlay").removeClass("active undismissable");
$(".loader").removeClass("active"); $(".loader").removeClass("active");
...@@ -319,8 +319,8 @@ ChatMediaHandler.uploadImage = function (formData) { ...@@ -319,8 +319,8 @@ ChatMediaHandler.uploadImage = function (formData) {
} catch (e) { } catch (e) {
encodedText = text; encodedText = text;
} }
const sendData = encodedText + messageSeperator + MessageType.IMAGE; const sendData = encodedText;
CHAT_SOCKET.emitCreateMessage(sendData, 1); CHAT_SOCKET.emitCreateImage(sendData);
} else { } else {
// 動画の処理 // 動画の処理
if (res.thumbnailPath && res.thumbnailPath.length > 0) { if (res.thumbnailPath && res.thumbnailPath.length > 0) {
...@@ -369,8 +369,8 @@ ChatMediaHandler.uploadImage = function (formData) { ...@@ -369,8 +369,8 @@ ChatMediaHandler.uploadImage = function (formData) {
} catch (e) { } catch (e) {
encodedText = text; encodedText = text;
} }
const sendData = encodedText + messageSeperator + MessageType.VIDEO; const sendData = encodedText;
CHAT_SOCKET.emitCreateMessage(sendData, 1); CHAT_SOCKET.emitCreateVideo(sendData);
} }
$(".overlay").removeClass("active undismissable"); $(".overlay").removeClass("active undismissable");
......
public_new/js/views/chats/chat-room-message.js
...@@ -65,8 +65,8 @@ ChatRoom.sendMessage = function (e) { ...@@ -65,8 +65,8 @@ ChatRoom.sendMessage = function (e) {
messageTextBox.val(""); messageTextBox.val("");
if (message.length > 0) { if (message.length > 0) {
const sendData = message + messageSeperator + MessageType.TEXT; const sendData = message;
CHAT_SOCKET.emitCreateMessage(sendData, 0); CHAT_SOCKET.emitCreateText(sendData);
} }
$(".message_input_form").focus(); $(".message_input_form").focus();
}; };
......
public_new/js/views/collaboration/share-event-listener.js
...@@ -206,18 +206,15 @@ CollaborationFeature.didReceiveLoginResponseMessage = async function () { ...@@ -206,18 +206,15 @@ CollaborationFeature.didReceiveLoginResponseMessage = async function () {
}; };
CollaborationFeature.didReceiveCreateRoomResponseMessage = function () { CollaborationFeature.didReceiveCreateRoomResponseMessage = function () {
let coviewInviteMessage = let coviewInviteMessage = "";
"" + let collaborationType = CHAT_UTIL.getCollaborationTypeNumber(globalUserInfo.collaborationType);
messageSeperator + let meetingID = null
MessageType.COMMUNICATIONSTART +
messageSeperator +
CHAT_UTIL.getCollaborationTypeNumber(globalUserInfo.collaborationType);
if (globalUserInfo.collaborationType == COLLABORATION_TYPE.DOCUMENT) { 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 () { CollaborationFeature.didReceivedJoinRoomInfoResponseMessage = function () {
......
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