Merge branch 'features/#529_ルーム開設アラート' into 'release_sp3'

ルーム開設画面からルーム開設する場合既存のルームがあればアラート表示

See merge request !50

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,7 +784,7 @@ CHAT_UI.showConfirmView = function(isInvite) {
 
                     // ルーム名のtrimmingした後、URIencodingを行う
                     const encodedRoomName = encodeURIComponent(trimmedRoomName);
-                    android.createChatRoom("1",userIdList.join(','),encodedRoomName);
+                    android.createChatRoom("1", userIdList.join(','), encodedRoomName, makeRoomFlg.MAKE_ROOM);
 
                 }
             }
@@ -1530,7 +1530,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});
     }
@@ -2014,7 +2014,7 @@ CHAT_UI.showMakeRoomConfirmView = function() {
 
              // 参加ユーザ名でルーム名を生成
              let newRoomName = CHAT.globalLoginParameter.loginId + ',' + userNameList.join(',');
-             android.createChatRoom("1",userIdList.join(','),newRoomName);
+             android.createChatRoom("1", userIdList.join(','), newRoomName, makeRoomFlg.MAKE_ROOM);
 
          } else if(trimmedRoomName.includes(';') || trimmedRoomName.includes('/') || trimmedRoomName.includes('?') || trimmedRoomName.includes(':') || trimmedRoomName.includes("@")
               || trimmedRoomName.includes('&') || trimmedRoomName.includes('=') || trimmedRoomName.includes("+") || trimmedRoomName.includes('$') || trimmedRoomName.includes(",") || trimmedRoomName.includes('-')
@@ -2058,7 +2058,7 @@ CHAT_UI.showMakeRoomConfirmView = function() {
 
              // ルーム名のtrimmingした後、URIencodingを行う
              const encodedRoomName = encodeURIComponent(trimmedRoomName);
-             android.createChatRoom("1",userIdList.join(','),encodedRoomName);
+             android.createChatRoom("1", userIdList.join(','), encodedRoomName, makeRoomFlg.MAKE_ROOM);
 
          }
      });

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";