Commit 3376f66b by Kim Peace

Fixed to use promise instead of callback parameter

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