Merge branch 'develop' into 'develop_change_collaboration'

# Conflicts:
#   public_new/js/share.js

public_new/js/chat-websocket.js

@@ -201,6 +201,10 @@ function setSocketAction () {
             type = text[1];
             type = text[1];
             if (type == messageType.COMMUNICATIONSTART || type == messageType.COMMUNICATIONEND) {
             if (type == messageType.COMMUNICATIONSTART || type == messageType.COMMUNICATIONEND) {
                 collaborationType = text[2];
                 collaborationType = text[2];
+                var meetingId = 0;
+                if (collaborationType == CHAT_UTIL.getCollaborationType(collaborationTypeKey.DOCUMENT)) {
+                    meetingId = text[3];
+                }
                 var userInCollaboration;
                 var userInCollaboration;
                 if (CHAT_UTIL.isIOS()) {
                 if (CHAT_UTIL.isIOS()) {
                     userInCollaboration = JSON.parse(CHAT_DB.getUserInfoList(message.userId));
                     userInCollaboration = JSON.parse(CHAT_DB.getUserInfoList(message.userId));
@@ -218,6 +222,7 @@ function setSocketAction () {
                      insertDate: message.insertDate,
                      insertDate: message.insertDate,
                      collaborationType: collaborationType,
                      collaborationType: collaborationType,
                      isToday: true,
                      isToday: true,
+                     meetingId: meetingId,
                      createdAtDay: messageTime.createdAtDay,
                      createdAtDay: messageTime.createdAtDay,
                      createdAtTime: messageTime.createdAtTime,
                      createdAtTime: messageTime.createdAtTime,
                      isOtherYear: false
                      isOtherYear: false

public_new/js/share.js

@@ -254,6 +254,7 @@ $(function () {
         break;
         break;
       case "JoinRoomResponse":
       case "JoinRoomResponse":
         if (json.resultCode == 200) {
         if (json.resultCode == 200) {
+          hostSearchInterval();
           for (let key in g_participants) {
           for (let key in g_participants) {
             loginIdList.push(key);
             loginIdList.push(key);
           }
           }
@@ -339,7 +340,23 @@ function Coview_changeHost(userId) {
 
 
 function Coview_addLoginId(loginId) {
 function Coview_addLoginId(loginId) {
   console.log("addUser loginId = " + loginId);
   console.log("addUser loginId = " + loginId);
+  var url = "https://livetaskyell.abookcloud.com/auth/getuser";
+  $.ajax({
+    url : url,
+    method : 'post',
+    data : {
+      id : loginId
+    },
+    success : function (result) {
+      console.log("result", result);
+      if (result.statusCode != 200) {
         coview_api.addUser(loginId);
         coview_api.addUser(loginId);
+      }
+    },
+    error : function (err) {
+      console.log(err.toString());
+    }
+  });
 }
 }
 
 
 function Coview_connect_audio_collaboration() {
 function Coview_connect_audio_collaboration() {
@@ -368,13 +385,14 @@ function hostSearchInterval() {
         if (!$("#collaboration_user_" + hostName).hasClass('host')) {
         if (!$("#collaboration_user_" + hostName).hasClass('host')) {
           $("#collaboration_user_" + hostName).addClass("host");
           $("#collaboration_user_" + hostName).addClass("host");
         }
         }
-            }
-        }
+
         if (g_isMainMan) {
         if (g_isMainMan) {
             $('.host_contents').removeClass('none');
             $('.host_contents').removeClass('none');
         } else {
         } else {
             $('.host_contents').addClass('none');
             $('.host_contents').addClass('none');
         }
         }
       }
       }
+    }
+  }
   timeInterval = setInterval(hostSearch, 3000);
   timeInterval = setInterval(hostSearch, 3000);
 }
 }
\ No newline at end of file