Merge branch 'release_sp3' into 'features/#525'

# Conflicts:
#   public_new/js/chat-ui.js

public_new/css/chat.css

@@ -220,8 +220,7 @@ input[name="tab_item"] {
 }
 .category_name {
   white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
+  overflow: scroll;
   width: 90%;
 }
 .chat_list .category.open::after {

public_new/js/chat-ui.js

@@ -691,7 +691,7 @@ CHAT_UI.showConfirmView = function(isInvite) {
 
                     //todo android create room api
                     if (typeof(android) != "undefined") {
-                        android.createChatRoom("1",userIdList.join(','),newRoomName);
+                        android.createChatRoom("1", userIdList.join(','), newRoomName, makeRoomFlg.MAKE_ROOM);
                     } else {
                         webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": newRoomName});
                     }
@@ -785,11 +785,11 @@ CHAT_UI.showConfirmView = function(isInvite) {
                     // ルーム名のtrimmingした後、URIencodingを行う
                     const encodedRoomName = encodeURIComponent(trimmedRoomName);
                     if (typeof(android) != "undefined") {
-                        android.createChatRoom("1",userIdList.join(','),encodedRoomName);
+                        android.createChatRoom("1", userIdList.join(','), encodedRoomName, makeRoomFlg.MAKE_ROOM);
                     } else {
+                        //TODO
                         webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": encodedRoomName});
                     }
-
                 }
             }
         }
@@ -1534,7 +1534,7 @@ CHAT_UI.startChat = function(userShopMemberId,userName) {
     // 参加ユーザ名でルーム名を生成
     let newRoomName = CHAT.globalLoginParameter.loginId + ',' +userName;
     if (typeof(android) != "undefined") {
-        android.createChatRoom(chatRoomType.DM, userIdList.join(','),newRoomName);
+        android.createChatRoom(chatRoomType.DM, userIdList.join(','),newRoomName, makeRoomFlg.NAME_CARD);
     } else {
         webkit.messageHandlers.createChatRoom.postMessage({"roomType": chatRoomType.DM, "userIdList": userIdList.join(','), "roomName": newRoomName});
     }
@@ -1547,6 +1547,9 @@ CHAT_UI.startVoice = function() {
 
 
 CHAT_UI.makeNameCard = function(shopMemberId) {
+    if (CHAT.globalLoginParameter.shopMemberId == shopMemberId) {
+        return;
+    }
     var nameCardInfo = CHAT_DB.getNameCardData(shopMemberId);
     var namecardTemplate;
     $.get({ url: "./template/template_user_name_card.html", async: false }
@@ -2016,11 +2019,11 @@ CHAT_UI.showMakeRoomConfirmView = function() {
              // 参加ユーザ名でルーム名を生成
              let newRoomName = CHAT.globalLoginParameter.loginId + ',' + userNameList.join(',');
              if (typeof(android) != "undefined") {
-                 android.createChatRoom("1",userIdList.join(','),newRoomName);
+                 android.createChatRoom("1", userIdList.join(','), newRoomName, makeRoomFlg.MAKE_ROOM);
              } else {
+                 //TODO
                  webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": newRoomName});
              }
-
          } else if(trimmedRoomName.includes(';') || trimmedRoomName.includes('/') || trimmedRoomName.includes('?') || trimmedRoomName.includes(':') || trimmedRoomName.includes("@")
               || trimmedRoomName.includes('&') || trimmedRoomName.includes('=') || trimmedRoomName.includes("+") || trimmedRoomName.includes('$') || trimmedRoomName.includes(",") || trimmedRoomName.includes('-')
               || trimmedRoomName.includes('_') || trimmedRoomName.includes('.') || trimmedRoomName.includes('!') || trimmedRoomName.includes('~') || trimmedRoomName.includes('*') || trimmedRoomName.includes("\'")
@@ -2064,11 +2067,10 @@ CHAT_UI.showMakeRoomConfirmView = function() {
              // ルーム名のtrimmingした後、URIencodingを行う
              const encodedRoomName = encodeURIComponent(trimmedRoomName);
              if (typeof(android) != "undefined") {
-                android.createChatRoom("1",userIdList.join(','),encodedRoomName);
+                android.createChatRoom("1", userIdList.join(','), encodedRoomName, makeRoomFlg.MAKE_ROOM);
              } else {
                 webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": encodedRoomName});
              }
-
          }
      });
 }
@@ -2209,6 +2211,7 @@ CHAT_UI.refreshForOnline = function() {
     $('#roomMenu').show();
     $('.attach_file').show();
     $('.fa-download').show();
+    $('.chat_room_footer').show();
     if (typeof $('#roomTitle').val() != 'undefined') {
         CHAT_SOCKET.connectSocket();
         socket.emit('join', CHAT.globalLoginParameter, function() {
@@ -2225,4 +2228,5 @@ CHAT_UI.refreshForOffline = function() {
     $('#roomMenu').hide();
     $('.attach_file').hide();
     $('.fa-download').hide();
+    $('.chat_room_footer').hide();
 }
\ No newline at end of file

public_new/js/constant.js

@@ -36,5 +36,10 @@ const nameCardAreaId = {
     USER : "userNamecard"
 }
 
+const makeRoomFlg = {
+    NAME_CARD : 0,
+    MAKE_ROOM : 1
+}
+
 const messageSeperator = "<::split>";
 const dataMessageScheme = "::NOT_MESSAGE";