Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chat_webview
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abookCommunication
chat_webview
Commits
6e4381a0
Commit
6e4381a0
authored
Sep 09, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed unused console log
parent
42593f80
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
17 deletions
+0
-17
public_new/js/sockets/chat-websocket-message.js
+0
-1
public_new/js/views/collaboration/share-bind-button-action.js
+0
-11
public_new/js/views/collaboration/share-event-listener.js
+0
-4
public_new/js/views/collaboration/share.js
+0
-1
No files found.
public_new/js/sockets/chat-websocket-message.js
View file @
6e4381a0
...
@@ -21,7 +21,6 @@ CHAT_SOCKET.handleMessage = function (message, roomName, socketKey, collaboratio
...
@@ -21,7 +21,6 @@ CHAT_SOCKET.handleMessage = function (message, roomName, socketKey, collaboratio
CHAT_SOCKET
.
cleanUpCollaborationMessage
();
CHAT_SOCKET
.
cleanUpCollaborationMessage
();
if
(
typeof
CoviewBridge
!==
"undefined"
&&
g_isMainMan
!==
"undefined"
&&
g_isMainMan
==
false
)
{
if
(
typeof
CoviewBridge
!==
"undefined"
&&
g_isMainMan
!==
"undefined"
&&
g_isMainMan
==
false
)
{
console
.
log
(
"peacekim:: CHAT_SOCKET.handleMessage finishcollaboration"
);
CoviewBridge
.
finishCollaboration
();
CoviewBridge
.
finishCollaboration
();
}
}
return
;
return
;
...
...
public_new/js/views/collaboration/share-bind-button-action.js
View file @
6e4381a0
...
@@ -87,9 +87,7 @@ function toggleRecord() {
...
@@ -87,9 +87,7 @@ function toggleRecord() {
function
recordStop
()
{
function
recordStop
()
{
return
new
Promise
(
function
(
done
)
{
return
new
Promise
(
function
(
done
)
{
console
.
log
(
"peacekim:: recordStop start"
);
if
(
!
$
(
"#recordBtn .record"
).
hasClass
(
"disable"
))
{
if
(
!
$
(
"#recordBtn .record"
).
hasClass
(
"disable"
))
{
console
.
log
(
"peacekim:: recordStop done 1"
);
done
();
done
();
return
;
return
;
}
}
...
@@ -99,14 +97,12 @@ function recordStop() {
...
@@ -99,14 +97,12 @@ function recordStop() {
// アーカイブ保存処理
// アーカイブ保存処理
mainManRecordStopWithCollaboration
().
then
(
function
()
{
mainManRecordStopWithCollaboration
().
then
(
function
()
{
console
.
log
(
"peacekim:: recordStop done 2"
);
done
();
done
();
});
});
});
});
}
}
async
function
sendRecordedData
()
{
async
function
sendRecordedData
()
{
console
.
log
(
"peacekim:: sendRecordedData start"
);
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"
});
...
@@ -123,31 +119,26 @@ async function sendRecordedData() {
...
@@ -123,31 +119,26 @@ async function sendRecordedData() {
formData
.
append
(
"archiveType"
,
collaborationType
);
formData
.
append
(
"archiveType"
,
collaborationType
);
postRecords
(
formData
).
then
(
function
()
{
postRecords
(
formData
).
then
(
function
()
{
console
.
log
(
"peacekim:: sendRecordedData done 1"
);
done
();
done
();
});
});
});
});
}
}
function
mainManRecordStopWithCollaboration
()
{
function
mainManRecordStopWithCollaboration
()
{
console
.
log
(
"peacekim:: mainManRecordStopWithCollaboration start"
);
return
new
Promise
(
function
(
done
)
{
return
new
Promise
(
function
(
done
)
{
try
{
try
{
mediaRecorder
.
stop
();
mediaRecorder
.
stop
();
}
catch
(
exeption
)
{
}
catch
(
exeption
)
{
console
.
error
(
"Record stop failed"
);
console
.
error
(
"Record stop failed"
);
console
.
log
(
"peacekim:: mainManRecordStopWithCollaboration done 1"
);
done
();
done
();
}
}
sendRecordedData
().
then
(
function
()
{
sendRecordedData
().
then
(
function
()
{
console
.
log
(
"peacekim:: mainManRecordStopWithCollaboration done 2"
);
done
();
done
();
});
});
});
});
}
}
function
postRecords
(
formData
)
{
function
postRecords
(
formData
)
{
console
.
log
(
"peacekim:: postRecords start"
);
return
new
Promise
(
function
(
done
)
{
return
new
Promise
(
function
(
done
)
{
$
.
ajax
({
$
.
ajax
({
type
:
"post"
,
type
:
"post"
,
...
@@ -158,13 +149,11 @@ function postRecords(formData) {
...
@@ -158,13 +149,11 @@ function postRecords(formData) {
success
:
function
(
res
)
{
success
:
function
(
res
)
{
recordFinished
();
recordFinished
();
Common
.
dismissLoadingIndicator
();
Common
.
dismissLoadingIndicator
();
console
.
log
(
"peacekim:: postRecords done 1"
);
done
();
done
();
},
},
error
:
function
(
err
)
{
error
:
function
(
err
)
{
recordFinished
();
recordFinished
();
Common
.
dismissLoadingIndicator
();
Common
.
dismissLoadingIndicator
();
console
.
log
(
"peacekim:: postRecords done 2"
);
done
();
done
();
},
},
});
});
...
...
public_new/js/views/collaboration/share-event-listener.js
View file @
6e4381a0
...
@@ -198,7 +198,6 @@ CollaborationFeature.didReceiveLoginResponseMessage = async function () {
...
@@ -198,7 +198,6 @@ CollaborationFeature.didReceiveLoginResponseMessage = async function () {
}
else
if
(
isHost
)
{
}
else
if
(
isHost
)
{
globalUserInfo
.
meetingID
=
NativeBridgeDataSource
.
createContentView
();
globalUserInfo
.
meetingID
=
NativeBridgeDataSource
.
createContentView
();
if
(
globalUserInfo
.
meetingID
==
"-1"
)
{
if
(
globalUserInfo
.
meetingID
==
"-1"
)
{
console
.
log
(
"peacekim:: didReceiveLoginResponseMessage - finishCollaboration"
);
//会議室作成失敗
//会議室作成失敗
CoviewBridge
.
finishCollaboration
();
CoviewBridge
.
finishCollaboration
();
return
;
return
;
...
@@ -512,17 +511,14 @@ CoviewBridge.exitCollaboration = function () {
...
@@ -512,17 +511,14 @@ CoviewBridge.exitCollaboration = function () {
if
(
$
(
"#recordBtn .record"
).
hasClass
(
"disable"
))
{
if
(
$
(
"#recordBtn .record"
).
hasClass
(
"disable"
))
{
recordStop
().
then
(
function
()
{
recordStop
().
then
(
function
()
{
console
.
log
(
"peacekim:: exitCollaboration - finishCollaboration 1"
);
CoviewBridge
.
finishCollaboration
();
CoviewBridge
.
finishCollaboration
();
});
});
}
else
{
}
else
{
console
.
log
(
"peacekim:: exitCollaboration - finishCollaboration 2"
);
CoviewBridge
.
finishCollaboration
();
CoviewBridge
.
finishCollaboration
();
}
}
};
};
CoviewBridge
.
finishCollaboration
=
function
()
{
CoviewBridge
.
finishCollaboration
=
function
()
{
console
.
log
(
"peacekim:: finishCollaboration start"
);
Common
.
showLoadingIndicator
();
Common
.
showLoadingIndicator
();
coview_api
.
LeaveRoom
();
coview_api
.
LeaveRoom
();
if
(
coview_api
.
getRoomUsers
())
{
if
(
coview_api
.
getRoomUsers
())
{
...
...
public_new/js/views/collaboration/share.js
View file @
6e4381a0
...
@@ -53,7 +53,6 @@ function changeCollaboration(collaborationType) {
...
@@ -53,7 +53,6 @@ function changeCollaboration(collaborationType) {
coview_api
.
ChangeCollaboration
(
"audio"
);
coview_api
.
ChangeCollaboration
(
"audio"
);
newMeetingID
=
NativeBridgeDataSource
.
createContentView
();
newMeetingID
=
NativeBridgeDataSource
.
createContentView
();
if
(
newMeetingID
==
"-1"
)
{
if
(
newMeetingID
==
"-1"
)
{
console
.
log
(
"peacekim:: changeCollaboration to collaborationType doument call finishcollaboration "
);
//会議室作成失敗
//会議室作成失敗
CoviewBridge
.
finishCollaboration
();
CoviewBridge
.
finishCollaboration
();
return
;
return
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment