Merge branch 'release_sp3' into 'features/#531_チャットルームキーボード表示'

# Conflicts:
#   public_new/js/chat.js

public_new/archive_detail.html

@@ -198,6 +198,8 @@
       android.getLoginParameter();
       android.getGlobalParameter();
     } else {
+      webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
+      webkit.messageHandlers.getGlobalParameter.postMessage({});
     }
 
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {

public_new/chat_add_user.html

@@ -154,8 +154,14 @@
     let PLATFORM = '';
     let IS_MOBILE = true;
     let IS_ONLINE = false;
-    android.getLoginParameter();
-    android.getGlobalParameter();
+
+    if (typeof(android) != "undefined") {
+      android.getLoginParameter();
+      android.getGlobalParameter();
+    } else {
+      webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
+      webkit.messageHandlers.getGlobalParameter.postMessage({});
+    }
 
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
       CHAT_SERVER_URL = chatServerUrl;

public_new/chat_add_user_confirm.html

@@ -85,8 +85,13 @@
     let PLATFORM = '';
     let IS_MOBILE = true;
     let IS_ONLINE = false;
-    android.getLoginParameter();
-    android.getGlobalParameter();
+    if (typeof(android) != "undefined") {
+      android.getLoginParameter();
+      android.getGlobalParameter();
+    } else {
+      webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
+      webkit.messageHandlers.getGlobalParameter.postMessage({});
+    }
 
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
       CHAT_SERVER_URL = chatServerUrl;

public_new/chat_change_room_name.html

@@ -86,8 +86,13 @@
     let IS_ONLINE = false;
     let roomId = 0;
     $("#loadingArea").load("./loading.html");
-    android.getLoginParameter();
-    android.getGlobalParameter();
+    if (typeof(android) != "undefined") {
+      android.getLoginParameter();
+      android.getGlobalParameter();
+    } else {
+      webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
+      webkit.messageHandlers.getGlobalParameter.postMessage({});
+    }
 
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
       CHAT_SERVER_URL = chatServerUrl;

public_new/chat_make_room_confirm.html

@@ -91,8 +91,14 @@
     let PLATFORM = '';
     let IS_MOBILE = true;
     let IS_ONLINE = false;
-    android.getLoginParameter();
-    android.getGlobalParameter();
+    
+    if (typeof(android) != "undefined") {
+      android.getLoginParameter();
+      android.getGlobalParameter();
+    } else {
+      webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
+      webkit.messageHandlers.getGlobalParameter.postMessage({});
+    }
 
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
       CHAT_SERVER_URL = chatServerUrl;

public_new/contact.html

@@ -204,6 +204,7 @@
     let IS_MOBILE = true;
     let IS_ONLINE = false;
     $("#loadingArea").load("./loading.html");
+    
     if (typeof(android) != "undefined") {
       android.getLoginParameter();
       android.getGlobalParameter();

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});
                     }
@@ -784,8 +784,12 @@ CHAT_UI.showConfirmView = function(isInvite) {
 
                     // ルーム名のtrimmingした後、URIencodingを行う
                     const encodedRoomName = encodeURIComponent(trimmedRoomName);
-                    android.createChatRoom("1",userIdList.join(','),encodedRoomName);
-
+                    if (typeof(android) != "undefined") {
+                        android.createChatRoom("1", userIdList.join(','), encodedRoomName, makeRoomFlg.MAKE_ROOM);
+                    } else {
+                        //TODO
+                        webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": encodedRoomName});
+                    }
                 }
             }
         }
@@ -1140,7 +1144,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
         if (typeof(android) != "undefined") {
             android.updateMessages(roomId);
         } else {
-            webkit.messageHandlers.updateMessages.postMessage({roomId});
+            webkit.messageHandlers.updateMessages.postMessage(roomId);
         }
     } else {
         CHAT_UI.refreshForOffline();
@@ -1317,7 +1321,7 @@ $('#makeRoomConfirmBtn').on('click', function(e) {
         android.saveSelectedUserList(CHAT.globalSelectedUserList.join(","));
     } else {
         var userList = CHAT.globalSelectedUserList.join(",");
-        webkit.messageHandlers.saveSelectedUserList.postMessage({userList});
+        webkit.messageHandlers.saveSelectedUserList.postMessage(userList);
     }
     $('#makeRoomForm').submit();
 });
@@ -1327,7 +1331,7 @@ $('#addUserConfirmBtn').on('click', function(e) {
         android.saveSelectedUserList(CHAT.globalSelectedUserList.join(","));
     } else {
         var userList = CHAT.globalSelectedUserList.join(",");
-        webkit.messageHandlers.saveSelectedUserList.postMessage({userList});
+        webkit.messageHandlers.saveSelectedUserList.postMessage(userList);
     }
     $('#addUserForm').submit();
 });
@@ -1530,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});
     }
@@ -1543,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 }
@@ -2011,8 +2018,12 @@ CHAT_UI.showMakeRoomConfirmView = function() {
 
              // 参加ユーザ名でルーム名を生成
              let newRoomName = CHAT.globalLoginParameter.loginId + ',' + userNameList.join(',');
-             android.createChatRoom("1",userIdList.join(','),newRoomName);
-
+             if (typeof(android) != "undefined") {
+                 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("\'")
@@ -2055,8 +2066,11 @@ CHAT_UI.showMakeRoomConfirmView = function() {
 
              // ルーム名のtrimmingした後、URIencodingを行う
              const encodedRoomName = encodeURIComponent(trimmedRoomName);
-             android.createChatRoom("1",userIdList.join(','),encodedRoomName);
-
+             if (typeof(android) != "undefined") {
+                android.createChatRoom("1", userIdList.join(','), encodedRoomName, makeRoomFlg.MAKE_ROOM);
+             } else {
+                webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": encodedRoomName});
+             }
          }
      });
 }
@@ -2197,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() {
@@ -2213,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";