Skip to content

C
chat_webview
Commit db41fe42 by Kim Peace
Options

Merge branch 'bug/#44044_caturep_button_on_change_collaboration' into 'develop' 

Bug/#44044 caturep button on change collaboration

See merge request !243
parents f13b7e89 94ddb32b
Showing with 12 additions and 230 deletions
public_new/collaboration_documents_overlay_menu.html deleted 100644 → 0
<div id="overlay_menu" class="overlay fixed">
<div class="overlay_menu_wrap">
<div class="overlay_menu h-100 d-flex justify-content-center align-items-center">
<div class="menu_wrap">
<div class="menu d-flex flex-row flex-wrap">
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_picture.svg" alt="写真共有">
</div>
<span>写真共有</span>
</a>
</div>
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('video');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_videocam.svg" alt="動画共有">
</div>
<span>動画共有</span>
</a>
</div>
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('docs');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_document.svg" alt="文書共有">
</div>
<span>文書共有</span>
</a>
</div>
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_whiteboard.svg" alt="落書き">
</div>
<span>落書き</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
public_new/collaboration_picture_overlay_menu.html deleted 100644 → 0
<div id="overlay_menu" class="overlay fixed">
<div class="overlay_menu_wrap">
<div class="overlay_menu h-100 d-flex justify-content-center align-items-center">
<div class="menu_wrap">
<div class="menu d-flex flex-row flex-wrap">
<div class="item collaboration_contents picture_contents video_contents document_contents board_contents">
<a href="javascript:changeCollaboration(COLLABORATION_TYPE.AUDIO);"
class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_headset.svg" alt="音声共有">
</div>
<span>音声共有</span>
</a>
</div>
<div class="item collaboration_contents picture_contents voice_contents document_contents board_contents">
<a href="javascript:changeCollaboration(COLLABORATION_TYPE.VIDEO);"
class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_videocam.svg" alt="動画共有">
</div>
<span>動画共有</span>
</a>
</div>
<div class="item collaboration_contents video_contents voice_contents document_contents board_contents">
<a href="javascript:coview_api.ChangeCollaboration('image');"
class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_picture.svg" alt="写真共有">
</div>
<span>写真共有</span>
</a>
</div>
<div class="item collaboration_contents video_contents voice_contents picture_contents board_contents">
<a href="javascript:changeCollaboration(COLLABORATION_TYPE.DOCUMENT);"
class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_document.svg" alt="文書共有">
</div>
<span>文書共有</span>
</a>
</div>
<div class="item collaboration_contents video_contents voice_contents picture_contents document_contents">
<a href="javascript:changeCollaboration(COLLABORATION_TYPE.BOARD);"
class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_whiteboard.svg" alt="落書き">
</div>
<span>落書き</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
public_new/collaboration_video_overlay_menu.html deleted 100644 → 0
<div id="overlay_menu" class="fixed hide">
<div class="overlay_menu_wrap">
<div class="overlay_menu d-flex justify-content-center align-items-center">
<div class="menu_wrap">
<div class="menu">
<div class="item rounded-circle shadow m-2 item01">
<a href="javascript:coview_api.ChangeCollaboration('audio');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_headset.svg" alt="音声共有">
</div>
<span>音声共有</span>
</a>
</div>
<div class="item rounded-circle shadow m-2 item02">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_picture.svg" alt="写真共有">
</div>
<span>写真共有</span>
</a>
</div>
<div class="item rounded-circle shadow m-2 item03">
<a href="javascript:coview_api.ChangeCollaboration('docs');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_document.svg" alt="文書共有">
</div>
<span>文書共有</span>
</a>
</div>
<div class="item rounded-circle shadow m-2 item04">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_whiteboard.svg" alt="落書き">
</div>
<span>落書き</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
public_new/collaboration_voice_overlay_menu.html deleted 100644 → 0
<div id="overlay_menu" class="fixed hide">
<div class="overlay_menu_wrap">
<div class="overlay_menu d-flex justify-content-center align-items-center">
<div class="menu_wrap">
<div class="menu">
<div class="item rounded-circle shadow m-2 item01">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_picture.svg" alt="写真共有">
</div>
<span>写真共有</span>
</a>
</div>
<div class="item rounded-circle shadow m-2 item02">
<a href="javascript:coview_api.ChangeCollaboration('video');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_videocam.svg" alt="動画共有">
</div>
<span>動画共有</span>
</a>
</div>
<div class="item rounded-circle shadow m-2 item03">
<a href="javascript:coview_api.ChangeCollaboration('docs');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_document.svg" alt="文書共有">
</div>
<span>文書共有</span>
</a>
</div>
<div class="item rounded-circle shadow m-2 item04">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_whiteboard.svg" alt="落書き">
</div>
<span>落書き</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
public_new/collaboration_whiteboard_overlay_menu.html deleted 100644 → 0
<div id="overlay_menu" class="overlay fixed">
<div class="overlay_menu_wrap">
<div class="overlay_menu h-100 d-flex justify-content-center align-items-center">
<div class="menu_wrap">
<div class="menu d-flex flex-row flex-wrap">
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('audio');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_headset.svg" alt="音声共有">
</div>
<span>音声共有</span>
</a>
</div>
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('video');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_videocam.svg" alt="動画共有">
</div>
<span>動画共有</span>
</a>
</div>
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_picture.svg" alt="写真共有">
</div>
<span>写真共有</span>
</a>
</div>
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('docs');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_document.svg" alt="文書共有">
</div>
<span>文書共有</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
...@@ -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
......
public_new/js/views/collaboration/share-event-listener.js
...@@ -268,7 +268,7 @@ CollaborationFeature.updateHost = function () { ...@@ -268,7 +268,7 @@ CollaborationFeature.updateHost = function () {
CollaborationUI.showHostMark(g_isMainManUsername); CollaborationUI.showHostMark(g_isMainManUsername);
$("#remoteVideoNameSpan").addClass("hide"); $(".remoteVideoNameSpan").addClass("none");
}; };
CollaborationUI.showHostButtons = function () { CollaborationUI.showHostButtons = function () {
...@@ -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");
} }
}; };
......
public_new/js/views/collaboration/share.js
...@@ -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