Merge branch 'communication/feature/43242' into 'communication/develop'

43242対応

See merge request !179

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -1487,6 +1487,7 @@
     <string name="msg_rejected_by_host">ホストの変更依頼は拒否されました。</string>
     <string name="msg_invalid_parameters">通信に失敗しました。チャットルームに戻ります。</string>
     <string name="msg_destroy_exist_collaboration">進行中の協業が存在します。既存協業を終了し、新しい協業を開始してもよろしいですか</string>
+    <string name="not_found_camera">利用可能なカメラを見つかりませんでした。</string>
 
     <!-- 連続作業 -->
     <string name="msg_error_all_process_delete">全削除の送信に失敗しました。</string>

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -1494,5 +1494,6 @@
     <string name="msg_wait_for_host">호스트가 문서를 선택중입니다.</string>
     <string name="msg_rejected_by_host">호스트가 요청을 거절하셨습니다.</string>
     <string name="msg_invalid_parameters">통신에 실패했습니다. 채팅룸으로 돌아갑니다.</string>
+    <string name="not_found_camera">사용 가능한 카메라 기기를 찾을수 없습니다.</string>
     <string name="msg_destroy_exist_collaboration">진행중인 협업이 존재합니다. 기존 협업을 종료하고 새로운 협업을 시작 하시겠습니까?</string>
 </resources>
\ No newline at end of file

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -1491,5 +1491,6 @@
     <string name="msg_wait_for_host">Please wait for selecting document by host</string>
     <string name="msg_rejected_by_host">Rejected host request.</string>
     <string name="msg_invalid_parameters">Communication failed. Return to the chat room.</string>
+    <string name="not_found_camera">Not found camera device.</string>
     <string name="msg_destroy_exist_collaboration">Ongoing collaboration exist. Do you want to terminate exist collaboration and start new?</string>
 </resources>

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

@@ -400,6 +400,8 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
                     message = getString(R.string.msg_rejected_by_host);
                 } else if (message.contains("Invalid Parameters")) {
                     message = getString(R.string.msg_invalid_parameters);
+                } else if (message.contains("사용 가능한 카메라 기기를 찾을수 없습니다")) {
+                    message = getString(R.string.not_found_camera);
                 }
 
                 final String tempMessage = message;
@@ -582,6 +584,9 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
                     } else {
                         isOnline = true;
                         mChatWebView.loadUrl("javascript:CHAT_UI.refreshForOnline();");
+                        if (mChatWebView.getUrl() != null && mChatWebView.getUrl().equals(CHAT_ROOM_PAGE_URL)) {
+                            mChatWebView.loadUrl("javascript:window.location.reload();");
+                        }
                     }
                 }
             }
@@ -1585,7 +1590,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
         public void startContentView() throws InterruptedException  {
             PictureInPictureParams.Builder mPipBuilder = new PictureInPictureParams.Builder();
             enterPictureInPictureMode(mPipBuilder.build());
-            startContentListActivity(false);
             meetingManager.close();
             try {
                 connectMeetingServer();
@@ -1595,13 +1599,13 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
             } catch (Exception e) {
                 mChatWebView.loadUrl("javascript:alert('" + "会議室サーバに接続できませんでした。" + "');");
             }
+            startContentListActivity(false);
         }
 
         @JavascriptInterface
         public void joinMeetingRoom(int newMeetingId) throws InterruptedException {
             PictureInPictureParams.Builder mPipBuilder = new PictureInPictureParams.Builder();
             enterPictureInPictureMode(mPipBuilder.build());
-            startContentListActivity(false);
             meetingManager.close();
             try {
                 connectMeetingServer();
@@ -1611,6 +1615,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
             } catch (Exception e) {
                 mChatWebView.loadUrl("javascript:alert('" + "会議室サーバに接続できませんでした。" + "');");
             }
+            startContentListActivity(false);
         }
 
         @JavascriptInterface