Merge branch 'release_sp3' of gitlab.agentec.jp:abookCommunication/chat_webview into release_sp3

public_new/js/chat-ui.js

@@ -692,7 +692,7 @@ CHAT_UI.showConfirmView = function(isInvite) {
 
                     //todo android create room api
                     if (typeof(android) != "undefined") {
-                        android.createChatRoom("1", userIdList.join(','), newRoomName, makeRoomFlg.MAKE_ROOM);
+                        android.createChatRoom("1", userIdList.join(','), newRoomName, makeRoomFlg.MAKE_ROOM, false);
                     } else {
                         webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": newRoomName, "screenFlg": makeRoomFlg.MAKE_ROOM});
                     }
@@ -786,7 +786,7 @@ CHAT_UI.showConfirmView = function(isInvite) {
                     // ルーム名のtrimmingした後、URIencodingを行う
                     const encodedRoomName = encodeURIComponent(trimmedRoomName);
                     if (typeof(android) != "undefined") {
-                        android.createChatRoom("1", userIdList.join(','), encodedRoomName, makeRoomFlg.MAKE_ROOM);
+                        android.createChatRoom("1", userIdList.join(','), encodedRoomName, makeRoomFlg.MAKE_ROOM, false);
                     } else {
                         webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": newRoomName, "screenFlg": makeRoomFlg.MAKE_ROOM});
                     }
@@ -1635,7 +1635,7 @@ CHAT_UI.startChat = function(userShopMemberId,userName) {
     // 参加ユーザ名でルーム名を生成
     let newRoomName = CHAT.globalLoginParameter.loginId + ',' +userName;
     if (typeof(android) != "undefined") {
-        android.createChatRoom(chatRoomType.DM, userIdList.join(','),newRoomName, makeRoomFlg.NAME_CARD);
+        android.createChatRoom(chatRoomType.DM, userIdList.join(','),newRoomName, makeRoomFlg.NAME_CARD, false);
     } else {
         webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": newRoomName, "screenFlg": makeRoomFlg.NAME_CARD});
     }
@@ -1649,7 +1649,7 @@ CHAT_UI.startVoice = function(userShopMemberId, userName) {
       // 参加ユーザ名でルーム名を生成
       let newRoomName = CHAT.globalLoginParameter.loginId + ',' +userName;
       if (typeof(android) != "undefined") {
-          android.createChatRoom(chatRoomType.DM, userIdList.join(','),newRoomName, makeRoomFlg.NAME_CARD);
+          android.createChatRoom(chatRoomType.DM, userIdList.join(','),newRoomName, makeRoomFlg.NAME_CARD, true);
       } else {
           webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": newRoomName, "screenFlg": makeRoomFlg.NAME_CARD});
       }
@@ -2129,7 +2129,7 @@ CHAT_UI.showMakeRoomConfirmView = function() {
              // 参加ユーザ名でルーム名を生成
              let newRoomName = CHAT.globalLoginParameter.loginId + ',' + userNameList.join(',');
              if (typeof(android) != "undefined") {
-                 android.createChatRoom("1", userIdList.join(','), newRoomName, makeRoomFlg.MAKE_ROOM);
+                 android.createChatRoom("1", userIdList.join(','), newRoomName, makeRoomFlg.MAKE_ROOM, false);
              } else {
                 webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": newRoomName, "screenFlg": makeRoomFlg.MAKE_ROOM});
              }
@@ -2176,7 +2176,7 @@ CHAT_UI.showMakeRoomConfirmView = function() {
              // ルーム名のtrimmingした後、URIencodingを行う
              const encodedRoomName = encodeURIComponent(trimmedRoomName);
              if (typeof(android) != "undefined") {
-                android.createChatRoom("1", userIdList.join(','), trimmedRoomName, makeRoomFlg.MAKE_ROOM);
+                android.createChatRoom("1", userIdList.join(','), trimmedRoomName, makeRoomFlg.MAKE_ROOM, false);
              } else {
                 webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": trimmedRoomName, "screenFlg": makeRoomFlg.MAKE_ROOM});
              }

public_new/template/template_user_name_card.html

@@ -36,7 +36,7 @@
           </div>
         </button>
         {{/isFavorite}}
-        <button type="button" class="border-0 bg_green">
+        <button type="button" class="border-0 bg_green" onclick="CHAT_UI.startVoice('{{shopMemberId}}','{{name}}');">
           <div class="d-flex flex-column">
             <div class="img_wrap">
               <img src="icon/icon_profile_phone.png" alt="通話">