Skip to content

C
chat_webview
Commit 753fd644 by Kim Peace
Options

Merge branch 'develop' into debug/console_logs 

# Conflicts:
#	public_new/js/views/collaboration/share-bind-button-action.js
#	public_new/js/views/collaboration/share.js
parents db2d2706 0e296d27
Showing with 95 additions and 116 deletions
public_new/archive.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0"> content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
<title>LiveTaskyell</title> <title>BizTaskyell</title>
<link rel="stylesheet" href="./css/notosansjp.css"> <link rel="stylesheet" href="./css/notosansjp.css">
<link rel="stylesheet" href="./fontawesome/css/all.css"> <link rel="stylesheet" href="./fontawesome/css/all.css">
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
......
public_new/archive_detail.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0"> content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
<title>LiveTaskyell</title> <title>BizTaskyell</title>
<link rel="stylesheet" href="./css/notosansjp.css"> <link rel="stylesheet" href="./css/notosansjp.css">
<link rel="stylesheet" href="./fontawesome/css/all.css"> <link rel="stylesheet" href="./fontawesome/css/all.css">
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
......
public_new/chat.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0"> content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
<title>LiveTaskyell</title> <title>BizTaskyell</title>
<link rel="stylesheet" href="./css/notosansjp.css"> <link rel="stylesheet" href="./css/notosansjp.css">
<link rel="stylesheet" href="./fontawesome/css/all.css"> <link rel="stylesheet" href="./fontawesome/css/all.css">
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
......
public_new/chat_add_user.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0"> content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
<title>LiveTaskyell</title> <title>BizTaskyell</title>
<link rel="stylesheet" href="./css/notosansjp.css"> <link rel="stylesheet" href="./css/notosansjp.css">
<link rel="stylesheet" href="./fontawesome/css/all.css"> <link rel="stylesheet" href="./fontawesome/css/all.css">
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
......
public_new/chat_add_user_confirm.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0"> content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
<title>LiveTaskyell</title> <title>BizTaskyell</title>
<link rel="stylesheet" href="./css/notosansjp.css"> <link rel="stylesheet" href="./css/notosansjp.css">
<link rel="stylesheet" href="./fontawesome/css/all.css"> <link rel="stylesheet" href="./fontawesome/css/all.css">
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
......
public_new/chat_change_room_name.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0"> content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
<title>LiveTaskyell</title> <title>BizTaskyell</title>
<link rel="stylesheet" href="./css/notosansjp.css"> <link rel="stylesheet" href="./css/notosansjp.css">
<link rel="stylesheet" href="./fontawesome/css/all.css" > <link rel="stylesheet" href="./fontawesome/css/all.css" >
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
......
public_new/chat_make_room.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0"> content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
<title>LiveTaskyell</title> <title>BizTaskyell</title>
<link rel="stylesheet" href="./css/notosansjp.css"> <link rel="stylesheet" href="./css/notosansjp.css">
<link rel="stylesheet" href="./fontawesome/css/all.css" > <link rel="stylesheet" href="./fontawesome/css/all.css" >
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
......
public_new/chat_make_room_confirm.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0"> content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
<title>LiveTaskyell</title> <title>BizTaskyell</title>
<link rel="stylesheet" href="./css/notosansjp.css"> <link rel="stylesheet" href="./css/notosansjp.css">
<link rel="stylesheet" href="./fontawesome/css/all.css" > <link rel="stylesheet" href="./fontawesome/css/all.css" >
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
......
public_new/chat_room.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0"> content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
<title>LiveTaskyell</title> <title>BizTaskyell</title>
<!--<link rel="stylesheet" href="./css/notosansjp.css">--> <!--<link rel="stylesheet" href="./css/notosansjp.css">-->
<link rel="stylesheet" href="./fontawesome/css/all.css"> <link rel="stylesheet" href="./fontawesome/css/all.css">
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
......
public_new/collaboration.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0"> content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
<title>LiveTaskyell</title> <title>BizTaskyell</title>
<link rel="stylesheet" href="./css/notosansjp.css"> <link rel="stylesheet" href="./css/notosansjp.css">
<link rel="stylesheet" href="./fontawesome/css/all.css" > <link rel="stylesheet" href="./fontawesome/css/all.css" >
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
......
public_new/contact.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0"> content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
<title>LiveTaskyell</title> <title>BizTaskyell</title>
<link rel="stylesheet" href="./css/notosansjp.css"> <link rel="stylesheet" href="./css/notosansjp.css">
<link rel="stylesheet" href="./fontawesome/css/all.css"> <link rel="stylesheet" href="./fontawesome/css/all.css">
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
......
public_new/js/Models/coview-userinfo.js
...@@ -6,17 +6,7 @@ NativeBridgeDataSource.getCollaborationJoinFlg = function () { ...@@ -6,17 +6,7 @@ NativeBridgeDataSource.getCollaborationJoinFlg = function () {
} }
}; };
var CoviewUserInfo = class { function CoviewUserInfo(sid, loginId, roomId, shopName) {
sid;
loginId;
roomId;
shopName;
collaborationType;
joinType;
isLeaved;
meetingID;
constructor(sid, loginId, roomId, shopName) {
this.sid = sid; this.sid = sid;
this.loginId = loginId; this.loginId = loginId;
this.roomId = roomId; this.roomId = roomId;
...@@ -27,9 +17,9 @@ var CoviewUserInfo = class { ...@@ -27,9 +17,9 @@ var CoviewUserInfo = class {
this.isLeaved = false; this.isLeaved = false;
this.meetingID = 0; this.meetingID = 0;
}
get coWorkType() { Object.defineProperty(this, "coWorkType", {
get() {
switch (this.collaborationType) { switch (this.collaborationType) {
case COLLABORATION_TYPE.AUDIO: case COLLABORATION_TYPE.AUDIO:
return COLLABORATION_TYPE.AUDIO; return COLLABORATION_TYPE.AUDIO;
...@@ -42,13 +32,15 @@ var CoviewUserInfo = class { ...@@ -42,13 +32,15 @@ var CoviewUserInfo = class {
case COLLABORATION_TYPE.BOARD: case COLLABORATION_TYPE.BOARD:
return COLLABORATION_TYPE.AUDIO; return COLLABORATION_TYPE.AUDIO;
} }
} },
});
}
isInvited() { CoviewUserInfo.prototype.isInvited = function () {
return this.joinType == COLLABORATION_JOIN_TYPE.INVITED; return this.joinType == COLLABORATION_JOIN_TYPE.INVITED;
} };
parseNumberToCoworkType(type) { CoviewUserInfo.prototype.parseNumberToCoworkType = function (type) {
switch (type) { switch (type) {
case COLLABORATION_TYPE_NUMBER.AUDIO: case COLLABORATION_TYPE_NUMBER.AUDIO:
return COLLABORATION_TYPE.AUDIO; return COLLABORATION_TYPE.AUDIO;
...@@ -63,13 +55,13 @@ var CoviewUserInfo = class { ...@@ -63,13 +55,13 @@ var CoviewUserInfo = class {
default: default:
return 0; return 0;
} }
} };
getCollaborarionTypeAsNumber() { CoviewUserInfo.prototype.getCollaborarionTypeAsNumber = function () {
return this.parseCoworkTypeToNumber(this.collaborationType); return this.parseCoworkTypeToNumber(this.collaborationType);
} };
parseCoworkTypeToNumber(type) { CoviewUserInfo.prototype.parseCoworkTypeToNumber = function (type) {
switch (type) { switch (type) {
case COLLABORATION_TYPE.AUDIO: case COLLABORATION_TYPE.AUDIO:
return COLLABORATION_TYPE_NUMBER.AUDIO; return COLLABORATION_TYPE_NUMBER.AUDIO;
...@@ -84,7 +76,6 @@ var CoviewUserInfo = class { ...@@ -84,7 +76,6 @@ var CoviewUserInfo = class {
default: default:
return 0; return 0;
} }
}
}; };
// variable name for legacy connection to agent_app.js in coview library // variable name for legacy connection to agent_app.js in coview library
......
public_new/js/Models/deviceinfo.js
...@@ -6,30 +6,24 @@ NativeBridgeDataSource.getDeviceInfo = function () { ...@@ -6,30 +6,24 @@ NativeBridgeDataSource.getDeviceInfo = function () {
} }
}; };
var DeviceInfo = class { function DeviceInfo(deviceInfo) {
isMoble; // iphone or iPad
platform; // ios or android
androidVersion;
constructor(deviceInfo) {
this.isMoble = deviceInfo.isMoble; this.isMoble = deviceInfo.isMoble;
this.platform = deviceInfo.platform; this.platform = deviceInfo.platform;
if (typeof android != "undefined") { if (typeof android != "undefined") {
this.androidVersion = android.getAndroidVersion(); this.androidVersion = android.getAndroidVersion();
} }
} }
isiOS() { DeviceInfo.prototype.isiOS = function () {
return this.platform == "ios"; return this.platform == "ios";
} };
isAndroid() { DeviceInfo.prototype.isAndroid = function () {
return this.platform == "android"; return this.platform == "android";
} };
isMobile() { DeviceInfo.prototype.isMobile = function () {
return this.isMoble == true; return this.isMoble == true;
}
}; };
var deviceInfo = new DeviceInfo(NativeBridgeDataSource.getDeviceInfo()); var deviceInfo = new DeviceInfo(NativeBridgeDataSource.getDeviceInfo());
......
public_new/js/Models/roominfo.js
...@@ -6,15 +6,10 @@ NativeBridgeDataSource.getRoomInfo = function () { ...@@ -6,15 +6,10 @@ NativeBridgeDataSource.getRoomInfo = function () {
} }
}; };
var RoomInfo = class { function RoomInfo(roomInfo) {
roomID;
roomName;
roomType;
constructor(roomInfo) {
this.roomID = roomInfo.roomID; this.roomID = roomInfo.roomID;
this.roomName = roomInfo.roomName; this.roomName = roomInfo.roomName;
this.roomType = roomInfo.roomType; this.roomType = roomInfo.roomType;
} }
};
var roomInfo = new RoomInfo(NativeBridgeDataSource.getRoomInfo()); var roomInfo = new RoomInfo(NativeBridgeDataSource.getRoomInfo());
public_new/js/Models/serverinfo.js
...@@ -6,16 +6,10 @@ NativeBridgeDataSource.getServerInfo = function () { ...@@ -6,16 +6,10 @@ NativeBridgeDataSource.getServerInfo = function () {
} }
}; };
var ServerInfo = class { function ServerInfo(serverInfo) {
chatURL;
cmsURL;
isOnline;
constructor(serverInfo) {
this.chatURL = serverInfo.chatURL; this.chatURL = serverInfo.chatURL;
this.cmsURL = serverInfo.cmsURL; this.cmsURL = serverInfo.cmsURL;
this.isOnline = serverInfo.isOnline; this.isOnline = serverInfo.isOnline;
} }
};
var serverInfo = new ServerInfo(NativeBridgeDataSource.getServerInfo()); var serverInfo = new ServerInfo(NativeBridgeDataSource.getServerInfo());
public_new/js/Models/socket-joininfo.js
var JoinInfo = class { function JoinInfo(sid, loginId, shopName, roomId, roomName, shopMemberId) {
sid;
loginId;
shopName;
roomId;
roomName;
shopMemberId;
constructor(sid, loginId, shopName, roomId, roomName, shopMemberId) {
this.sid = sid; this.sid = sid;
this.loginId = loginId; this.loginId = loginId;
this.shopName = shopName; this.shopName = shopName;
this.roomId = roomId; this.roomId = roomId;
this.roomName = roomName; this.roomName = roomName;
this.shopMemberId = shopMemberId; this.shopMemberId = shopMemberId;
} }
};
public_new/js/Models/userinfo.js
...@@ -6,13 +6,7 @@ NativeBridgeDataSource.getMyUserInfo = function () { ...@@ -6,13 +6,7 @@ NativeBridgeDataSource.getMyUserInfo = function () {
} }
}; };
var CurrentUserInfo = class { function CurrentUserInfo(userInfo) {
sid;
loginID;
shopName;
shopMemberID;
languageCode;
constructor(userInfo) {
this.sid = userInfo.sid; this.sid = userInfo.sid;
this.loginID = userInfo.loginId; this.loginID = userInfo.loginId;
this.shopName = userInfo.shopName; this.shopName = userInfo.shopName;
...@@ -21,15 +15,16 @@ var CurrentUserInfo = class { ...@@ -21,15 +15,16 @@ var CurrentUserInfo = class {
userInfo.languageCode = "jp"; userInfo.languageCode = "jp";
} }
this.languageCode = userInfo.languageCode; this.languageCode = userInfo.languageCode;
} }
configureLanguage(languageCode = undefined) { CurrentUserInfo.prototype.configureLanguage = function (
languageCode = undefined
) {
if (languageCode == undefined) { if (languageCode == undefined) {
languageCode = this.languageCode; languageCode = this.languageCode;
} }
moment.locale(languageCode); moment.locale(languageCode);
setLanguage(languageCode); setLanguage(languageCode);
}
}; };
var currentUserInfo = new CurrentUserInfo( var currentUserInfo = new CurrentUserInfo(
......
public_new/js/sockets/chat-websocket-message.js
...@@ -52,7 +52,7 @@ CHAT_SOCKET.handleMessage = function ( ...@@ -52,7 +52,7 @@ CHAT_SOCKET.handleMessage = function (
) { ) {
CHAT_SOCKET.cleanUpCollaborationMessage(); CHAT_SOCKET.cleanUpCollaborationMessage();
if (typeof CoviewBridge !== "undefined") { if (typeof CoviewBridge !== "undefined" && g_isMainMan !== "undefined" && g_isMainMan == false) {
CoviewBridge.finishCollaboration(); CoviewBridge.finishCollaboration();
} }
return; return;
......
public_new/js/views/archive/archive.js
...@@ -211,7 +211,7 @@ ArchiveUI.appendImageTypePlayer = function (filePath) { ...@@ -211,7 +211,7 @@ ArchiveUI.appendImageTypePlayer = function (filePath) {
ArchiveUI.appendVideoTypePlayer = function (filePath) { ArchiveUI.appendVideoTypePlayer = function (filePath) {
if (deviceInfo.isiOS()) { if (deviceInfo.isiOS()) {
$("#archive_player").prepend( $("#archive_player").prepend(
'<video class="archive_player" controls autoplay playsinline controlsList="nodownload"><source src="' + '<video class="archive_player" controls playsinline controlsList="nodownload"><source src="' +
filePath + filePath +
'" type="video/mp4"><source src="' + '" type="video/mp4"><source src="' +
filePath + filePath +
...@@ -223,7 +223,7 @@ ArchiveUI.appendVideoTypePlayer = function (filePath) { ...@@ -223,7 +223,7 @@ ArchiveUI.appendVideoTypePlayer = function (filePath) {
$("#archive_player").prepend( $("#archive_player").prepend(
'<video class="archive_player" src=' + '<video class="archive_player" src=' +
filePath + filePath +
' controls autoplay playsinline controlsList="nodownload"></video>' ' controls playsinline controlsList="nodownload"></video>'
); );
} }
}; };
......
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
...@@ -203,7 +203,7 @@ FermiWebSocketMessageHandler.captureRequest = function (data) { ...@@ -203,7 +203,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",
...@@ -264,7 +264,7 @@ FermiWebSocketMessageHandler.apiSendOwnerChangeComplete = function (data) { ...@@ -264,7 +264,7 @@ 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();
......
public_new/js/views/collaboration/share-bind-button-action.js
...@@ -35,7 +35,7 @@ function toggleCapture() { ...@@ -35,7 +35,7 @@ function toggleCapture() {
console.log("peacekim:: share-bind-button-action - toggleCapture()"); console.log("peacekim:: share-bind-button-action - 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");
}); });
...@@ -93,16 +93,17 @@ function toggleRecord() { ...@@ -93,16 +93,17 @@ 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() {
return new Promise(function (done) {
console.log("peacekim:: share-bind-button-action - recordStop()"); console.log("peacekim:: share-bind-button-action - recordStop()");
if (!$("#recordBtn .record").hasClass("disable")) { if (!$("#recordBtn .record").hasClass("disable")) {
callback(); done();
return; return;
} }
Common.showLoadingIndicator(); Common.showLoadingIndicator();
...@@ -110,25 +111,15 @@ function recordStop(callback) { ...@@ -110,25 +111,15 @@ function recordStop(callback) {
screenLock(); screenLock();
// アーカイブ保存処理 // アーカイブ保存処理
mainManRecordWithCollaboration( mainManRecordStopWithCollaboration().then(function () {
"stop", done();
serverInfo.cmsURL + "/chatapi/file/uploadArchive", });
callback });
);
} }
function mainManRecordWithCollaboration(action, url, callback) { async function sendRecordedData() {
console.log( return new Promise(function (done) {
"peacekim:: share-bind-button-action - mainManRecordWithCollaboration()" // get lastest message id and update message from server via native
);
try {
mediaRecorder.stop();
} catch (exeption) {
console.error("Record failed");
callback();
}
setTimeout(function () {
const blob = new Blob(recordedBlobs, { type: "video/webm" }); const blob = new Blob(recordedBlobs, { type: "video/webm" });
const uploadFileName = "record_" + g_webroom + "_" + g_shareCount + ".webm"; const uploadFileName = "record_" + g_webroom + "_" + g_shareCount + ".webm";
g_shareCount++; g_shareCount++;
...@@ -142,28 +133,49 @@ function mainManRecordWithCollaboration(action, url, callback) { ...@@ -142,28 +133,49 @@ function mainManRecordWithCollaboration(action, url, callback) {
: ARCHIVE_TYPE.VOICE; : ARCHIVE_TYPE.VOICE;
formData.append("archiveType", collaborationType); formData.append("archiveType", collaborationType);
postRecords(url, formData, callback); postRecords(formData).then(function () {
}, 1000); done();
});
});
} }
function postRecords(url, formData, callback) { function mainManRecordStopWithCollaboration() {
return new Promise(function (done) {
console.log(
"peacekim:: share-bind-button-action - mainManRecordWithCollaboration()"
);
try {
mediaRecorder.stop();
} catch (exeption) {
console.error("Record stop failed");
done();
}
sendRecordedData().then(function () {
done();
});
});
}
function postRecords(formData) {
return new Promise(function (done) {
$.ajax({ $.ajax({
type: "post", type: "post",
url: url, url: serverInfo.cmsURL + "/chatapi/file/uploadArchive",
data: formData, data: formData,
contentType: false, contentType: false,
processData: false, processData: false,
success: function (res) { success: function (res) {
recordFinished(); recordFinished();
Common.dismissLoadingIndicator(); Common.dismissLoadingIndicator();
callback(); done();
}, },
error: function (err) { error: function (err) {
recordFinished(); recordFinished();
Common.dismissLoadingIndicator(); Common.dismissLoadingIndicator();
callback(); done();
}, },
}); });
});
} }
// div削除関数 // div削除関数
......
public_new/js/views/collaboration/share-event-listener.js
...@@ -592,7 +592,9 @@ CoviewBridge.exitCollaboration = function () { ...@@ -592,7 +592,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
...@@ -29,8 +29,12 @@ document.addEventListener("DOMContentLoaded", function () { ...@@ -29,8 +29,12 @@ 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) {
console.log("peacekim:: share.js changeCollaboration collaborationType: "+collaborationType); console.log(
recordStop(function () { "peacekim:: share.js changeCollaboration collaborationType: " +
collaborationType
);
recordStop().then(function () {
console.log("peacekim:: share.js changeCollaboration did recordStop"); console.log("peacekim:: share.js changeCollaboration did recordStop");
var newMeetingID = 0; var newMeetingID = 0;
if (globalUserInfo.collaborationType == COLLABORATION_TYPE.DOCUMENT) { if (globalUserInfo.collaborationType == COLLABORATION_TYPE.DOCUMENT) {
......
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