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
4fce1a70
Commit
4fce1a70
authored
Jul 31, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed retry camera searching condition
parent
e9c2cd7e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletions
+6
-1
public_new/js/views/collaboration/fermi-web-socket-bridge.js
+4
-0
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
+1
-0
public_new/js/views/collaboration/share-event-listener.js
+1
-1
No files found.
public_new/js/views/collaboration/fermi-web-socket-bridge.js
View file @
4fce1a70
...
...
@@ -46,6 +46,10 @@ FermiWebSocketBridge.hostRequestDone = function (hostID) {
// GET_COLLABORATION_TYPE_RESPONSE
FermiWebSocketBridge
.
getCollaborationTypeResponse
=
function
(
loginID
)
{
if
(
typeof
meetingID
==
undefined
)
{
var
meetingID
=
0
;
}
fw
.
sendToMsg
(
"others"
,
"GET_COLLABORATION_TYPE_RESPONSE"
,
{
loginId
:
loginID
,
collaborationType
:
globalUserInfo
.
collaborationType
,
...
...
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
View file @
4fce1a70
...
...
@@ -3,6 +3,7 @@ var FermiWebSocketMessageHandler = {};
FermiWebSocketMessageHandler
.
bindWebSocketMessage
=
function
()
{
fw
.
socket
.
on
(
"message"
,
async
function
(
data
)
{
if
(
g_isMainMan
)
{
// 自分がホストの場合
FermiWebSocketMessageHandler
.
handleMessagesToHost
(
data
);
}
else
if
(
data
.
payload
.
loginId
==
globalUserInfo
.
loginId
)
{
// 自分自身の場合
...
...
public_new/js/views/collaboration/share-event-listener.js
View file @
4fce1a70
...
...
@@ -33,7 +33,7 @@ CoviewBridge.bindStartEvent = function () {
};
CollaborationFeature
.
checkAndRetryCamera
=
async
function
()
{
if
(
!
deviceInfo
.
isAndroid
)
{
if
(
!
deviceInfo
.
isAndroid
()
)
{
return
;
}
if
(
globalUserInfo
.
collaborationType
!=
COLLABORATION_TYPE
.
VIDEO
)
{
...
...
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