Merge branch 'features/abcomm_sp6_start_voice_from_name_card' into 'features/abcomm_sp6'

[ネームカード]の[音声通話]を押下すると、該当ユーザと[音声通話]を開始する

See merge request !140

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java

@@ -907,7 +907,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
         }
         }
 
 
         @JavascriptInterface
         @JavascriptInterface
-        public void createChatRoom(String roomType, String userIdList, String encodedRoomName, String screenFlg) throws NetworkDisconnectedException, AcmsException {
+        public void createChatRoom(String roomType, String userIdList, String encodedRoomName, String screenFlg, boolean isVoice) throws NetworkDisconnectedException, AcmsException {
             CreatedRoomJSON resultJson = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).createRoom(sid, roomType, userIdList, encodedRoomName, loginId);
             CreatedRoomJSON resultJson = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).createRoom(sid, roomType, userIdList, encodedRoomName, loginId);
             if (ABookCommConstants.FLAG.SCREEN_FLG.MAKE_ROOM.equals(Integer.parseInt(screenFlg))) {
             if (ABookCommConstants.FLAG.SCREEN_FLG.MAKE_ROOM.equals(Integer.parseInt(screenFlg))) {
                 final ChatRoomDto chatRoomDto = communicationLogic.getChatRoom(resultJson.chatRoomDto.chatRoomId);
                 final ChatRoomDto chatRoomDto = communicationLogic.getChatRoom(resultJson.chatRoomDto.chatRoomId);
@@ -925,12 +925,23 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
             communicationLogic.addUserInRoom(StringUtil.join(",", userIdList, shopMemberId.toString()), resultJson.chatRoomDto.chatRoomId);
             communicationLogic.addUserInRoom(StringUtil.join(",", userIdList, shopMemberId.toString()), resultJson.chatRoomDto.chatRoomId);
             final Integer chatRoomId = resultJson.chatRoomDto.chatRoomId;
             final Integer chatRoomId = resultJson.chatRoomDto.chatRoomId;
             final String chatRoomName = resultJson.chatRoomDto.chatRoomName;
             final String chatRoomName = resultJson.chatRoomDto.chatRoomName;
-            mChatWebView.post(new Runnable() {
-                @Override
-                public void run() {
-                    mChatWebView.loadUrl(String.format("javascript:CHAT_UI.joinRoom('%s', '%s');", chatRoomId, chatRoomName));
-                }
-            });
+            if (isVoice) {
+                roomId = chatRoomId.longValue();
+                roomName = chatRoomName;
+                mChatWebView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mChatWebView.loadUrl(String.format("javascript:CHAT_UI.startCollaboration('%s');", ABookCommConstants.FLAG.COLLABORATION_TYPE.AUDIO));
+                    }
+                });
+            } else {
+                mChatWebView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mChatWebView.loadUrl(String.format("javascript:CHAT_UI.joinRoom('%s', '%s');", chatRoomId, chatRoomName));
+                    }
+                });
+            }
         }
         }
 
 
         @JavascriptInterface
         @JavascriptInterface