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

public/css/chat.css

@@ -1025,7 +1025,7 @@ p#coview_time {
   padding: 0px;
 }
 
-.coview_member_area, .coview_type_area {
+.coview_type_area {
   position: absolute;
   width: 100%;
   height: calc(100vh - 178px);
@@ -1036,6 +1036,17 @@ p#coview_time {
   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 {
   width: 70vw;
   height: 70vh;

public/index.html

@@ -89,7 +89,7 @@
             <img class="" src="./icon/ic_collaboration_tool_show.png" alt="">
         </button>
     </div>
-    <div class="coview_tool_area">
+    <div class="coview_tool_area" id="coviewToolArea">
         <div class="coview_tool_area_left">
             <button class="coview_tool_btn" id="penBtn">
                 <img class="" src="./icon/ic_collaboration_tool_pen.png" alt="">

public/js/share.js

@@ -99,15 +99,17 @@ $(function() {
 
     // 閉じるボタン
     $("#coviewShareCloseButton").on("click", function(e) {
-        // ナビゲーションボタン
-        $("#coviewChangeTypeButton").show();
-        $("#coviewAddMemberButton").show();
-        $("#coviewMemberButton").show();
-        $("#coviewShareCloseButton").hide();
-        // 画面表示
+        Coview_setNavigationMenu();
         $(".coview_type_area").hide();
         $(".coview_add_member_area").hide();
+        // 画面表示
+        switch (globalUserInfo.coWorkType) {
+            case "audio":
+                $(".coview_member_area").show();
+                break;
+            default:
                 $(".coview_member_area").hide();
+        }
     });
 
 
@@ -137,12 +139,30 @@ $(function() {
 
     // ペン
     $("#penBtn").on("click", function(e) {
+        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) {
+        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,22 +379,64 @@ function Coview_shareDropdownHide() {
 // 協業画面へ遷移
 function Coview_moveToVideoShareArea() {
     $("#loadingIndicator").addClass("full_active");
+    $(".coview_share_title_name").text(getLocalizedString("talking"));
+    // 表示設定
+    Coview_setShareArea();
+    Coview_setNavigationMenu();
+    Coview_setControlMenu();
+    Coview_setCoviewTypeBtn();
+    Coview_setCoviewMember();
+    // 時間計測開始
+    startTime = new Date().getTime();
+    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_share_title_name").text(getLocalizedString("talking"));
-    // ナビゲーションバーの表示
+            $(".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();
-    // 設定
-    Coview_setCoviewTypeBtn();
-    Coview_setCoviewMember();
-    // 時間計測開始
-    startTime = new Date().getTime();
-    timerId = setTimeout(Coview_setTime, 1000);
+    }
+}
+
+// コントロールメニューの表示設定
+function Coview_setControlMenu() {
+    switch (globalUserInfo.coWorkType) {
+        case "audio":
+            $('#toolAreaSwitcher').hide();
+            $('#coviewToolArea').hide();
+            break;
+        // TODO 他の協業
+        default:
+            $('#toolAreaSwitcher').show();
+            $('#coviewToolArea').show();
+    }
 }
 
 // 協業タイプ選択画面の設定