Merge branch 'feature/host_change' into debug/console_logs

# Conflicts:
#	public_new/js/views/collaboration/fermi-web-socket-bridge.js
#	public_new/js/views/collaboration/share-event-listener.js

public_new/js/views/collaboration/fermi-web-socket-bridge.js

@@ -67,6 +67,9 @@ FermiWebSocketBridge.getCollaborationTypeResponse = function (loginID) {
       ", meetingID: " +
       ", meetingID: " +
       meetingID
       meetingID
   );
   );
+  if (typeof meetingID == undefined ) {
+    var meetingID = 0;
+  }
   fw.sendToMsg("others", "GET_COLLABORATION_TYPE_RESPONSE", {
   fw.sendToMsg("others", "GET_COLLABORATION_TYPE_RESPONSE", {
     loginId: loginID,
     loginId: loginID,
     collaborationType: globalUserInfo.collaborationType,
     collaborationType: globalUserInfo.collaborationType,

public_new/js/views/collaboration/fermi-web-socket-message-handler.js

@@ -11,6 +11,7 @@ FermiWebSocketMessageHandler.bindWebSocketMessage = function () {
         (data.payload.loginId == globalUserInfo.loginId)
         (data.payload.loginId == globalUserInfo.loginId)
     );
     );
     if (g_isMainMan) {
     if (g_isMainMan) {
+      // 自分がホストの場合
       FermiWebSocketMessageHandler.handleMessagesToHost(data);
       FermiWebSocketMessageHandler.handleMessagesToHost(data);
     } else if (data.payload.loginId == globalUserInfo.loginId) {
     } else if (data.payload.loginId == globalUserInfo.loginId) {
       // 自分自身の場合
       // 自分自身の場合

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

@@ -55,7 +55,7 @@ CollaborationFeature.checkAndRetryCamera = async function () {
       ", g_newStream: " +
       ", g_newStream: " +
       g_newStream
       g_newStream
   );
   );
-  if (!deviceInfo.isAndroid) {
+  if (!deviceInfo.isAndroid()) {
     return;
     return;
   }
   }
   if (globalUserInfo.collaborationType != COLLABORATION_TYPE.VIDEO) {
   if (globalUserInfo.collaborationType != COLLABORATION_TYPE.VIDEO) {