Merge remote-tracking branch 'origin/develop' into squash/socket_kim-ec

2f805a11 · Kim Eunchul · 7299ec5f · 91ad8f0f · 2f805a11 · 2f805a11
Commit 2f805a11 authored Aug 06, 2021 by Kim Eunchul
23 changed files
--- a/public_new/chat_add_user.html
+++ b/public_new/chat_add_user.html
@@ -8,7 +8,7 @@
    content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
  <title>LiveTaskyell</title>
  <link rel="stylesheet" href="./css/notosansjp.css">
-  <link rel="stylesheet" href="./fontawesome/css/all.css" >
+  <link rel="stylesheet" href="./fontawesome/css/all.css">
  <link rel="stylesheet" href="./css/bootstrap.min.css">
  <link rel="stylesheet" href="./css/common.css">
  <link rel="stylesheet" href="./css/chat.css">
@@ -21,7 +21,7 @@
  <!-- ナビメニュー -->
  <nav>
    <div class="row h-100 align-items-center">
-      <div class="col-4 pr-0">
+      <div class="col-10 pr-0">
        <div class="nav-item">
          <div class="nav_prev">
            <a href="chat_room.html"><span>ルーム</span></a>
@@ -66,7 +66,7 @@
            <div id="myGroupListForMakeRoom"></div>
          </div>
        </div>
-      </div>
        <div class="tab_content" id="tab2_content">
          <div class="breadcrumb" id="groupPathAreaForAddUser"></div>
          <div class="chat_list">
@@ -79,6 +79,7 @@
                      <div class="thumbnail-icon">
                        <img src="icon/icon_prev_top.svg" alt="トップグループに戻る" />
                      </div>
+                    </div>
                    <div class="chat_item_m px-0">
                      <div class="d-flex flex-column">
                        <div class="chat_item_t">
@@ -87,7 +88,6 @@
                      </div>
                    </div>
                  </div>
-                </div>
                </a>
              </li>
              <li class="d-flex align-items-center" id="parentGroupArea">
@@ -97,6 +97,7 @@
                      <div class="thumbnail-icon">
                        <img src="icon/icon_prev.svg" alt="上位グループに戻る" />
                      </div>
+                    </div>
                    <div class="chat_item_m px-0">
                      <div class="d-flex flex-column">
                        <div class="chat_item_t">

--- a/public_new/chat_change_room_name.html
+++ b/public_new/chat_change_room_name.html
@@ -79,6 +79,7 @@
  <script src="./js/Models/deviceinfo.js"></script>
  <script src="./js/Models/serverinfo.js"></script>
  <script src="./js/Models/userinfo.js"></script>
+  <script src="./js/Models/roominfo.js"></script>
  <!-- View -->
  <script src="./js/views/chats/chat-room.js"></script>
  <script src="./js/views/chats/chat-room-search.js"></script>

--- a/public_new/icon/icon_disable_movie.svg
+++ b/public_new/icon/icon_disable_movie.svg
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 128 128"><defs><style>.cls-1{opacity:0.9;}.cls-2{opacity:0.5;}.cls-3{fill:#fefefe;}.cls-4{fill:#707070;}.cls-5{fill:#fff;}</style></defs><g id="レイヤー_2" data-name="レイヤー 2"><g id="オフライン時の動画再生ボタン"><g class="cls-1"><image class="cls-2" width="128" height="128" xlink:href="data:image/png;base64,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"/><circle class="cls-3" cx="61" cy="61" r="54.75"/></g><path class="cls-4" d="M90.78,58.57,48,33.89a2.81,2.81,0,0,0-4.21,2.43V85.68A2.81,2.81,0,0,0,48,88.11L90.78,63.43A2.81,2.81,0,0,0,90.78,58.57Z"/><g class="cls-1"><image class="cls-2" width="128" height="128" xlink:href="data:image/png;base64,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"/><rect class="cls-5" x="58.08" y="-14.66" width="5.84" height="151.32" rx="2.92" transform="translate(-25.27 61) rotate(-45)"/></g></g></g></svg>
\ No newline at end of file
--- a/public_new/img/bg_movie.jpg
+++ b/public_new/img/bg_movie.jpg
--- a/public_new/js/Models/coview-userinfo.js
+++ b/public_new/js/Models/coview-userinfo.js
@@ -90,7 +90,7 @@ var CoviewUserInfo = class {
 // variable name for legacy connection to agent_app.js in coview library
 var globalUserInfo = new CoviewUserInfo(
  currentUserInfo.sid,
-  currentUserInfo.loginID,
+  currentUserInfo.shopName + "_" + currentUserInfo.loginID,
  roomInfo.roomID,
  currentUserInfo.shopName
 );
--- a/public_new/js/common/common.js
+++ b/public_new/js/common/common.js
--- a/public_new/js/common/native-bridge-delegate.js
+++ b/public_new/js/common/native-bridge-delegate.js
@@ -117,7 +117,7 @@ NativeBridgeDelegate.joinCollaboration = function (
 NativeBridgeDelegate.inviteUsers = function (userIDList) {
  if (typeof android != "undefined") {
-    android.inviteUsers(userIDList, false);
+    android.inviteUsers(userIDList);
  } else {
    webkit.messageHandlers.inviteUsers.postMessage({
      userIdList: userIDList,
@@ -146,7 +146,7 @@ NativeBridgeDelegate.finishPIPMode = function (needsAndroid = false) {
  if (deviceInfo.isiOS()) {
    webkit.messageHandlers.finishPipMode.postMessage({});
  } else if (needsAndroid && typeof android != "undefined") {
-    android.finishPip();
+    android.finishPIP();
  }
 };

--- a/public_new/js/languages/language_en.js
+++ b/public_new/js/languages/language_en.js
@@ -53,6 +53,7 @@ $.lang.en = {
    "groupChatRoom":"Group",
    "myGroup":"My Group",
    "allGroup":"All Group",
+    "message_join": "Join",
    "message_ended" : "End",
    "returnToRootGroup":"Return to Root Group",
    "returnToParentGroup":"Return to Parent Group",

--- a/public_new/js/languages/language_ja.js
+++ b/public_new/js/languages/language_ja.js
@@ -53,6 +53,7 @@ $.lang.ja = {
    "groupChatRoom":"グループ",
    "myGroup":"マイグループ",
    "allGroup":"全グループ",
+    "message_join": "参加する",
    "message_ended" : "終了しました",
    "returnToRootGroup":"トップグループに戻る",
    "returnToParentGroup":"上位グループに戻る",

--- a/public_new/js/languages/language_ko.js
+++ b/public_new/js/languages/language_ko.js
@@ -53,6 +53,7 @@ $.lang.ko = {
    "groupChatRoom":"그룹",
    "myGroup":"내그룹",
    "allGroup":"전그룹",
+    "message_join": "참가하기",
    "message_ended" : "종료되었습니다.",
    "returnToRootGroup":"최상위그룹으로 돌아가기",
    "returnToParentGroup":"상위그룹으로 돌아가기",

--- a/public_new/js/utils/chat-media-handler.js
+++ b/public_new/js/utils/chat-media-handler.js
@@ -119,7 +119,7 @@ ChatMediaHandler.videoEncodeEnd = function (encodedUri) {
          res.fileName +
          "&roomId=" +
          roomInfo.roomID;
-        var imageName = res.fileName;
+        var imageName = new String(res.fileName);
        // uploadFileの判断
        var extension = imageName
@@ -151,6 +151,7 @@ ChatMediaHandler.videoEncodeEnd = function (encodedUri) {
          controls: "true",
          width: "auto",
          style: "max-width:100%",
+          poster: "./img/bg_movie.jpg",
        });
        const source = $("<source/>", { src: videoSrc });
        const downloadIcon = $("<a/>", {
@@ -350,6 +351,7 @@ ChatMediaHandler.uploadImage = function (formData) {
          controls: "true",
          width: "auto",
          style: "max-width:100%",
+          poster: "./img/bg_movie.jpg",
        });
        const source = $("<source/>", { src: videoSrc });
        const downloadIcon = $("<a/>", {

--- a/public_new/js/views/chats/chat-room-message.js
+++ b/public_new/js/views/chats/chat-room-message.js
@@ -98,7 +98,6 @@ ChatRoom.loadMessages = function (joinRoomID, joinRoomName) {
  let messages = NativeBridgeDataSource.getMessagesByRoomID(roomID);
  ChatRoom.prependMessage(messages, roomID);
  window.addEventListener(
    "load",
    function (event) {
@@ -167,9 +166,9 @@ ChatRoom.prependMessage = function (messages) {
    // 日付ラーベル表示
    if (
-      messageCreatedTime != checkBeforeDate 
+      messageCreatedTime != checkBeforeDate &&
-      && checkBeforeDate != "" 
+      checkBeforeDate != "" &&
-      && !isToday
+      !isToday
    ) {
      const html = ChatRoom.renderDateLabelMessage(beforeDate);
      messageElement.append(html);
@@ -255,13 +254,17 @@ ChatRoom.renderCollaborationMessage = function (message, isToday, isOtherYear) {
    collaborationInfo.collaborationType
  );
+  const collaborationJoinMessage =
+    message.messageType == MessageType.COMMUNICATIONEND
+      ? getLocalizedString("message_ended")
+      : getLocalizedString("message_join");
  const html = Mustache.render(collaborationMessageTemplate, {
    messageId: message.messageId,
    roomName: roomName,
    userCount: userInCollaboration.length,
    userList: displayUserList,
    insertDate: message.insertDate,
-    // TODO: peacekim:: should check collaborationInfo.collaborationType is string or number
    collaborationType: strCollaborationType,
    meetingId: meetingID,
    isToday: isToday,
@@ -270,6 +273,7 @@ ChatRoom.renderCollaborationMessage = function (message, isToday, isOtherYear) {
    createdAtYear: createdAtYear,
    isOtherYear: isOtherYear,
    isEnded: message.messageType == MessageType.COMMUNICATIONEND ? true : false,
+    collaborationJoinMessage: collaborationJoinMessage,
  });
  return message.message.includes("attachedImages") ||
    message.message.includes("attachedVideos")

--- a/public_new/js/views/chats/chat-room-search.js
+++ b/public_new/js/views/chats/chat-room-search.js
@@ -17,6 +17,9 @@ ChatRoom.bindSearchUI = function () {
    chatSearchInput.focus();
    searchMessage.addClass("onfocus");
    $(".chat_list").removeClass("none");
+    //メッセージ情報をCMS側から最新に更新
+    NativeBridgeDelegate.updatePreMessage("");
  });
  $(".chat_room_src_form .cancel").click(function () {

--- a/public_new/js/views/chats/management/chat-room-change.js
+++ b/public_new/js/views/chats/management/chat-room-change.js
@@ -5,6 +5,7 @@ document.addEventListener("DOMContentLoaded", function () {
  $(".change_room_name_btn button").click(function () {
    $("form").submit();
  });
+  $("#roomNameInput").attr("placeholder", roomInfo.roomName);
 });
 $("#roomNameChangeBtn").click(function () {

--- a/public_new/js/views/collaboration/collaboration.js
+++ b/public_new/js/views/collaboration/collaboration.js
@@ -50,6 +50,16 @@ CollaborationUI.bindDisplayUsersButton = function () {
  });
 };
+CollaborationUI.userListSlideOut = function () {
+  const w = $(".user_btn").width();
+  $(".user_btn").removeClass("hide");
+  $("#overlay_user_list.overlay")
+    .removeClass("slidein")
+    .css({ transform: "translateX(" & -w & ")" });
+  scrollTo(0, 0);
+  CollaborationUI.bindDisableScroll();
+};
 CollaborationUI.bindChangeHostButton = function () {
  $(".ch_host_btn").click(function () {
    const target = $(this).val();
@@ -130,6 +140,7 @@ CollaborationUI.makeNameCard = function (shopMemberID) {
    isFavorite: nameCardInfo.isFavorite,
    isHost: isCollaborationHost,
    whosHost: whosHost,
+    collaborationId: globalUserInfo.shopName + "_" + nameCardInfo.loginId,
  });
  let namecardObj = $(jQuery.parseHTML(namecardHTML)).on(

--- a/public_new/js/views/collaboration/fermi-web-socket-bridge.js
+++ b/public_new/js/views/collaboration/fermi-web-socket-bridge.js
@@ -3,13 +3,12 @@ var FermiWebSocketBridge = {};
 // call from modal_collabo_profile.html
 FermiWebSocketBridge.requestHostChange = function (loginID) {
  fw.sendToMsg("others", "HOST_CHANGE_REQUEST", {
-    loginId: getFermiLoginId(loginID),
+    loginId: loginID,
  });
 };
 FermiWebSocketBridge.shareFileHost = function (collaborationType) {
  fw.sendToMsg("others", "SHARE_FILE_HOST", {
-    // TODO: Peacekim check collaboration type as coviewType
    collaborationType: collaborationType,
  });
 };
@@ -19,14 +18,14 @@ FermiWebSocketBridge.hostChangeResponse = function () {
  fw.sendToMsg("others", "HOST_CHANGE_RESPONSE", {
    isAndroid: deviceInfo.isAndroid(),
    isAble: deviceInfo.androidVersion >= ANDROID_SDK_VERSION.O,
-    loginId: currentUserInfo.loginID,
+    loginId: globalUserInfo.loginId,
  });
 };
 // PIP_END_REQUEST
 FermiWebSocketBridge.pipEndRequest = function (loginID) {
  fw.sendToMsg("others", "PIP_END_REQUEST", {
-    loginId: getFermiLoginId(loginID),
+    loginId: loginID,
  });
 };
@@ -46,6 +45,10 @@ FermiWebSocketBridge.hostRequestDone = function (hostID) {
 // GET_COLLABORATION_TYPE_RESPONSE
 FermiWebSocketBridge.getCollaborationTypeResponse = function (loginID) {
+  if (typeof meetingID == undefined) {
+    var meetingID = 0;
+  }
  fw.sendToMsg("others", "GET_COLLABORATION_TYPE_RESPONSE", {
    loginId: loginID,
    collaborationType: globalUserInfo.collaborationType,
@@ -65,7 +68,7 @@ FermiWebSocketBridge.captureRequest = function () {
  // todo: peacekim:: check if it's okay for loginID
  // instead of globalUserInfo.loginId
  fw.sendToMsg("others", "CAPTURE_REQUEST", {
-    name: currentUserInfo.loginID,
+    name: globalUserInfo.loginId,
  });
 };
@@ -83,6 +86,10 @@ FermiWebSocketBridge.changeCollaboration = function (
 // CHANGE_HOST_APPLY
 FermiWebSocketBridge.changeHostApply = function () {
  fw.sendToMsg("others", "CHANGE_HOST_APPLY", {
-    hostId: currentUserInfo.loginID,
+    hostId: globalUserInfo.loginId,
  });
 };
+FermiWebSocketBridge.hostUpdated = function () {
+  fw.sendToMsg("others", "HOST_UPDATED", {});
+};
--- a/public_new/js/views/collaboration/fermi-web-socket-message-handler.js
+++ b/public_new/js/views/collaboration/fermi-web-socket-message-handler.js
@@ -3,14 +3,14 @@ var FermiWebSocketMessageHandler = {};
 FermiWebSocketMessageHandler.bindWebSocketMessage = function () {
  fw.socket.on("message", async function (data) {
    if (g_isMainMan) {
+      // 自分がホストの場合
      FermiWebSocketMessageHandler.handleMessagesToHost(data);
    } else if (data.payload.loginId == globalUserInfo.loginId) {
      // 自分自身の場合
      FermiWebSocketMessageHandler.handleMessagesToSelf(data);
-    } else {
+    }
    // global messages
    FermiWebSocketMessageHandler.handleMessagesToAll(data);
-    }
  });
 };
@@ -43,7 +43,7 @@ FermiWebSocketMessageHandler.handleMessagesToSelf = function (data) {
  // 自分自身の場合
  switch (data.type) {
    case "HOST_CHANGE_REQUEST":
-      FermiWebSocketMessageHandler.hostChangeRequest();
+      FermiWebSocketMessageHandler.hostChangeRequest(data);
      break;
    case "PIP_END_REQUEST":
      if (globalUserInfo.collaborationType == COLLABORATION_TYPE.DOCUMENT) {
@@ -70,6 +70,8 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
      break;
    case "API_SEND_OWNER_CHANGE_COMPLETE":
      FermiWebSocketMessageHandler.apiSendOwnerChangeComplete(data);
+      CollaborationFeature.updateHost();
+      FermiWebSocketBridge.hostUpdated();
      break;
    case "API_SEND_OWNER_CHANGE_CONFIRM":
      if (globalUserInfo.collaborationType == COLLABORATION_TYPE.CAMERA) {
@@ -81,6 +83,7 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
      break;
    case "HOST_REQUEST_DONE":
      FermiWebSocketMessageHandler.hostRequestDone();
+      CollaborationFeature.updateHost();
      break;
    case "HOST_REQUEST_REJECT":
      FermiWebSocketMessageHandler.hostRequestReject(data);
@@ -89,6 +92,15 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
      if (globalUserInfo.joinType != COLLABORATION_JOIN_TYPE.INVITED) {
        FermiWebSocketMessageHandler.apiWelcome();
      }
+      CollaborationFeature.updateHost();
+      break;
+    case "SWITCH_VIDEO":
+      CollaborationFeature.updateHost();
+      CollaborationUI.userListSlideOut();
+      $(".profile_favorite_btn").click();
+      break;
+    case "HOST_UPDATED":
+      CollaborationFeature.updateHost();
      break;
    default:
      break;
@@ -166,8 +178,8 @@ FermiWebSocketMessageHandler.captureRequest = function (data) {
 };
 // HOST_CHANGE_REQUEST
-FermiWebSocketMessageHandler.hostChangeRequest = function () {
+FermiWebSocketMessageHandler.hostChangeRequest = function (data) {
-  FermiWebSocketBridge.hostChangeRequest();
+  FermiWebSocketBridge.hostChangeResponse(data);
 };
 // HOST_CHANGE_RESPONSE
@@ -185,7 +197,7 @@ FermiWebSocketMessageHandler.hostChangeResponse = function (data) {
  } else {
    FermiWebSocketBridge.pipEndRequest(data.payload.loginId);
    waitMillisecond(500);
-    CoviewBridge.changeHost(getFermiLoginId(data.payload.loginId));
+    CoviewBridge.changeHost(data.payload.loginId);
  }
 };
@@ -236,7 +248,7 @@ FermiWebSocketMessageHandler.changeHostApplyForHost = function (data) {
  waitMillisecond(500);
  if (confirm(getLocalizedString("norify_request_host_change", hostID))) {
-    CoviewBridge.changeHost(getFermiLoginId(hostID));
+    CoviewBridge.changeHost(hostID);
    NativeBridgeDelegate.setHostRequestFlg(HostRequestFlag.DONE);
  } else {
    FermiWebSocketBridge.hostRequestReject(hostID);
@@ -251,7 +263,7 @@ FermiWebSocketMessageHandler.hostRequestDone = function () {
 // HOST_REQUEST_REJECT
 FermiWebSocketMessageHandler.hostRequestReject = function (data) {
-  if (data.payload.hostId == currentUserInfo.loginID) {
+  if (data.payload.hostId == globalUserInfo.loginId) {
    alert("REJECT for owner user");
  }
  NativeBridgeDelegate.setHostRequestFlg(HostRequestFlag.DONE);
@@ -265,7 +277,8 @@ FermiWebSocketMessageHandler.getCollaborationType = function (data) {
 // GET_COLLABORATION_TYPE_RESPONSE
 FermiWebSocketMessageHandler.getCollaborationTypeResponse = function (data) {
  const collaborationType = data.payload.collaborationType;
-  const meetingID = data.payload.newMeetingId;
+  const meetingID = data.payload.newMeetingId ?? 0;
  FermiWebSocketMessageHandler.updateJoinChangeCollaboration(collaborationType);
  globalUserInfo.meetingID = meetingID;
  CollaborationUI.updateScreen(globalUserInfo.collaborationType);

--- a/public_new/js/views/collaboration/share-event-listener.js
+++ b/public_new/js/views/collaboration/share-event-listener.js
@@ -14,9 +14,15 @@ CoviewBridge.bindReadyEvent = function () {
 };
 CoviewBridge.bindFermiWebSocketOpenned = function () {
+  try {
    wc_api.addEventListener("open", async function (event) {
      FermiWebSocketMessageHandler.bindWebSocketMessage();
    });
+  } catch (err) {
+    setTimeout(() => {
+      CoviewBridge.bindFermiWebSocketOpenned();
+    }, 1000);
+  }
 };
 CoviewBridge.bindStartEvent = function () {
@@ -102,7 +108,6 @@ CoviewBridge.bindMessageEvent = function () {
    if (globalUserInfo.isLeaved) {
      return;
    }
-    let loginIDList = new Array();
    switch (json.api) {
      case "LoginResponse":
        CollaborationFeature.didReceiveLoginResponseMessage();
@@ -126,10 +131,11 @@ CoviewBridge.bindMessageEvent = function () {
      case "RoomMemberJoinedEvent":
      // fall through
      case "RoomMemberLeavedEvent":
+        attendingUsers = new Array();
        for (let key in g_participants) {
-          loginIDList.push(key);
+          attendingUsers.push(key);
        }
-        CollaborationUI.refreshJoinedCollaboration(loginIDList);
+        CollaborationUI.refreshJoinedCollaboration(attendingUsers);
        break;
      case "HostRequest":
        // to be called by
@@ -185,9 +191,7 @@ CollaborationFeature.didReceiveLoginResponseMessage = async function () {
    case COLLABORATION_JOIN_TYPE.INVITED:
    // fall through
    case COLLABORATION_JOIN_TYPE.ATTENDEE:
-      // TODO:: here to update host
      coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
      break;
    case COLLABORATION_JOIN_TYPE.HOST:
      let deleteRoomResult = JSON.parse(
@@ -225,9 +229,15 @@ CollaborationFeature.didReceivedJoinRoomInfoResponseMessage = function () {
  NativeBridgeDelegate.joinRoom(roomInfo.roomID, roomInfo.roomName);
 };
+CoviewBridge.changeHostFromModal = function () {
+  const userID = $("#changeHostModal").data("bs.modal")._config.collaborationid;
+  // call in agent_app.js
+  coview_api.HostChange(userID);
+};
 CoviewBridge.changeHost = function (userID) {
  // call in agent_app.js
-  changeOwnerSend(userID);
+  coview_api.HostChange(userID);
 };
 CoviewBridge.addLoginID = function (loginID) {
@@ -257,10 +267,11 @@ CollaborationFeature.updateHost = function () {
  }
  CollaborationUI.showHostMark(g_isMainManUsername);
+  $("#remoteVideoNameSpan").addClass("hide");
 };
 CollaborationUI.showHostButtons = function () {
  $(".host_contents").removeClass("none");
  if (globalUserInfo.collaborationType == COLLABORATION_TYPE.CAMERA) {
    $(".photo_select_button").removeClass("none");
@@ -272,7 +283,6 @@ CollaborationUI.showHostButtons = function () {
 };
 CollaborationUI.hideHostButtons = function () {
  $(".host_contents").addClass("none");
  if (globalUserInfo.collaborationType == COLLABORATION_TYPE.CAMERA) {
    $(".photo_select_button").addClass("none");
@@ -284,24 +294,29 @@ CollaborationUI.hideHostButtons = function () {
 };
 CollaborationUI.showHostMark = function (hostName) {
-  const currentUserLoginIDDiv = $(
+  // remove all host mark
-    "#collaboration_user_" + currentUserInfo.loginID
+  attendingUsers.forEach(function (userName) {
-  );
+    // hide other user's video area
-  const replaceHostIDDiv = $(
+    $(userName).hide();
-    "#collaboration_user_" + getReplacedLoginId(hostName)
+    // remove host mark
-  );
+    const user = "#collaboration_user_" + getReplacedLoginId(userName);
-  const replacedMainManUserID = $(
+    $(user).removeClass("host");
-    "#collaboration_user_" + getReplacedLoginId(g_isMainManUsername)
+  });
-  );
+  // show host video area
+  $(hostName).show();
+  // set host name as current user if host name is not set
  if (hostName == "") {
-    if (!currentUserLoginIDDiv.hasClass("host") && coview_api.getRoomUsers()) {
+    hostName = getReplacedLoginId(globalUserInfo.loginId);
-      currentUserLoginIDDiv.addClass("host");
-    }
-  } else {
-    if (!replaceHostIDDiv.hasClass("host")) {
-      replaceHostIDDiv.addClass("host");
  }
+  // find host named div
+  const hostUserDiv = $("#collaboration_user_" + getReplacedLoginId(hostName));
+  // add host mark
+  if (!hostUserDiv.hasClass("host")) {
+    hostUserDiv.addClass("host");
  }
 };
@@ -454,9 +469,9 @@ CollaborationUI.refreshJoinedCollaboration = function (loginIDList) {
    NativeBridgeDataSource.getUserListByLoginId(loginIDList);
  const sortedUserList = new Array();
-  loginIDList.forEach(function (userId) {
+  loginIDList.forEach(function (userID) {
    joinedUserList.forEach(function (user) {
-      if (userId == user.loginId) {
+      if (userID == user.loginId) {
        sortedUserList.push(user);
      }
    });

--- a/public_new/js/views/collaboration/share.js
+++ b/public_new/js/views/collaboration/share.js
@@ -2,6 +2,7 @@
 /* Functions                                           */
 /* --------------------------------------------------- */
 let coview_api = new CoviewApi();
+var attendingUsers = new Array();
 var isBoard = false;
 var backgroundFileName;

--- a/public_new/modal_collabo_change_host.html
+++ b/public_new/modal_collabo_change_host.html
@@ -15,7 +15,8 @@
            <span>キャンセル</span>
          </div>
        </button>
-        <button type="button" onclick="CoviewBridge.changeHost({{shopMemberId}});" class="profile_chat_btn border-0 bg_blue text_white">
+        <button type="button" onclick="CoviewBridge.changeHostFromModal();"
+          class="profile_chat_btn border-0 bg_blue text_white">
          <div class="d-flex flex-column">
            <span>引き渡し</span>
          </div>

--- a/public_new/modal_collabo_profile.html
+++ b/public_new/modal_collabo_profile.html
@@ -22,7 +22,8 @@
          <button type="button" class="border-0 bg_navy"
            onclick="CollaborationUI.removeFavoriteUserInCollaboration({{shopMemberId}})" id="favoriteButton">
            <div class="d-flex flex-column">
-              <span class="star active shopmember_{{shopMemberId}}" onclick="CHAT_UI.favoriteUserChange('{{shopMemberId}}',this)"></span>
+              <span class="star active shopmember_{{shopMemberId}}"
+                onclick="CHAT_UI.favoriteUserChange('{{shopMemberId}}',this)"></span>
              <span>お気に入り解除</span>
            </div>
          </button>
@@ -31,14 +32,16 @@
          <button type="button" class="border-0 bg_navy"
            onclick="CollaborationUI.insertFavoriteUserInCollaboration({{shopMemberId}})" id="favoriteButton">
            <div class="d-flex flex-column">
-              <span class="star disable shopmember_{{shopMemberId}}" onclick="Namecard.favoriteUserChange('{{shopMemberId}}',this)"></span>
+              <span class="star disable shopmember_{{shopMemberId}}"
+                onclick="Namecard.favoriteUserChange('{{shopMemberId}}',this)"></span>
              <span>お気に入り登録</span>
            </div>
          </button>
          {{/isFavorite}}
          {{#isHost}}
-          <button type="button" class="ch_host_btn border-0 bg_green text_white"
+          <button type="button" class="ch_host_btn border-0 bg_green text_white" data-toggle="modal"
-            onclick="FermiWebSocketBridge.requestHostChange('{{loginId}}');">
+            data-target="#changeHostModal" value="#profileModal2" data-collaborationId='{{collaborationId}}'>
+            <!-- onclick="FermiWebSocketBridge.requestHostChange('{{collaborationId}}');"> -->
            <div class="d-flex flex-column">
              <div class="img_wrap">
                <img src="icon/icon_change_host.svg" alt="ホスト変更">

--- a/public_new/template/template_close_collaboration_message.html
+++ b/public_new/template/template_close_collaboration_message.html
+<!-- TODO: peacekim not using this file-->
 <!-- 通話 -->
 <div class="collabo_area_container chat_message" data-messageid="{{messageId}}">
  <!-- 時刻 -->

--- a/public_new/template/template_open_collaboration_message.html
+++ b/public_new/template/template_open_collaboration_message.html
@@ -34,15 +34,10 @@
        <div class="collabo_btn">
          <button class="collaboation_join_button" type="button" name="button"
            class="d-flex flex-row justify-content-center align-items-center"
-            onclick="NativeBridgeDelegate.joinCollaboration('{{collaborationType}}', {{meetingId}})" {{#isEnded}} disabled
+            onclick="NativeBridgeDelegate.joinCollaboration('{{collaborationType}}', {{meetingId}})" {{#isEnded}}
-            {{/isEnded}}>
+            disabled {{/isEnded}}>
            <img src="icon/icon_profile_phone_white.svg" alt="通話">
-            {{#isEnded}}
+            <span class="collaboration_join_message">{{collaborationJoinMessage}}</span>
-            <span class="collaboration_join_message">終了しました</span>
-            {{/isEnded}}
-            {{^isEnded}}
-            <span class="collaboration_join_message">参加する</span>
-            {{/isEnded}}
          </button>
        </div>
      </div>