Skip to content

C
chat_webview
Commit 3376f66b by Kim Peace
Options

Fixed to use promise instead of callback parameter

parent 4d19a6c1
Showing with 57 additions and 51 deletions
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
...@@ -171,7 +171,7 @@ FermiWebSocketMessageHandler.captureRequest = function (data) { ...@@ -171,7 +171,7 @@ FermiWebSocketMessageHandler.captureRequest = function (data) {
if ($("#recordBtn .record").hasClass("disable")) { if ($("#recordBtn .record").hasClass("disable")) {
screenLock(); screenLock();
recordStop(function () { recordStop().then(function () {
$("#screenLock").remove(); $("#screenLock").remove();
captureAndShareImage( captureAndShareImage(
serverInfo.cmsURL + "/chatapi/file/uploadArchive", serverInfo.cmsURL + "/chatapi/file/uploadArchive",
...@@ -222,7 +222,7 @@ FermiWebSocketMessageHandler.pipEndRequest = function () { ...@@ -222,7 +222,7 @@ FermiWebSocketMessageHandler.pipEndRequest = function () {
FermiWebSocketMessageHandler.apiSendOwnerChangeComplete = function (data) { FermiWebSocketMessageHandler.apiSendOwnerChangeComplete = function (data) {
penOff(); penOff();
if ($("#recordBtn .record").hasClass("disable")) { if ($("#recordBtn .record").hasClass("disable")) {
recordStop(function () {}); recordStop();
} }
if ($("#micBtn .voice").hasClass("disable")) { if ($("#micBtn .voice").hasClass("disable")) {
micOff(); micOff();
...@@ -262,7 +262,7 @@ FermiWebSocketMessageHandler.changeHostApplyForHost = function (data) { ...@@ -262,7 +262,7 @@ FermiWebSocketMessageHandler.changeHostApplyForHost = function (data) {
FermiWebSocketBridge.hostRequestReject(hostID); FermiWebSocketBridge.hostRequestReject(hostID);
//上の実行した後、「CHANGE_HOST_APPLY」が受信され、ステータスが「DOING」になるので1秒後に実行 //上の実行した後、「CHANGE_HOST_APPLY」が受信され、ステータスが「DOING」になるので1秒後に実行
setTimeout(function () { setTimeout(function () {
NativeBridgeDelegate.setHostRequestFlg(HostRequestFlag.DONE); NativeBridgeDelegate.setHostRequestFlg(HostRequestFlag.DONE);
}, 1000); }, 1000);
} }
FermiWebSocketBridge.hostRequestDone(hostID); FermiWebSocketBridge.hostRequestDone(hostID);
......
public_new/js/views/collaboration/share-bind-button-action.js
...@@ -28,7 +28,7 @@ function toggleEraser() { ...@@ -28,7 +28,7 @@ function toggleEraser() {
function toggleCapture() { function toggleCapture() {
if ($("#recordBtn").hasClass("bg_red")) { if ($("#recordBtn").hasClass("bg_red")) {
screenLock(); screenLock();
recordStop(function () { recordStop().then(function () {
$("#screenLock").remove(); $("#screenLock").remove();
coview_api.Capture(serverInfo.cmsURL + "/chatapi/file/uploadArchive"); coview_api.Capture(serverInfo.cmsURL + "/chatapi/file/uploadArchive");
}); });
...@@ -79,30 +79,30 @@ function toggleRecord() { ...@@ -79,30 +79,30 @@ function toggleRecord() {
if (!$("#recordBtn .record").hasClass("disable")) { if (!$("#recordBtn .record").hasClass("disable")) {
recordStart(); recordStart();
} else { } else {
recordStop(function () { recordStop().then(function () {
console.info("Did record stop"); console.info("Did record stop");
}); });
} }
} }
function recordStop(callback) { function recordStop() {
if (!$("#recordBtn .record").hasClass("disable")) { return new Promise(function (done) {
callback(); if (!$("#recordBtn .record").hasClass("disable")) {
return; done();
} return;
Common.showLoadingIndicator(); }
// アーカイブ保存中は画面操作不可(協業終了,協業切り替え防止) Common.showLoadingIndicator();
screenLock(); // アーカイブ保存中は画面操作不可(協業終了,協業切り替え防止)
screenLock();
// アーカイブ保存処理 // アーカイブ保存処理
mainManRecordWithCollaboration( mainManRecordStopWithCollaboration().then(function () {
"stop", done();
serverInfo.cmsURL + "/chatapi/file/uploadArchive", });
callback });
);
} }
async function sendRecordedData(url, callback) { async function sendRecordedData() {
return new Promise(function (done) { return new Promise(function (done) {
// get lastest message id and update message from server via native // get lastest message id and update message from server via native
const blob = new Blob(recordedBlobs, { type: "video/webm" }); const blob = new Blob(recordedBlobs, { type: "video/webm" });
...@@ -118,40 +118,44 @@ async function sendRecordedData(url, callback) { ...@@ -118,40 +118,44 @@ async function sendRecordedData(url, callback) {
: ARCHIVE_TYPE.VOICE; : ARCHIVE_TYPE.VOICE;
formData.append("archiveType", collaborationType); formData.append("archiveType", collaborationType);
postRecords(url, formData, function () { postRecords(formData).then(function () {
done(); done();
callback();
}); });
}); });
} }
function mainManRecordWithCollaboration(action, url, callback) { function mainManRecordStopWithCollaboration() {
try { return new Promise(function (done) {
mediaRecorder.stop(); try {
} catch (exeption) { mediaRecorder.stop();
console.error("Record failed"); } catch (exeption) {
callback(); console.error("Record stop failed");
} done();
sendRecordedData(url, callback); }
} sendRecordedData().then(function () {
done();
function postRecords(url, formData, callback) { });
$.ajax({ });
type: "post", }
url: url,
data: formData, function postRecords(formData) {
contentType: false, return new Promise(function (done) {
processData: false, $.ajax({
success: function (res) { type: "post",
recordFinished(); url: serverInfo.cmsURL + "/chatapi/file/uploadArchive",
Common.dismissLoadingIndicator(); data: formData,
callback(); contentType: false,
}, processData: false,
error: function (err) { success: function (res) {
recordFinished(); recordFinished();
Common.dismissLoadingIndicator(); Common.dismissLoadingIndicator();
callback(); done();
}, },
error: function (err) {
recordFinished();
Common.dismissLoadingIndicator();
},
});
}); });
} }
......
public_new/js/views/collaboration/share-event-listener.js
...@@ -510,7 +510,9 @@ CoviewBridge.exitCollaboration = function () { ...@@ -510,7 +510,9 @@ CoviewBridge.exitCollaboration = function () {
} }
if ($("#recordBtn .record").hasClass("disable")) { if ($("#recordBtn .record").hasClass("disable")) {
recordStop(CoviewBridge.finishCollaboration); recordStop().then(function () {
CoviewBridge.finishCollaboration();
});
} else { } else {
CoviewBridge.finishCollaboration(); CoviewBridge.finishCollaboration();
} }
......
public_new/js/views/collaboration/share.js
...@@ -28,7 +28,7 @@ document.addEventListener("DOMContentLoaded", function () { ...@@ -28,7 +28,7 @@ document.addEventListener("DOMContentLoaded", function () {
// call from collaboration_overlay_menu.html and collaboration.html // call from collaboration_overlay_menu.html and collaboration.html
function changeCollaboration(collaborationType) { function changeCollaboration(collaborationType) {
recordStop(function () { recordStop().then(function () {
var newMeetingID = 0; var newMeetingID = 0;
if (globalUserInfo.collaborationType == COLLABORATION_TYPE.DOCUMENT) { if (globalUserInfo.collaborationType == COLLABORATION_TYPE.DOCUMENT) {
NativeBridgeDelegate.exitMeetingRoom(); NativeBridgeDelegate.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