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

文書協業不具合対応。

See merge request !175

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -494,7 +494,7 @@
     <string name="ReportReply">報告(回答)</string>
     <string name="content_link_update">資料名「%1$s」は更新状態となります。\n更新しますか？</string>
     <string name="msg_non_target_meeting_content">遠隔支援中には対象外の資料なので、開けません。</string>
-
+    <string name="msg_non_target_collaboration_content">協業中は閲覧できない資料です。</string>
     <string name="msg_help_operation_list_list_view">リスト表示に変更できます。</string>
     <string name="msg_help_operation_list_panel_view">パネル表示に変更できます。</string>
     <string name="msg_help_operation_list_filter">表示する作業の種類を選択できます。</string>

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -497,7 +497,7 @@
     <string name="ReportReply">보고(응답)</string>
     <string name="content_link_update">자료명[%1$s]는 업데이트 가능한 상태입니다.\n업데이트 하시겠습니까?</string>
     <string name="msg_non_target_meeting_content">원격 지원 접속 중에는 열람할 수 없는 자료입니다.</string>
-
+    <string name="msg_non_target_collaboration_content">협업중에는 열람할 수 없는 자료입니다.</string>
     <string name="msg_help_operation_list_list_view">리스트 표시로 변경 가능합니다.</string>
     <string name="msg_help_operation_list_panel_view">패널 표시로 변경 가능합니다.</string>
     <string name="msg_help_operation_list_filter">표시할 작업의 종류를 선택 가능합니다.</string>

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -501,7 +501,7 @@
     <string name="ReportReply">ReportReply</string>
     <string name="content_link_update">The document name [%1$s] will be updated. \nDo you want to update it?</string>
     <string name="msg_non_target_meeting_content">It is the document that can not be read during distance support connection.</string>
-
+    <string name="msg_non_target_collaboration_content">It is the document that can not be read during collaboration.</string>
     <string name="msg_help_operation_list_list_view">You can change to list display.</string>
     <string name="msg_help_operation_list_panel_view">You can change to panel display.</string>
     <string name="msg_help_operation_list_filter">You can select the type of work to be displayed.</string>

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java

@@ -572,7 +572,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 			return;
 		}
         textView.setVisibility(View.GONE);
-		if (isVisible) {
+		if (isVisible && !isCollaboration) {
 			if (meetingManager.isConnected() && meetingManager.isOwner()) {
 		        textView.setVisibility(View.VISIBLE);
 		        CommonExecutor.execute(new Runnable() {

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

@@ -61,6 +61,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Stack;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import jp.agentec.abook.abv.bl.acms.client.AcmsClient;
 import jp.agentec.abook.abv.bl.acms.client.json.ArchiveDetailJSON;
@@ -147,6 +149,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
     private String mSkey;
     private Integer joinMeetingId;
     private boolean isPIP;
+    private boolean isStop;
     private String encodedFilePath;
     private Uri encodedVideoPath;
 
@@ -455,7 +458,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
                 } else if (message.equals("캡쳐한 사진을 공유 하시겠습니까?")) {
                     message = getString(R.string.msg_confirm_share_image);
                 }
-                ABookAlertDialog confirmAlert = AlertDialogUtil.createAlertDialog(ChatWebViewActivity.this, R.string.app_name);
+                final ABookAlertDialog confirmAlert = AlertDialogUtil.createAlertDialog(ChatWebViewActivity.this, R.string.app_name);
                 confirmAlert.setMessage(message);
 
                 if (message.equals(getString(R.string.msg_error_already_exist_same_room))) {
@@ -1819,6 +1822,13 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
         if (isInPictureInPictureMode) {
             mChatWebView.loadUrl("javascript:$('.pip_indicator').removeClass('none');");
         } else {
+            if (isStop) {
+                exitAndDeleteMeetingRoom();
+                Intent intent = new Intent();
+                intent.setClass(getApplicationContext(), OperationListActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                startActivity(intent, NaviConsts.Left);
+            }
             mChatWebView.loadUrl("javascript:$('.pip_indicator').addClass('none');");
             if (!meetingManager.isConnected()) {
                 mChatWebView.loadUrl("javascript:$('.start_pip_btn').addClass('none');");
@@ -1826,6 +1836,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
         }
     }
 
+
     // 共通資料画面表示
     private void showCommonContent() {
         Intent intent = new Intent();
@@ -1886,13 +1897,20 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
 
     @Override
     protected void onResume() {
+        isStop = false;
         super.onResume();
         if (mChatWebView.getUrl() != null && mChatWebView.getUrl().equals(CHAT_ROOM_PAGE_URL)) {
-            mChatWebView.loadUrl("javascript:window.location.reload();");
+            mChatWebView.loadUrl("javascript:CHAT_SOCKET.socketCheck();");
         }
     }
 
     @Override
+    protected void onStop() {
+        isStop = true;
+        super.onStop();
+    }
+
+    @Override
     public void onDestroy(){
         exitAndDeleteMeetingRoom();
         super.onDestroy();

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

@@ -310,7 +310,7 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
             public void run() {
                 final ABookAlertDialog nonTargetMeetingContentDialog = AlertDialogUtil.createAlertDialog(OperationRelatedContentActivity.this, R.string.app_name);
                 nonTargetMeetingContentDialog.setCancelable(false);
-                nonTargetMeetingContentDialog.setMessage(R.string.msg_non_target_meeting_content);
+                nonTargetMeetingContentDialog.setMessage(isCollaboration? R.string.msg_non_target_meeting_content : R.string.msg_non_target_meeting_content);
                 nonTargetMeetingContentDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int whichButton) {

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java

@@ -886,8 +886,12 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
             final String cmd = json.getString(MeetingManager.CMD);
             final long contentId = JsonUtil.getLong(json, MeetingManager.CONTENTID);
             final int pageNumber = JsonUtil.getInt(json, MeetingManager.PAGE_NUMBER);
-
-            if (cmd.equals(MeetingManager.CMD_MEETINGINFO)) { // 入室結果
+            boolean isCollaboration = false;
+            ChatWebViewActivity chatWebViewActivity = getActivity(ChatWebViewActivity.class);
+            if (chatWebViewActivity != null && chatWebViewActivity.isInPictureInPictureMode()) {
+                isCollaboration = true;
+            }
+            if (cmd.equals(MeetingManager.CMD_MEETINGINFO) && !isCollaboration) { // 入室結果
                 showToast(mContext.getString(meetingManager.isOwner() ? R.string.msg_enter_as_publisher : R.string.msg_enter_as_subscriber));
                 return;
             }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java

@@ -710,6 +710,11 @@ public class ContentViewActivity extends ABVContentViewActivity {
 				setToolbarVisableForTask(true);
 			}
         }
+
+        if (isCollaboration) {
+			mPageNumberLayout.setVisibility(View.GONE);
+			mSeekBarLayout.setVisibility(View.GONE);
+		}
 	}
 
 	private void configureSize() {
@@ -949,6 +954,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
 		});
 
 		if (isCollaboration) {
+			titleTxt.setVisibility(View.GONE);
 			pauseBtn.setVisibility(View.GONE);
 			exitMeetingBtn.setVisibility(View.GONE);
 			exitBtn.setVisibility(View.GONE);
@@ -1411,6 +1417,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
 			marking.setVisibility(View.GONE);
 			bookmark.setVisibility(View.GONE);
 			subMenuBtn.setVisibility(View.GONE);
+			tvContentTitle.setVisibility(View.GONE);
 		}
 	}
 
@@ -1780,6 +1787,12 @@ public class ContentViewActivity extends ABVContentViewActivity {
 				// ページ番号を表示する
 				setCurrentPageNumber();
 			}
+
+			if (isCollaboration) {
+				mPageNumberLayout.setVisibility(View.GONE);
+				mSeekBarLayout.setVisibility(View.GONE);
+				bookmark.setVisibility(View.GONE);
+			}
 		}
 		else {
 			if (hasMultiPages) {
@@ -1882,7 +1895,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
 			}
 		} else {
 			TranslateAnimation toolBarAnimation;
-			if (mToolBar.getVisibility() == View.GONE) {
+			if (mToolBar.getVisibility() == View.GONE && !(meetingManager.isSubscribed() && isCollaboration)) {
 				setToolbarVisable(true);
 				toolBarAnimation = new TranslateAnimation(0, 0, -mToolBar.getHeight(), 0);
 				Logger.d(TAG, "[singleTapMotion]:[mToolBar]:VISIBLE");