Merge branch 'develop' into feature/release_sp3_change_host_function

# Conflicts:
#	public_new/js/share.js

public_new/js/share.js

@@ -5,25 +5,23 @@ let coview_api = new CoviewApi();
 var isDocument = false;
 let isLeaved = false;
 let timeInterval = null;
-$(function() {
-    var coviewApiActive = coview_api.Init(
-            {
-                testSTRParam : "param1",
-                testNUMParam : 77,
-                testBOOLParam : false,
+$(function () {
+  var coviewApiActive = coview_api.Init({
+    testSTRParam: "param1",
+    testNUMParam: 77,
+    testBOOLParam: false,
     coview_api_srv_addr: "https://livetaskyell.abookcloud.com",
-                coview_wrap_id : "coviewShare",
-                coview_api_key: "8dda7092c5820d663"
-            }
-    );
+    coview_wrap_id: "coviewShare",
+    coview_api_key: "8dda7092c5820d663",
+  });
 
   // special button IN Chat ui
-    $("#coviewShareMainBtn").on("click", function(e) {
+  $("#coviewShareMainBtn").on("click", function (e) {
     e.stopPropagation();
-        if ($(".coview_share_dropdown_bar").is(':visible') == true) {
+    if ($(".coview_share_dropdown_bar").is(":visible") == true) {
       Coview_shareDropdownHide();
 
-            if ($(".coview_share_photo_select_bubble").is(':visible') == true) {
+      if ($(".coview_share_photo_select_bubble").is(":visible") == true) {
         $(".coview_share_photo_select_bubble").slideUp();
       }
     } else {
@@ -31,24 +29,22 @@ $(function() {
     }
   });
 
-    $("#coviewShareCloseButton").on("click", function(e) {
+  $("#coviewShareCloseButton").on("click", function (e) {
     coview_api.LeaveRoom();
     $(".coview_share_area").hide();
-
   });
 
-    $("body").on("click", function(){
+  $("body").on("click", function () {
     Coview_shareDropdownHide();
 
-        if ($(".coview_share_photo_select_bubble").is(':visible') == true) {
+    if ($(".coview_share_photo_select_bubble").is(":visible") == true) {
       $(".coview_share_photo_select_bubble").slideUp();
     } else {
       $(".coview_share_dropdown_bar").slideDown();
     }
-
   });
 
-    $(document).on("click", ".coview_share_request", function() {
+  $(document).on("click", ".coview_share_request", function () {
     console.log("globalUserInfo", globalUserInfo);
     if ($(this).hasClass(collaborationTypeKey.VIDEO) == true) {
       globalUserInfo.coWorkType = collaborationTypeKey.VIDEO;
@@ -65,29 +61,25 @@ $(function() {
     Coview_moveToVideoShareArea();
   });
 
-
   /* --------------------------------------------------- */
   /* Video, photo, chat, doc                             */
   /* --------------------------------------------------- */
-    $("#coviewShareChat").on("click", function() {
+  $("#coviewShareChat").on("click", function () {
     console.log("ON click coviewShareChat");
   });
 
-    $("#coviewSharePhoto").on("click", function(e) {
+  $("#coviewSharePhoto").on("click", function (e) {
     e.stopPropagation();
     console.log("ON click coviewSharePhoto");
 
-        if ($(".coview_share_photo_select_bubble").is(':visible') == true) {
+    if ($(".coview_share_photo_select_bubble").is(":visible") == true) {
       $(".coview_share_photo_select_bubble").slideUp();
     } else {
       $(".coview_share_photo_select_bubble").slideDown();
     }
   });
 
-
-
-
-    $("#coviewSharePhotoCamera").on("click", function() {
+  $("#coviewSharePhotoCamera").on("click", function () {
     $(".coview_share_photo_select_bubble").hide();
     globalUserInfo.coWorkType = collaborationTypeKey.CAMERA;
     coview_api.CreateRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
@@ -95,7 +87,7 @@ $(function() {
 
     $(".coview_share_title_name").text("カメラ");
   });
-    $("#coviewSharePhotoGallery").on("click", function() {
+  $("#coviewSharePhotoGallery").on("click", function () {
     $(".coview_share_photo_select_bubble").hide();
     globalUserInfo.coWorkType = "gallery";
     coview_api.CreateRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
@@ -104,12 +96,11 @@ $(function() {
     $(".coview_share_title_name").text("ライブラリ");
   });
 
-    $("#coviewShareAudio").on("click", function() {
+  $("#coviewShareAudio").on("click", function () {
     Coview_connect_audio_collaboration();
-    })
-
+  });
 
-    $("#coviewShareLive").on("click", function() {
+  $("#coviewShareLive").on("click", function () {
     console.log("ON click coviewShareLive");
     globalUserInfo.coWorkType = "video";
     console.log("globalUserInfo", globalUserInfo);
@@ -120,62 +111,64 @@ $(function() {
     $(".coview_share_title_name").text("LIVE");
   });
 
-//     $("#coviewShareDoc").on("click", function(){
-//         console.log("ON click coviewShareDoc");
-//         alert("INTO a document share mode (only audio)");
-//         globalUserInfo.coWorkType = "audio";
-//     });
+  //     $("#coviewShareDoc").on("click", function(){
+  //         console.log("ON click coviewShareDoc");
+  //         alert("INTO a document share mode (only audio)");
+  //         globalUserInfo.coWorkType = "audio";
+  //     });
 
-    coview_api.addEventListener ("ready", function () {
+  coview_api.addEventListener("ready", function () {
     console.log("=============> READY : ready for coview api");
     Coview_addLoginId(globalUserInfo.loginId);
     coview_api.Login(globalUserInfo.loginId);
   });
 
-    coview_api.addEventListener ("start", function () {
+  coview_api.addEventListener("start", function () {
     console.log("=============> START : share start");
     $("#loadingIndicator").removeClass("full_active");
   });
 
-    coview_api.addEventListener ("allbye", function () {
+  coview_api.addEventListener("allbye", function () {
     console.log("=============> ALL BYE : share allbye");
     $("#loadingIndicator").removeClass("full_active");
   });
 
-    coview_api.addEventListener ("guestbye", function () {
+  coview_api.addEventListener("guestbye", function () {
     console.log("=============> GUEST BYE : share guestbye");
     $("#loadingIndicator").removeClass("full_active");
   });
 
-    coview_api.addEventListener ("hostbye", function () {
+  coview_api.addEventListener("hostbye", function () {
     console.log("=============> HOST BYE : share hostbye");
     alert(getLocalizedString("inform_exit_host_collaboration"));
     Coview_exitCollaboration();
     $("#loadingIndicator").removeClass("full_active");
   });
 
-    coview_api.addEventListener ("destroy", function () {
+  coview_api.addEventListener("destroy", function () {
     console.log("=============> DESTROY : share destroy");
     coview_api.LeaveRoom();
     $(".coview_share_area").hide();
     $("#loadingIndicator").removeClass("full_active");
   });
+    
   var meetingId;
-    coview_api.addEventListener ("message", async function (event, json) {
+    
+  coview_api.addEventListener("message", async function (event, json) {
     console.log("+++ addEventListener", json);
     console.log("processMessage api = ", json.api);
     if (isLeaved) return;
     let loginIdList = new Array();
-        switch (json.api){
+    switch (json.api) {
       case "LoginResponse":
-                console.log('------------------------------');
+        console.log("------------------------------");
         console.log(globalUserInfo.coWorkType);
         console.log(collaborationJoinFlg);
         if (globalUserInfo.coWorkType == collaborationTypeKey.DOCUMENT) {
           isDocument = true;
           globalUserInfo.coWorkType = collaborationTypeKey.AUDIO;
         }
-                if (collaborationJoinFlg == '1') {
+        if (collaborationJoinFlg == "1") {
           coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
           if (isDocument) {
             if (CHAT_UTIL.isIOS()) {
@@ -184,8 +177,11 @@ $(function() {
               android.startContentView(meetingId);
             }
           }
-                } else if (collaborationJoinFlg == '0') {
-                    coview_api.CreateRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
+        } else if (collaborationJoinFlg == "0") {
+          coview_api.CreateRoom(
+            globalUserInfo.roomId,
+            globalUserInfo.coWorkType
+          );
           if (isDocument) {
             if (CHAT_UTIL.isIOS()) {
               //TODO 画面を縮小し、会議室に入場する処理
@@ -193,7 +189,7 @@ $(function() {
               meetingId = android.createContentView();
             }
           }
-                } else if (collaborationJoinFlg == '2') {
+        } else if (collaborationJoinFlg == "2") {
           coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
         }
         Coview_moveToVideoShareArea();
@@ -202,28 +198,46 @@ $(function() {
         if (json.resultCode == 200) {
           var coviewInviteMessage;
           if (isDocument) {
-                        coviewInviteMessage = "" + messageSeperator + messageType.COMMUNICATIONSTART + messageSeperator + CHAT_UTIL.getCollaborationType(collaborationTypeKey.DOCUMENT) + messageSeperator + meetingId;
+            coviewInviteMessage =
+              "" +
+              messageSeperator +
+              messageType.COMMUNICATIONSTART +
+              messageSeperator +
+              CHAT_UTIL.getCollaborationType(collaborationTypeKey.DOCUMENT) +
+              messageSeperator +
+              meetingId;
           } else {
-                        coviewInviteMessage = "" + messageSeperator + messageType.COMMUNICATIONSTART + messageSeperator + CHAT_UTIL.getCollaborationType(globalUserInfo.coWorkType);
+            coviewInviteMessage =
+              "" +
+              messageSeperator +
+              messageType.COMMUNICATIONSTART +
+              messageSeperator +
+              CHAT_UTIL.getCollaborationType(globalUserInfo.coWorkType);
           }
-                    socket.emit('createMessage', {
-                        text: coviewInviteMessage
-                    }, 0);
-
+          socket.emit(
+            "createMessage",
+            {
+              text: coviewInviteMessage,
+            },
+            0
+          );
         } else {
         }
         break;
       case "JoinRoomInfoResponse":
         if (json.resultCode == 200) {
         } else {
-                    alert("Not exist sharing call (" + json.resultCode + ")\nPlease using share menu.");
+          alert(
+            "Not exist sharing call (" +
+              json.resultCode +
+              ")\nPlease using share menu."
+          );
           coview_api.LeaveRoom();
           $(".coview_share_area").hide();
           $("#loadingIndicator").removeClass("full_active");
         }
         break;
       case "JoinRoomResponse":
-                hostSearchInterval();
         if (json.resultCode == 200) {
           for (let key in g_participants) {
             loginIdList.push(key);
@@ -244,8 +258,13 @@ $(function() {
         }
         CHAT_UI.refreshJoinedCollaboration(loginIdList);
         break;
+      case "HostRequest":
+        // to be called by
+        // wc_api.dispatchEvent (new Event ("message"), {"HostRequest":"userID"});
+        console.log("consoleLog", json);
+        break;
       default:
-                console.log('Unrecognized api', json);
+        console.log("Unrecognized api", json);
         break;
     }
   });
@@ -259,7 +278,7 @@ function Coview_shareDropdownHide() {
 function Coview_moveToVideoShareArea() {
   $("#loadingIndicator").addClass("full_active");
   $(".coview_share_area").show();
-    $('#collabo_main').removeClass('none');
+  $("#collabo_main").removeClass("none");
 }
 
 function Coview_exitCollaboration(isDocument = false) {
@@ -273,10 +292,13 @@ function Coview_exitCollaboration(isDocument = false) {
   clearInterval(timeInterval);
   coview_api.LeaveRoom();
   isLeaved = true;
-    if (collaborationJoinFlg != '2') {
-        CHAT_UI.joinRoom(CHAT.globalLoginParameter.roomId, CHAT.globalLoginParameter.name);
+  if (collaborationJoinFlg != "2") {
+    CHAT_UI.joinRoom(
+      CHAT.globalLoginParameter.roomId,
+      CHAT.globalLoginParameter.name
+    );
   } else {
-        if (typeof(android) != "undefined") {
+    if (typeof android != "undefined") {
       android.openCommunicationHome();
     } else {
       webkit.messageHandlers.openCommunicationHome.postMessage({});