Skip to content

C
chat_webview
Commit 2863d127 by Takatoshi Miura
Options

ペン、ポインターのON/OFF実装

parent f63b9ee0
Showing with 94 additions and 21 deletions
public/css/chat.css
...@@ -1025,7 +1025,7 @@ p#coview_time { ...@@ -1025,7 +1025,7 @@ p#coview_time {
padding: 0px; padding: 0px;
} }
.coview_member_area, .coview_type_area { .coview_type_area {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: calc(100vh - 178px); height: calc(100vh - 178px);
...@@ -1036,6 +1036,17 @@ p#coview_time { ...@@ -1036,6 +1036,17 @@ p#coview_time {
background: #525252; background: #525252;
} }
.coview_member_area {
position: absolute;
width: 100%;
height: calc(100vh - 178px);
bottom: 120px;
overflow-y: scroll;
text-align: center;
z-index: 3;
background: #525252;
}
.coview_add_member_area { .coview_add_member_area {
width: 70vw; width: 70vw;
height: 70vh; height: 70vh;
......
public/index.html
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<img class="" src="./icon/ic_collaboration_tool_show.png" alt=""> <img class="" src="./icon/ic_collaboration_tool_show.png" alt="">
</button> </button>
</div> </div>
<div class="coview_tool_area"> <div class="coview_tool_area" id="coviewToolArea">
<div class="coview_tool_area_left"> <div class="coview_tool_area_left">
<button class="coview_tool_btn" id="penBtn"> <button class="coview_tool_btn" id="penBtn">
<img class="" src="./icon/ic_collaboration_tool_pen.png" alt=""> <img class="" src="./icon/ic_collaboration_tool_pen.png" alt="">
......
public/js/share.js
...@@ -99,15 +99,17 @@ $(function() { ...@@ -99,15 +99,17 @@ $(function() {
// 閉じるボタン // 閉じるボタン
$("#coviewShareCloseButton").on("click", function(e) { $("#coviewShareCloseButton").on("click", function(e) {
// ナビゲーションボタン Coview_setNavigationMenu();
$("#coviewChangeTypeButton").show();
$("#coviewAddMemberButton").show();
$("#coviewMemberButton").show();
$("#coviewShareCloseButton").hide();
// 画面表示
$(".coview_type_area").hide(); $(".coview_type_area").hide();
$(".coview_add_member_area").hide(); $(".coview_add_member_area").hide();
$(".coview_member_area").hide(); // 画面表示
switch (globalUserInfo.coWorkType) {
case "audio":
$(".coview_member_area").show();
break;
default:
$(".coview_member_area").hide();
}
}); });
...@@ -137,12 +139,30 @@ $(function() { ...@@ -137,12 +139,30 @@ $(function() {
// ペン // ペン
$("#penBtn").on("click", function(e) { $("#penBtn").on("click", function(e) {
FreeDrawOnOff("off"); var flg = $(this).hasClass("active");
if (flg == true) {
$(this).removeClass("active");
document.getElementById('penBtn').innerHTML = '<img class="" src="./icon/ic_collaboration_tool_pen.png" alt="">';
FreeDrawOnOff("on");
} else {
$(this).addClass("active");
document.getElementById('penBtn').innerHTML = '<img class="" src="./icon/ic_collaboration_tool_pen.png" alt="">';
FreeDrawOnOff("off");
}
}); });
// ポインター // ポインター
$("#pointerBtn").on("click", function(e) { $("#pointerBtn").on("click", function(e) {
ColorDrawOnOff("off"); var flg = $(this).hasClass("active");
if (flg == true) {
$(this).removeClass("active");
document.getElementById('pointerBtn').innerHTML = '<img class="" src="./icon/ic_collaboration_tool_pointer.png" alt="">';
ColorDrawOnOff("on");
} else {
$(this).addClass("active");
document.getElementById('pointerBtn').innerHTML = '<img class="" src="./icon/ic_collaboration_tool_pointer.png" alt="">';
ColorDrawOnOff("off");
}
}); });
// クリア // クリア
...@@ -359,17 +379,11 @@ function Coview_shareDropdownHide() { ...@@ -359,17 +379,11 @@ function Coview_shareDropdownHide() {
// 協業画面へ遷移 // 協業画面へ遷移
function Coview_moveToVideoShareArea() { function Coview_moveToVideoShareArea() {
$("#loadingIndicator").addClass("full_active"); $("#loadingIndicator").addClass("full_active");
$(".coview_share_area").show();
$(".coview_type_area").hide();
$(".coview_add_member_area").hide();
$(".coview_member_area").hide();
$(".coview_share_title_name").text(getLocalizedString("talking")); $(".coview_share_title_name").text(getLocalizedString("talking"));
// ナビゲーションバーの表示 // 表示設定
$("#coviewChangeTypeButton").show(); Coview_setShareArea();
$("#coviewAddMemberButton").show(); Coview_setNavigationMenu();
$("#coviewMemberButton").show(); Coview_setControlMenu();
$("#coviewShareCloseButton").hide();
// 設定
Coview_setCoviewTypeBtn(); Coview_setCoviewTypeBtn();
Coview_setCoviewMember(); Coview_setCoviewMember();
// 時間計測開始 // 時間計測開始
...@@ -377,6 +391,54 @@ function Coview_moveToVideoShareArea() { ...@@ -377,6 +391,54 @@ function Coview_moveToVideoShareArea() {
timerId = setTimeout(Coview_setTime, 1000); timerId = setTimeout(Coview_setTime, 1000);
} }
// 協業画面の表示設定
function Coview_setShareArea() {
switch (globalUserInfo.coWorkType) {
case "audio":
$(".coview_share_area").show();
$(".coview_member_area").show();
$(".coview_type_area").hide();
$(".coview_add_member_area").hide();
break;
default:
$(".coview_share_area").show();
$(".coview_member_area").hide();
$(".coview_type_area").hide();
$(".coview_add_member_area").hide();
}
}
// ナビゲーションバーの表示設定
function Coview_setNavigationMenu() {
switch (globalUserInfo.coWorkType) {
case "audio":
$("#coviewChangeTypeButton").show();
$("#coviewAddMemberButton").show();
$("#coviewMemberButton").hide();
$("#coviewShareCloseButton").hide();
break;
default:
$("#coviewChangeTypeButton").show();
$("#coviewAddMemberButton").show();
$("#coviewMemberButton").show();
$("#coviewShareCloseButton").hide();
}
}
// コントロールメニューの表示設定
function Coview_setControlMenu() {
switch (globalUserInfo.coWorkType) {
case "audio":
$('#toolAreaSwitcher').hide();
$('#coviewToolArea').hide();
break;
// TODO 他の協業
default:
$('#toolAreaSwitcher').show();
$('#coviewToolArea').show();
}
}
// 協業タイプ選択画面の設定 // 協業タイプ選択画面の設定
function Coview_setCoviewTypeBtn() { function Coview_setCoviewTypeBtn() {
// 初期化 // 初期化
......
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