Commit 94ddb32b by Kim Peace

Fixed to display and hide capture picture button on collaboration

parent 6db82ab5
...@@ -92,7 +92,7 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) { ...@@ -92,7 +92,7 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
if (globalUserInfo.joinType != COLLABORATION_JOIN_TYPE.INVITED) { if (globalUserInfo.joinType != COLLABORATION_JOIN_TYPE.INVITED) {
FermiWebSocketMessageHandler.apiWelcome(); FermiWebSocketMessageHandler.apiWelcome();
} else { } else {
FermiWebSocketBridge.getCollaborationType() FermiWebSocketBridge.getCollaborationType();
} }
CollaborationFeature.updateHost(); CollaborationFeature.updateHost();
break; break;
...@@ -147,12 +147,14 @@ FermiWebSocketMessageHandler.shareFile = function () { ...@@ -147,12 +147,14 @@ FermiWebSocketMessageHandler.shareFile = function () {
CollaborationUI.updateScreen(COLLABORATION_TYPE.CAMERA); CollaborationUI.updateScreen(COLLABORATION_TYPE.CAMERA);
globalUserInfo.collaborationType = COLLABORATION_TYPE.CAMERA; globalUserInfo.collaborationType = COLLABORATION_TYPE.CAMERA;
FermiWebSocketBridge.shareFileHost(COLLABORATION_TYPE.CAMERA); FermiWebSocketBridge.shareFileHost(COLLABORATION_TYPE.CAMERA);
CollaborationFeature.updateHost();
}; };
// SHARE_FILE_HOST // SHARE_FILE_HOST
FermiWebSocketMessageHandler.shareFileHost = function () { FermiWebSocketMessageHandler.shareFileHost = function () {
CollaborationUI.updateScreen(COLLABORATION_TYPE.CAMERA); CollaborationUI.updateScreen(COLLABORATION_TYPE.CAMERA);
globalUserInfo.collaborationType = COLLABORATION_TYPE.CAMERA; globalUserInfo.collaborationType = COLLABORATION_TYPE.CAMERA;
CollaborationFeature.updateHost();
}; };
// CAPTURE_REQUEST // CAPTURE_REQUEST
......
...@@ -279,6 +279,9 @@ CollaborationUI.showHostButtons = function () { ...@@ -279,6 +279,9 @@ CollaborationUI.showHostButtons = function () {
if (globalUserInfo.collaborationType == COLLABORATION_TYPE.VIDEO) { if (globalUserInfo.collaborationType == COLLABORATION_TYPE.VIDEO) {
$(".video_contents_host").removeClass("none"); $(".video_contents_host").removeClass("none");
$(".video_contents_user").addClass("none"); $(".video_contents_user").addClass("none");
} else {
$(".video_contents_host").addClass("none");
$(".video_contents_user").addClass("none");
} }
}; };
...@@ -290,6 +293,9 @@ CollaborationUI.hideHostButtons = function () { ...@@ -290,6 +293,9 @@ CollaborationUI.hideHostButtons = function () {
if (globalUserInfo.collaborationType == COLLABORATION_TYPE.VIDEO) { if (globalUserInfo.collaborationType == COLLABORATION_TYPE.VIDEO) {
$(".video_contents_user").removeClass("none"); $(".video_contents_user").removeClass("none");
$(".video_contents_host").addClass("none"); $(".video_contents_host").addClass("none");
} else {
$(".video_contents_host").addClass("none");
$(".video_contents_user").addClass("none");
} }
}; };
......
...@@ -111,6 +111,8 @@ CollaborationUI.updateScreen = async function (collaborationType) { ...@@ -111,6 +111,8 @@ CollaborationUI.updateScreen = async function (collaborationType) {
); );
break; break;
} }
CollaborationFeature.updateHost();
await waitMillisecond(1000); await waitMillisecond(1000);
$(".before_loading_indicator").addClass("none"); $(".before_loading_indicator").addClass("none");
}; };
......
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