Skip to content

C
chat_webview
Commit a1bee735 by Kim Peace
Options

Fixed ios post message to KEY

parent 69c96185
Showing with 56 additions and 23 deletions
public_new/js/chat-ui-collaboration.js
CHAT_UI.joinCollaboration = function (collaborationType, meetingId = 0) { CHAT_UI.joinCollaboration = function (collaborationType, meetingId = 0) {
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
const COLLABORATION_TYPE_KEY = POST_MESSAGE_KEY.COLLABORATION_TYPE;
const MEETING_ID_KEY = POST_MESSAGE_KEY.MEETING_ID;
webkit.messageHandlers.joinCollaboration.postMessage({ webkit.messageHandlers.joinCollaboration.postMessage({
"collaborationType": collaborationType, COLLABORATION_TYPE_KEY: collaborationType,
"meetingId": meetingId, MEETING_ID_KEY: meetingId,
}); });
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
if ( if (
...@@ -393,9 +395,11 @@ CHAT_UI.confirmInviteUserListInCollaboration = function () { ...@@ -393,9 +395,11 @@ CHAT_UI.confirmInviteUserListInCollaboration = function () {
CHAT_UTIL.getCollaborationType(globalUserInfo.coWorkType) CHAT_UTIL.getCollaborationType(globalUserInfo.coWorkType)
); );
} else { } else {
const USER_ID_LIST_KEY = POST_MESSAGE_KEY.USER_ID_LIST;
const COLLABORATION_TYPE_KEY = POST_MESSAGE_KEY.COLLABORATION_TYPE;
webkit.messageHandlers.inviteCollaboration.postMessage({ webkit.messageHandlers.inviteCollaboration.postMessage({
"userIdList": userIdList.join(","), USER_ID_LIST_KEY: userIdList.join(","),
"collaborationType": CHAT_UTIL.getCollaborationType( COLLABORATION_TYPE_KEY: CHAT_UTIL.getCollaborationType(
globalUserInfo.coWorkType globalUserInfo.coWorkType
), ),
}); });
......
public_new/js/chat-ui.js
...@@ -142,8 +142,9 @@ $('a[data-toggle="pill"]').on("show.bs.tab", function (e) { ...@@ -142,8 +142,9 @@ $('a[data-toggle="pill"]').on("show.bs.tab", function (e) {
if (typeof android != "undefined") { if (typeof android != "undefined") {
android.updateRoomList(); android.updateRoomList();
} else { } else {
const GROUP_ID_KEY = POST_MESSAGE_KEY.GROUP_ID;
webkit.messageHandlers.updateRoomList.postMessage({ webkit.messageHandlers.updateRoomList.postMessage({
"groupId": "0", GROUP_ID_KEY: "0",
}); });
} }
}); });
...@@ -1024,9 +1025,11 @@ CHAT_UI.joinRoom = function (roomId, roomName) { ...@@ -1024,9 +1025,11 @@ CHAT_UI.joinRoom = function (roomId, roomName) {
alert(getLocalizedString("err_not_exist_room")); alert(getLocalizedString("err_not_exist_room"));
} }
} else { } else {
const ROOM_ID_KEY = POST_MESSAGE_KEY.ROOM_ID;
const ROOM_NAME = POST_MESSAGE_KEY.ROOM_NAME;
webkit.messageHandlers.joinRoom.postMessage({ webkit.messageHandlers.joinRoom.postMessage({
"roomId": roomId, ROOM_ID_KEY: roomId,
"roomName": roomName, ROOM_NAME: roomName,
}); });
} }
}; };
...@@ -2167,8 +2170,9 @@ CHAT_UI.showAddUserConfirmView = function () { ...@@ -2167,8 +2170,9 @@ CHAT_UI.showAddUserConfirmView = function () {
if (typeof android != "undefined") { if (typeof android != "undefined") {
android.inviteUsers(userIdList.join(","), false); android.inviteUsers(userIdList.join(","), false);
} else { } else {
const USER_ID_LIST_KEY = POST_MESSAGE_KEY.USER_ID_LIST;
webkit.messageHandlers.inviteUsers.postMessage({ webkit.messageHandlers.inviteUsers.postMessage({
"userIdList": userIdList.join(","), USER_ID_LIST_KEY: userIdList.join(","),
}); });
} }
}); });
...@@ -2396,7 +2400,8 @@ CHAT_UI.offlineHandler = function (e) { ...@@ -2396,7 +2400,8 @@ CHAT_UI.offlineHandler = function (e) {
CHAT_UI.displayExistRoom = function (roomId) { CHAT_UI.displayExistRoom = function (roomId) {
if (confirm("error_already_exist_same_user")) { if (confirm("error_already_exist_same_user")) {
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
webkit.messageHandlers.joinRoom.postMessage({ "roomId": roomId }); const ROOM_ID_KEY = POST_MESSAGE_KEY.ROOM_ID;
webkit.messageHandlers.joinRoom.postMessage({ ROOM_ID_KEY: roomId });
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
android.joinRoom(roomId, ""); android.joinRoom(roomId, "");
} }
...@@ -2421,12 +2426,17 @@ var createChatRoom = function ( ...@@ -2421,12 +2426,17 @@ var createChatRoom = function (
isVoice isVoice
); );
} else { } else {
const ROOM_TYPE_KEY = POST_MESSAGE_KEY.ROOM_TYPE;
const USER_ID_LIST_KEY = POST_MESSAGE_KEY.USER_ID_LIST;
const ROOM_NAME_KEY = POST_MESSAGE_KEY.ROOM_NAME;
const SCREEN_FLAG_KEY = POST_MESSAGE_KEY.SCREEN_FLAG;
const IS_VOICE_KEY = POST_MESSAGE_KEY.IS_VOICE;
webkit.messageHandlers.createChatRoom.postMessage({ webkit.messageHandlers.createChatRoom.postMessage({
"roomType": chatRoomType, ROOM_TYPE_KEY: chatRoomType,
"userIdList": userIDList.join(","), USER_ID_LIST_KEY: userIDList.join(","),
"roomName": newRoomName, ROOM_NAME_KEY: newRoomName,
"screenFlg": screenFlag, SCREEN_FLAG_KEY: screenFlag,
"isVoice": isVoice, IS_VOICE_KEY: isVoice,
}); });
} }
}; };
...@@ -2455,4 +2465,4 @@ var updateGroupInfo = function (groupID) { ...@@ -2455,4 +2465,4 @@ var updateGroupInfo = function (groupID) {
webkit.messageHandlers.updateGroupInfo.postMessage(groupID); webkit.messageHandlers.updateGroupInfo.postMessage(groupID);
} }
} }
} };
\ No newline at end of file
public_new/js/chat.js
...@@ -19,9 +19,11 @@ CHAT.saveRoomInfo = function (roomId, roomName) { ...@@ -19,9 +19,11 @@ CHAT.saveRoomInfo = function (roomId, roomName) {
CHAT.globalLoginParameter.roomId = roomId; CHAT.globalLoginParameter.roomId = roomId;
CHAT.globalLoginParameter.roomName = roomName; CHAT.globalLoginParameter.roomName = roomName;
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
const ROOM_ID_KEY = POST_MESSAGE_KEY.ROOM_ID;
const ROOM_NAME_KEY = POST_MESSAGE_KEY.ROOM_NAME;
webkit.messageHandlers.roomInfosaveMessageHandlerId.postMessage({ webkit.messageHandlers.roomInfosaveMessageHandlerId.postMessage({
"roomId": roomId, ROOM_ID_KEY: roomId,
"roomName": roomName, ROOM_NAME_KEY: roomName,
}); });
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
if (roomId == undefined && roomName == undefined) { if (roomId == undefined && roomName == undefined) {
......
public_new/js/constant.js
...@@ -108,7 +108,7 @@ const SOCKET_KEY = { ...@@ -108,7 +108,7 @@ const SOCKET_KEY = {
REFRESH_USERLIST_INGROUP: "refreshUserListInGroup", REFRESH_USERLIST_INGROUP: "refreshUserListInGroup",
SHOW_SERVER_ERROR: "showServerError", SHOW_SERVER_ERROR: "showServerError",
RETRY_JOIN_PROCESS: "retryJoinProcess", RETRY_JOIN_PROCESS: "retryJoinProcess",
JOIN: "join" JOIN: "join",
}; };
const NATIVE_KEY_IOS = { const NATIVE_KEY_IOS = {
...@@ -149,3 +149,17 @@ const NATIVE_KEY_IOS = { ...@@ -149,3 +149,17 @@ const NATIVE_KEY_IOS = {
getUserInfo: "getUserInfo", getUserInfo: "getUserInfo",
getUserListByLoginId: "getUserListByLoginId", getUserListByLoginId: "getUserListByLoginId",
}; };
const POST_MESSAGE_KEY = {
COLLABORATION_TYPE: "collaborationType",
MEETING_ID: "meetingId",
ROOM_ID: "roomId",
ROOM_NAME: "roomName",
USER_ID_LIST: "userIdList",
GROUP_ID: "groupId",
ROOM_TYPE: "roomType",
SCREEN_FLAG: "screenFlag",
IS_VOICE: "isVoice",
JOIN_COLLABORATION_TYPE: "joinCollaborationType",
CHANGE_COLLABORATION_TYPE: "changeCollaborationType"
};
public_new/js/share.js
...@@ -153,9 +153,11 @@ document.addEventListener("DOMContentLoaded", function () { ...@@ -153,9 +153,11 @@ document.addEventListener("DOMContentLoaded", function () {
initCollaborationUI(joinCollaborationType); initCollaborationUI(joinCollaborationType);
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
const JOIN_COLLABORATION_TYPE_KEY = POST_MESSAGE_KEY.JOIN_COLLABORATION_TYPE;
const MEETING_ID_KEY = POST_MESSAGE_KEY.MEETING_ID;
webkit.messageHandlers.joinChangedCollaboration.postMessage({ webkit.messageHandlers.joinChangedCollaboration.postMessage({
joinCollaborationType: joinCollaborationType, JOIN_COLLABORATION_TYPE_KEY: joinCollaborationType,
meetingId: data.payload.newMeetingId, MEETING_ID_KEY: data.payload.newMeetingId,
}); });
if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) { if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
webkit.messageHandlers.joinMeetingRoom.postMessage( webkit.messageHandlers.joinMeetingRoom.postMessage(
...@@ -546,9 +548,11 @@ function changeCollaboration(changeCollaborationType) { ...@@ -546,9 +548,11 @@ function changeCollaboration(changeCollaborationType) {
} }
penOff(); penOff();
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
const CHANGE_COLLABORATION_TYPE_KEY = POST_MESSAGE_KEY.CHANGE_COLLABORATION_TYPE;
const MEETING_ID_KEY = POST_MESSAGE_KEY.MEETING_ID;
webkit.messageHandlers.changeCollaboration.postMessage({ webkit.messageHandlers.changeCollaboration.postMessage({
changeCollaborationType: changeCollaborationType, CHANGE_COLLABORATION_TYPE_KEY: changeCollaborationType,
meetingId: newMeetingId, MEETING_ID_KEY: newMeetingId,
}); });
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
android.changeCollaboration(changeCollaborationType, newMeetingId); android.changeCollaboration(changeCollaborationType, newMeetingId);
......
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