Merge branch 'develop' into debug/console_logs

public_new/css/collaboration.css

@@ -562,7 +562,7 @@
   background-repeat: no-repeat;
   background-repeat: no-repeat;
   background-position: center;
   background-position: center;
   background-size: contain;
   background-size: contain;
-  width: 30px;
+  width: 50px;
   height: 30px;
   height: 30px;
   margin: 0 10px 6px 10px;
   margin: 0 10px 6px 10px;
 }
 }
@@ -740,6 +740,7 @@
 }
 }
 #collabo_footer .txt {
 #collabo_footer .txt {
   font-size: 12px;
   font-size: 12px;
+  line-height: .9rem;
 }
 }
 
 
 @media screen and (max-width: 768px) {
 @media screen and (max-width: 768px) {
@@ -986,4 +987,8 @@ input[name="tab_item"] {
   .room_left {
   .room_left {
     max-width: 75%;
     max-width: 75%;
   }
   }
+  /* フッターアイコン */
+  .t-icon {
+    width: 30px;
+  }
 }
 }

public_new/js/views/collaboration/share-event-listener.js

@@ -11,12 +11,23 @@ CoviewBridge.bindReadyEvent = function () {
 
 
     // add login ID if not exist
     // add login ID if not exist
     CoviewBridge.addLoginID(globalUserInfo.loginId);
     CoviewBridge.addLoginID(globalUserInfo.loginId);
-    coview_api.Login(globalUserInfo.loginId);
-    CollaborationUI.updateScreen(globalUserInfo.collaborationType);
-    NativeBridgeDelegate.setHostRequestFlg(HostRequestFlag.DONE);
+    CoviewBridge.loginCoview();
   });
   });
 };
 };
 
 
+CoviewBridge.loginCoview = function () {
+  try {
+    coview_api.Login(globalUserInfo.loginId);
+  } catch (err) {
+    setTimeout(() => {
+      CoviewBridge.loginCoview();
+    }, 1000);
+    return;
+  }
+  CollaborationUI.updateScreen(globalUserInfo.collaborationType);
+  NativeBridgeDelegate.setHostRequestFlg(HostRequestFlag.DONE);
+};
+
 CoviewBridge.bindFermiWebSocketOpenned = function () {
 CoviewBridge.bindFermiWebSocketOpenned = function () {
   console.log("peacekim:: CoviewBridge.bindFermiWebSocketOpenned");
   console.log("peacekim:: CoviewBridge.bindFermiWebSocketOpenned");
   try {
   try {
@@ -307,7 +318,7 @@ CollaborationFeature.didReceivedJoinRoomInfoResponseMessage = function () {
 
 
 CoviewBridge.changeHostFromModal = function () {
 CoviewBridge.changeHostFromModal = function () {
   const userID = CollaborationUI.openedNamecardUserID;
   const userID = CollaborationUI.openedNamecardUserID;
-  
+
   // call in agent_app.js
   // call in agent_app.js
   coview_api.HostChange(userID);
   coview_api.HostChange(userID);
 };
 };
@@ -591,7 +602,7 @@ CoviewBridge.exitCollaboration = function () {
   if (globalUserInfo.collaborationType == COLLABORATION_TYPE.DOCUMENT) {
   if (globalUserInfo.collaborationType == COLLABORATION_TYPE.DOCUMENT) {
     NativeBridgeDelegate.exitMeetingRoom();
     NativeBridgeDelegate.exitMeetingRoom();
   }
   }
-  
+
   if ($("#recordBtn .record").hasClass("disable")) {
   if ($("#recordBtn .record").hasClass("disable")) {
     recordStop().then(function () {
     recordStop().then(function () {
       CoviewBridge.finishCollaboration();
       CoviewBridge.finishCollaboration();