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

キャプチャー機能実装

See merge request !153

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -1480,6 +1480,7 @@
     <string name="msg_error_chat_room_sc_forbidden">認証に失敗しました。再度ログインが必要です。</string>
     <string name="msg_error_chat_room_sc_forbidden">認証に失敗しました。再度ログインが必要です。</string>
     <string name="msg_error_already_exist_same_room">同じルームが既に存在します。</string>
     <string name="msg_error_already_exist_same_room">同じルームが既に存在します。</string>
     <string name="msg_confirm_send_host_change">ホスト権限を渡しますか？</string>
     <string name="msg_confirm_send_host_change">ホスト権限を渡しますか？</string>
+    <string name="msg_confirm_share_image">キャプチャーした写真を共有しますか？</string>
     <string name="msg_invite_collaboration">協業に招待されました。</string>
     <string name="msg_invite_collaboration">協業に招待されました。</string>
     <!-- 連続作業 -->
     <!-- 連続作業 -->
     <string name="msg_error_all_process_delete">全削除の送信に失敗しました。</string>
     <string name="msg_error_all_process_delete">全削除の送信に失敗しました。</string>

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -1487,5 +1487,6 @@
     <string name="msg_error_all_process_delete">모두 삭제 송신에 실패하였습니다.</string>
     <string name="msg_error_all_process_delete">모두 삭제 송신에 실패하였습니다.</string>
     <string name="msg_error_already_exist_same_room">동일한 채팅방이 이미 존재합니다.</string>
     <string name="msg_error_already_exist_same_room">동일한 채팅방이 이미 존재합니다.</string>
     <string name="msg_confirm_send_host_change">방장 권한을 전달 받으시겠습니까?</string>
     <string name="msg_confirm_send_host_change">방장 권한을 전달 받으시겠습니까?</string>
+    <string name="msg_confirm_share_image">캡쳐한 사진을 공유 하시겠습니까?</string>
     <string name="msg_invite_collaboration">협업에 초대되셨습니다.</string>
     <string name="msg_invite_collaboration">협업에 초대되셨습니다.</string>
 </resources>
 </resources>
\ No newline at end of file

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -1484,5 +1484,6 @@
     <string name="msg_error_all_process_delete">Failed to send all deletes.</string>
     <string name="msg_error_all_process_delete">Failed to send all deletes.</string>
     <string name="msg_error_already_exist_same_room">Already exist same room.</string>
     <string name="msg_error_already_exist_same_room">Already exist same room.</string>
     <string name="msg_confirm_send_host_change">Do you want to receive host permissions?</string>
     <string name="msg_confirm_send_host_change">Do you want to receive host permissions?</string>
+    <string name="msg_confirm_share_image">Do you want to share captured image?</string>
     <string name="msg_invite_collaboration">You are invited to collaboration.</string>
     <string name="msg_invite_collaboration">You are invited to collaboration.</string>
 </resources>
 </resources>

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

@@ -424,6 +424,8 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
                     message = getString(R.string.msg_error_already_exist_same_room);
                     message = getString(R.string.msg_error_already_exist_same_room);
                 } else if (message.equals("방장 권한을 전달 받으시겠습니까?")){
                 } else if (message.equals("방장 권한을 전달 받으시겠습니까?")){
                     message = getString(R.string.msg_confirm_send_host_change);
                     message = getString(R.string.msg_confirm_send_host_change);
+                } else if (message.equals("캡쳐한 사진을 공유 하시겠습니까?")) {
+                    message = getString(R.string.msg_confirm_share_image);
                 }
                 }
                 ABookAlertDialog confirmAlert = AlertDialogUtil.createAlertDialog(ChatWebViewActivity.this, R.string.app_name);
                 ABookAlertDialog confirmAlert = AlertDialogUtil.createAlertDialog(ChatWebViewActivity.this, R.string.app_name);
                 confirmAlert.setMessage(message);
                 confirmAlert.setMessage(message);
@@ -1481,8 +1483,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
         @JavascriptInterface
         @JavascriptInterface
         public void changeCollaboration(int changeCollaborationType, int meetingId) throws NetworkDisconnectedException, AcmsException {
         public void changeCollaboration(int changeCollaborationType, int meetingId) throws NetworkDisconnectedException, AcmsException {
             AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).changeCollaboration(sid, roomId.intValue(), changeCollaborationType, meetingId);
             AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).changeCollaboration(sid, roomId.intValue(), changeCollaborationType, meetingId);
-            int test =1 ;
-            test = test +1 ;
         }
         }
     }
     }
 
 
@@ -1688,6 +1688,9 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
             mChatWebView.loadUrl("javascript:$('.pip_indicator').removeClass('none');");
             mChatWebView.loadUrl("javascript:$('.pip_indicator').removeClass('none');");
         } else {
         } else {
             mChatWebView.loadUrl("javascript:$('.pip_indicator').addClass('none');");
             mChatWebView.loadUrl("javascript:$('.pip_indicator').addClass('none');");
+            if (!meetingManager.isConnected()) {
+                mChatWebView.loadUrl("javascript:$('.start_pip_btn').addClass('none');");
+            }
         }
         }
     }
     }