Skip to content

C
chat_webview
Commit 20e676f5 by Lee Munkyeong
Options

アーカイブ保存ローディング表示追加及び43200,43199対応

parent c605edae
Showing with 109 additions and 113 deletions
public_new/collaboration.html
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<link rel="stylesheet" href="./css/footer.css"> <link rel="stylesheet" href="./css/footer.css">
<link rel="stylesheet" href="./css/font-awesome.css"> <link rel="stylesheet" href="./css/font-awesome.css">
<link rel="stylesheet" href="./css/share.css"> <link rel="stylesheet" href="./css/share.css">
<link rel="stylesheet" href="./css/loading.css">
</head> </head>
...@@ -84,74 +85,59 @@ ...@@ -84,74 +85,59 @@
<div class="footer_menu-wrap d-flex justify-content-around h-100"> <div class="footer_menu-wrap d-flex justify-content-around h-100">
<div class="d-flex align-items-center h-100"> <div class="d-flex align-items-center h-100">
<div class="footer_menu_item photo_select_button collaboration_contents picture_contents"> <div class="footer_menu_item photo_select_button collaboration_contents picture_contents">
<a href="#"> <div class="img_wrap bg_blue" id="photo_open_place_holder">
<div class="img_wrap bg_blue" id="photo_open_place_holder"> <img src="icon/icon_collabo_picture.png" alt="写真">
<img src="icon/icon_collabo_picture.png" alt="写真"> </div>
</div>
</a>
</div> </div>
<div class="footer_menu_item"> <div class="footer_menu_item">
<a href="#"> <div class="img_wrap bg_red" id="penBtn">
<div class="img_wrap bg_red" id="penBtn"> <img src="icon/icon_collabo_pen_white.png" alt="ペン">
<img src="icon/icon_collabo_pen_white.png" alt="ペン"> </div>
</div>
</a>
</div> </div>
<div class="footer_menu_item none"> <div class="footer_menu_item none">
<a href="#"> <div class="img_wrap bg_blue">
<div class="img_wrap bg_blue"> <img src="icon/icon_collabo_place_white.png" alt="場所">
<img src="icon/icon_collabo_place_white.png" alt="場所"> </div>
</div>
</a>
</div> </div>
<div class="footer_menu_item"> <div class="footer_menu_item">
<a href="#"> <div class="img_wrap bg_blue" id="eraserBtn">
<div class="img_wrap bg_blue" id="eraserBtn"> <img src="icon/icon_collabo_delete_white.png" alt="削除">
<img src="icon/icon_collabo_delete_white.png" alt="削除"> </div>
</div>
</a>
</div> </div>
</div> </div>
<div class="d-flex align-items-center h-100 none"> <div class="d-flex align-items-center h-100 none">
<div class="footer_menu_item"> <div class="footer_menu_item">
<a href="#"> <div class="img_wrap bg_gray">
<div class="img_wrap bg_gray"> <img src="icon/icon_collabo_rewind_white.png" alt="戻る">
<img src="icon/icon_collabo_rewind_white.png" alt="戻る"> </div>
</div>
</a>
</div> </div>
<div class="footer_menu_item"> <div class="footer_menu_item">
<a href="#"> <div class="img_wrap bg_gray">
<div class="img_wrap bg_gray"> <img src="icon/icon_collabo_forward_white.png" alt="進む">
<img src="icon/icon_collabo_forward_white.png" alt="進む"> </div>
</div>
</a>
</div> </div>
</div> </div>
<div class="d-flex align-items-center h-100 collaboration_contents video_contents_host"> <div class="d-flex align-items-center h-100 collaboration_contents video_contents_host">
<div class="footer_menu_item"> <div class="footer_menu_item">
<a href="#"> <div class="img_wrap wide bg_blue" id="captureBtn">
<div class="img_wrap wide bg_blue" id="captureBtn"> <img src="icon/icon_collabo_capture.png" alt="キャプチャ">
<img src="icon/icon_collabo_capture.png" alt="キャプチャ"> <span>キャプチャ</span>
<span>キャプチャ</span> </div>
</div>
</a>
</div> </div>
</div> </div>
<div class="d-flex align-items-center h-100 collaboration_contents video_contents_user"> <div class="d-flex align-items-center h-100 collaboration_contents video_contents_user">
<div class="footer_menu_item"> <div class="footer_menu_item">
<a href="#"> <div class="img_wrap wide bg_blue" id="captureRequestBtn">
<div class="img_wrap wide bg_blue" id="captureRequestBtn"> <img src="icon/icon_collabo_capture.png" alt="キャプチャ">
<img src="icon/icon_collabo_capture.png" alt="キャプチャ"> <span>キャプチャリクエスト</span>
<span>キャプチャリクエスト</span> </div>
</div>
</a>
</div> </div>
</div> </div>
</div> </div>
</footer> </footer>
<!-- フッター --> <!-- フッター -->
<div id="footer_collabo"></div> <div id="footer_collabo"></div>
<div id="loadingArea"></div>
<div class="pip_indicator none" onclick="finishPipMode();"> <div class="pip_indicator none" onclick="finishPipMode();">
<div style="vertical-align: middle;display: table-cell;">協業中 <div style="vertical-align: middle;display: table-cell;">協業中
</div> </div>
...@@ -191,7 +177,7 @@ ...@@ -191,7 +177,7 @@
$("#collaboration_picture_overlay_menu").load("./collaboration_overlay_menu.html"); $("#collaboration_picture_overlay_menu").load("./collaboration_overlay_menu.html");
$("#add_user_list").load("./modal_add_user_list.html"); $("#add_user_list").load("./modal_add_user_list.html");
$("#zoom").load("./zoom.html"); $("#zoom").load("./zoom.html");
$("#loadingArea").load("./loading.html");
let CHAT_SERVER_URL = ''; let CHAT_SERVER_URL = '';
let CMS_SERVER_URL = ''; let CMS_SERVER_URL = '';
let ASSET_PATH = './'; let ASSET_PATH = './';
......
public_new/css/loading.css
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
top: 0px; top: 0px;
left: 0px; left: 0px;
background: rgb(255, 255, 255, 0.5); background: rgb(255, 255, 255, 0.5);
z-index: 2; z-index: 99;
} }
#loader { #loader {
display: none; display: none;
......
public_new/js/chat-ui-collaboration.js
...@@ -399,6 +399,7 @@ CHAT_UI.confirmInviteUserListInCollaboration = function () { ...@@ -399,6 +399,7 @@ CHAT_UI.confirmInviteUserListInCollaboration = function () {
), ),
}); });
} }
CHAT_UI.dismissLoadingIndicator();
$("#modalAddUserConfirm").modal("hide"); $("#modalAddUserConfirm").modal("hide");
}); });
}; };
public_new/js/share.js
...@@ -559,76 +559,73 @@ function Coview_moveToVideoShareArea() { ...@@ -559,76 +559,73 @@ function Coview_moveToVideoShareArea() {
} }
function changeCollaboration(changeCollaborationType) { function changeCollaboration(changeCollaborationType) {
var newMeetingId = 0; recordStop(function () {
if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) { var newMeetingId = 0;
if (CHAT_UTIL.isIOS()) { if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
webkit.messageHandlers.exitMeetingRoom.postMessage({}); if (CHAT_UTIL.isIOS()) {
} else if (CHAT_UTIL.isAndroid()) { webkit.messageHandlers.exitMeetingRoom.postMessage({});
android.exitMeetingRoom(); } else if (CHAT_UTIL.isAndroid()) {
} android.exitMeetingRoom();
} }
if (CHAT_UTIL.isIOS()) { }
webkit.messageHandlers.setJoinCollaborationType.postMessage(
changeCollaborationType
);
} else if (CHAT_UTIL.isAndroid()) {
if (
changeCollaborationType == COLLABORATION_TYPE.DOCUMENT &&
androidVersion < ANDROID_SDK_VERSION.O
) {
alert(getLocalizedString("not_support_version"));
return;
}
android.setJoinCollaborationType(changeCollaborationType);
}
joinCollaborationType = changeCollaborationType;
if ($("#recordBtn").hasClass("bg_red")) {
recordStop(function () {
console.log("レコードを終了しました");
});
}
initCollaborationUI(changeCollaborationType);
switch (changeCollaborationType) {
case COLLABORATION_TYPE.AUDIO:
coview_api.ChangeCollaboration("audio");
break;
case COLLABORATION_TYPE.CAMERA:
coview_api.ChangeCollaboration("image");
break;
case COLLABORATION_TYPE.VIDEO:
coview_api.ChangeCollaboration("video");
break;
case COLLABORATION_TYPE.DOCUMENT:
coview_api.ChangeCollaboration("audio");
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
newMeetingId = CHAT_DB.createContentView(); webkit.messageHandlers.setJoinCollaborationType.postMessage(
changeCollaborationType
);
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
newMeetingId = android.createContentView(); if (
console.log("newMeetingId = " + newMeetingId); changeCollaborationType == COLLABORATION_TYPE.DOCUMENT &&
androidVersion < ANDROID_SDK_VERSION.O
) {
alert(getLocalizedString("not_support_version"));
return;
}
android.setJoinCollaborationType(changeCollaborationType);
} }
break; joinCollaborationType = changeCollaborationType;
case COLLABORATION_TYPE.BOARD: initCollaborationUI(changeCollaborationType);
coview_api.ChangeCollaboration("audio"); switch (changeCollaborationType) {
break; case COLLABORATION_TYPE.AUDIO:
} coview_api.ChangeCollaboration("audio");
if ($("#micBtn").hasClass("bg_red")) { break;
micOff(); case COLLABORATION_TYPE.CAMERA:
} else { coview_api.ChangeCollaboration("image");
micOn(); break;
} case COLLABORATION_TYPE.VIDEO:
penOff(); coview_api.ChangeCollaboration("video");
if (CHAT_UTIL.isIOS()) { break;
webkit.messageHandlers.changeCollaboration.postMessage({ case COLLABORATION_TYPE.DOCUMENT:
changeCollaborationType: changeCollaborationType, coview_api.ChangeCollaboration("audio");
meetingId: newMeetingId, if (CHAT_UTIL.isIOS()) {
}); newMeetingId = CHAT_DB.createContentView();
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
android.changeCollaboration(changeCollaborationType, newMeetingId); newMeetingId = android.createContentView();
} console.log("newMeetingId = " + newMeetingId);
joinMeetingId = newMeetingId; }
fw.sendToMsg("others", "CHANGE_COLLABORATION", { break;
collaborationType: changeCollaborationType, case COLLABORATION_TYPE.BOARD:
newMeetingId: newMeetingId, coview_api.ChangeCollaboration("audio");
break;
}
if ($("#micBtn").hasClass("bg_red")) {
micOff();
} else {
micOn();
}
penOff();
if (CHAT_UTIL.isIOS()) {
webkit.messageHandlers.changeCollaboration.postMessage({
changeCollaborationType: changeCollaborationType,
meetingId: newMeetingId,
});
} else if (CHAT_UTIL.isAndroid()) {
android.changeCollaboration(changeCollaborationType, newMeetingId);
}
joinMeetingId = newMeetingId;
fw.sendToMsg("others", "CHANGE_COLLABORATION", {
collaborationType: changeCollaborationType,
newMeetingId: newMeetingId,
});
}); });
} }
...@@ -646,7 +643,7 @@ var scrollLock = function (e) { ...@@ -646,7 +643,7 @@ var scrollLock = function (e) {
} }
}; };
let collaboScreen = document.getElementById("collabo_main"); let collaboScreen = document.getElementById("collabo_main");
function scrollLockON() { function scrollLockON() {
collaboScreen.addEventListener("touchmove", scrollLock, { passive: false }); collaboScreen.addEventListener("touchmove", scrollLock, { passive: false });
...@@ -1068,6 +1065,11 @@ function recordTogle() { ...@@ -1068,6 +1065,11 @@ function recordTogle() {
} }
function recordStop(callback) { function recordStop(callback) {
if ($("#recordBtn").hasClass("bg_gray")) {
callback();
return;
}
CHAT_UI.showLoadingIndicator();
// アーカイブ保存中は画面操作不可(協業終了,協業切り替え防止) // アーカイブ保存中は画面操作不可(協業終了,協業切り替え防止)
screenLock(); screenLock();
...@@ -1080,7 +1082,12 @@ function recordStop(callback) { ...@@ -1080,7 +1082,12 @@ function recordStop(callback) {
} }
function MainManRecordWithCollaboration(action, url, callback) { function MainManRecordWithCollaboration(action, url, callback) {
mediaRecorder.stop(); try {
mediaRecorder.stop();
} catch(exeption) {
console.log("Record fail");
callback();
}
console.log("Recorded Blobs: ", recordedBlobs); console.log("Recorded Blobs: ", recordedBlobs);
setTimeout(function () { setTimeout(function () {
...@@ -1107,11 +1114,13 @@ function MainManRecordWithCollaboration(action, url, callback) { ...@@ -1107,11 +1114,13 @@ function MainManRecordWithCollaboration(action, url, callback) {
processData: false, processData: false,
success: function (res) { success: function (res) {
recordFinished(); recordFinished();
CHAT_UI.dismissLoadingIndicator();
console.log(res); console.log(res);
callback(); callback();
}, },
error: function (err) { error: function (err) {
recordFinished(); recordFinished();
CHAT_UI.dismissLoadingIndicator();
console.log(err); console.log(err);
callback(); callback();
}, },
......
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