Commit 29cc7d91 by Takatoshi Miura

Merge branch 'origin/release_sp3_ios_collaboration_document' into 'develop'

Origin/release sp3 ios collaboration document

See merge request !124
parents 2e5836f0 d2c2d2a7
......@@ -344,3 +344,10 @@ CHAT_DB.getUserInfoList = function(shopMemberId) {
return callNativeApp("getUserInfoList", {"shopMemberId": shopMemberId});
}
};
CHAT_DB.createContentView = function() {
// Androidは実装不要
if (CHAT_UTIL.isIOS()) {
return callNativeApp("createContentView", {});
}
};
......@@ -2474,7 +2474,7 @@ CHAT_UI.displayExistRoom = function(roomId) {
CHAT_UI.joinCollaboration = function(collaborationType, meetingId = 0) {
if (CHAT_UTIL.isIOS()) {
webkit.messageHandlers.joinCollaboration.postMessage(collaborationType);
webkit.messageHandlers.joinCollaboration.postMessage({"collaborationType": collaborationType, "meetingId": meetingId});
} else if (CHAT_UTIL.isAndroid()) {
android.joinCollaboration(collaborationType, meetingId);
}
......
......@@ -171,7 +171,7 @@ $(function () {
coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
if (isDocument) {
if (CHAT_UTIL.isIOS()) {
//TODO 画面を縮小し、会議室に入場する処理
webkit.messageHandlers.startContentView.postMessage({});
} else if (CHAT_UTIL.isAndroid()) {
android.startContentView();
}
......@@ -183,7 +183,7 @@ $(function () {
);
if (isDocument) {
if (CHAT_UTIL.isIOS()) {
//TODO 画面を縮小し、会議室に入場する処理
meetingId = CHAT_DB.createContentView();
} else if (CHAT_UTIL.isAndroid()) {
meetingId = android.createContentView();
}
......@@ -306,7 +306,7 @@ function Coview_moveToVideoShareArea() {
function Coview_exitCollaboration(isDocument = false) {
if (isDocument) {
if (CHAT_UTIL.isIOS()) {
//TODO IOS会議室退場処理
webkit.messageHandlers.exitMeetingRoom.postMessage({});
} else if (CHAT_UTIL.isAndroid()) {
android.exitMeetingRoom();
}
......
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