Commit 43f7dce7 by Lee Munkyeong

文書協業実装

parent 6116448a
...@@ -141,7 +141,7 @@ $(function() { ...@@ -141,7 +141,7 @@ $(function() {
$(".coview_share_area").hide(); $(".coview_share_area").hide();
$("#loadingIndicator").removeClass("full_active"); $("#loadingIndicator").removeClass("full_active");
}); });
var meetingId;
coview_api.addEventListener ("message", async function (event, json) { coview_api.addEventListener ("message", async function (event, json) {
console.log("+++ addEventListener", json); console.log("+++ addEventListener", json);
console.log("processMessage api = ", json.api); console.log("processMessage api = ", json.api);
...@@ -157,14 +157,21 @@ $(function() { ...@@ -157,14 +157,21 @@ $(function() {
} }
if (collaborationJoinFlg == '1') { if (collaborationJoinFlg == '1') {
coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType); coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
if (isDocument) {
if (CHAT_UTIL.isIOS()) {
//TODO 画面を縮小し、会議室に入場する処理
} else if (CHAT_UTIL.isAndroid()) {
android.startContentView(meetingId);
}
}
} else if (collaborationJoinFlg == '0') { } else if (collaborationJoinFlg == '0') {
coview_api.CreateRoom(globalUserInfo.roomId, globalUserInfo.coWorkType); coview_api.CreateRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
} if (isDocument) {
if (isDocument) { if (CHAT_UTIL.isIOS()) {
if (CHAT_UTIL.isIOS()) { //TODO 画面を縮小し、会議室に入場する処理
//TODO 画面を縮小し、会議室に入場する処理 } else if (CHAT_UTIL.isAndroid()) {
} else if (CHAT_UTIL.isAndroid()) { meetingId = android.createContentView();
android.startContentView(); }
} }
} }
Coview_moveToVideoShareArea(); Coview_moveToVideoShareArea();
...@@ -173,7 +180,7 @@ $(function() { ...@@ -173,7 +180,7 @@ $(function() {
if (json.resultCode == 200) { if (json.resultCode == 200) {
var coviewInviteMessage; var coviewInviteMessage;
if (isDocument) { if (isDocument) {
coviewInviteMessage = "" + messageSeperator + messageType.COMMUNICATIONSTART + messageSeperator + CHAT_UTIL.getCollaborationType(collaborationTypeKey.DOCUMENT); coviewInviteMessage = "" + messageSeperator + messageType.COMMUNICATIONSTART + messageSeperator + CHAT_UTIL.getCollaborationType(collaborationTypeKey.DOCUMENT) + messageSeperator + meetingId;
} else { } else {
coviewInviteMessage = "" + messageSeperator + messageType.COMMUNICATIONSTART + messageSeperator + CHAT_UTIL.getCollaborationType(globalUserInfo.coWorkType); coviewInviteMessage = "" + messageSeperator + messageType.COMMUNICATIONSTART + messageSeperator + CHAT_UTIL.getCollaborationType(globalUserInfo.coWorkType);
} }
......
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