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
01e4b615
Commit
01e4b615
authored
3 years ago
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Code styles
parent
bdea508c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
+3
-3
No files found.
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
View file @
01e4b615
...
@@ -64,7 +64,7 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
...
@@ -64,7 +64,7 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
FermiWebSocketMessageHandler
.
changeCollaboration
(
data
);
FermiWebSocketMessageHandler
.
changeCollaboration
(
data
);
break
;
break
;
case
"SHARE_FILE"
:
case
"SHARE_FILE"
:
if
(
globalUserInfo
.
collaborationType
!=
COLLABORATION_TYPE
.
CAMERA
)
{
if
(
globalUserInfo
.
collaborationType
!=
COLLABORATION_TYPE
.
CAMERA
)
{
FermiWebSocketMessageHandler
.
shareFile
();
FermiWebSocketMessageHandler
.
shareFile
();
}
else
{
}
else
{
FermiWebSocketBridge
.
shareFileHost
(
COLLABORATION_TYPE
.
CAMERA
);
FermiWebSocketBridge
.
shareFileHost
(
COLLABORATION_TYPE
.
CAMERA
);
...
@@ -251,7 +251,7 @@ FermiWebSocketMessageHandler.changeHostApplyForHost = function (data) {
...
@@ -251,7 +251,7 @@ FermiWebSocketMessageHandler.changeHostApplyForHost = function (data) {
NativeBridgeDelegate
.
setHostRequestFlg
(
HostRequestFlag
.
DOING
);
NativeBridgeDelegate
.
setHostRequestFlg
(
HostRequestFlag
.
DOING
);
//PIPモード終了時に0.5秒のアニメーションの影響で画面崩れ発生問題対応で、0.5秒後にアラート表示
//PIPモード終了時に0.5秒のアニメーションの影響で画面崩れ発生問題対応で、0.5秒後にアラート表示
setTimeout
(
function
()
{
setTimeout
(
function
()
{
if
(
confirm
(
getLocalizedString
(
"norify_request_host_change"
,
hostID
)))
{
if
(
confirm
(
getLocalizedString
(
"norify_request_host_change"
,
hostID
)))
{
CoviewBridge
.
changeHost
(
hostID
);
CoviewBridge
.
changeHost
(
hostID
);
NativeBridgeDelegate
.
setHostRequestFlg
(
HostRequestFlag
.
DONE
);
NativeBridgeDelegate
.
setHostRequestFlg
(
HostRequestFlag
.
DONE
);
...
@@ -284,7 +284,7 @@ FermiWebSocketMessageHandler.getCollaborationType = function (data) {
...
@@ -284,7 +284,7 @@ FermiWebSocketMessageHandler.getCollaborationType = function (data) {
FermiWebSocketMessageHandler
.
getCollaborationTypeResponse
=
function
(
data
)
{
FermiWebSocketMessageHandler
.
getCollaborationTypeResponse
=
function
(
data
)
{
const
collaborationType
=
data
.
payload
.
collaborationType
;
const
collaborationType
=
data
.
payload
.
collaborationType
;
const
meetingID
=
data
.
payload
.
newMeetingId
??
0
;
const
meetingID
=
data
.
payload
.
newMeetingId
??
0
;
FermiWebSocketMessageHandler
.
updateJoinChangeCollaboration
(
collaborationType
);
FermiWebSocketMessageHandler
.
updateJoinChangeCollaboration
(
collaborationType
);
globalUserInfo
.
meetingID
=
meetingID
;
globalUserInfo
.
meetingID
=
meetingID
;
CollaborationUI
.
updateScreen
(
globalUserInfo
.
collaborationType
);
CollaborationUI
.
updateScreen
(
globalUserInfo
.
collaborationType
);
...
...
This diff is collapsed.
Click to expand it.
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