Bug #44365【ABook Communication Android】文書協業接続時、動画や音声再生すると通話音声が聞こえなくなる

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -1500,4 +1500,5 @@
     <string name="msg_error_favorites_100_over">お気に入りは最大100件までです。</string>
     <string name="msg_eroor_network_offline">接続しているネットワークがありません。</string>
     <string name="msg_error_connection_error_meeting_room">会議室サーバに接続できませんでした。</string>
+    <string name="msg_fail_collaboration_not_action_allow">文書協業中には利用できない機能です。</string>
 </resources>

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -1505,4 +1505,5 @@
     <string name="msg_error_favorites_100_over">즐겨찾기는 최대 100개까지 입니다.</string>
     <string name="msg_eroor_network_offline">연결된 네트워크가 없습니다.</string>
     <string name="msg_error_connection_error_meeting_room">회의실 서버에 연결할 수 없습니다.</string>
+    <string name="msg_fail_collaboration_not_action_allow">문서협업 중에는 이용할 수 없는 기능입니다.</string>
 </resources>
\ No newline at end of file

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -1501,4 +1501,5 @@
     <string name="msg_error_favorites_100_over">You can have up to 100 favorites.</string>
     <string name="msg_eroor_network_offline">There is no network connected.</string>
     <string name="msg_error_connection_error_meeting_room">Could not connect to the meeting room server.</string>
+    <string name="msg_fail_collaboration_not_action_allow">This function cannot be used during document collaboration.</string>
 </resources>

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

@@ -2138,6 +2138,8 @@ public class ContentViewActivity extends ABVContentViewActivity {
 			ContentLogUtil.getInstance().contentPageMove(contentId, readingLogId, currentPageNumber, nextPageNumber);
 
 			if (contentsBgmFlg && !StringUtil.isNullOrEmpty(contentsBgmFilePath) && !contentBGMPlayer.isPlaying()) {
+				//文書協業接続中にはコンテンツBGM再生しない
+				if (!isCollaboration) {
 					//contentsBgmFilePath
 					contentBGMPlayer = new ABVMediaPlayer(true);
 					try {
@@ -2146,10 +2148,11 @@ public class ContentViewActivity extends ABVContentViewActivity {
 						contentBGMPlayer.prepare();
 						contentBGMPlayer.start();
 					} catch (IOException e) {
-					Logger.e(TAG, "Can't play content BGM",e);
+						Logger.e(TAG, "Can't play content BGM", e);
 						ABVToastUtil.showMakeText(getApplicationContext(), R.string.ERROR, Toast.LENGTH_SHORT);
 					}
 				}
+			}
 
 			//リモート機能
 	        if (meetingManager.isSendable()) { // TODO: later 止まったタイミングで送るように要修正
@@ -2637,7 +2640,13 @@ public class ContentViewActivity extends ABVContentViewActivity {
 	private void handleAction(ActionButton actionButton, PageObjectJSON pageObject) {
 		ActionInfoJSON actionInfoJSON = pageObject.getActionInfo();
 		int pageNumber = pageObject.getPageNumber();
-
+		//文書協業接続時、機能制限する(動作再生、音声再生)
+		if (actionInfoJSON.getActionType() == ActionInfoJSON.VIDEO_ACTION ||
+				actionInfoJSON.getActionType() == ActionInfoJSON.MUSIC_ACTION) {
+			if (checkConnectedCollaboration()) {
+				return;
+			}
+		}
 		if (meetingManager.isSendable()
 				&& actionInfoJSON.getActionType() != ActionInfoJSON.EMAIL_ACTION
 				&& actionInfoJSON.getActionType() != ActionInfoJSON.CONTENTLINK_ACTION) { // リモート送信(メール・コンテンツリンクを除く)
@@ -2866,6 +2875,8 @@ public class ContentViewActivity extends ABVContentViewActivity {
 		}
 		// BGM
 		if (contentsBgmFlg && !StringUtil.isNullOrEmpty(contentsBgmFilePath) && !contentBGMPlayer.isPlaying()) {
+			//文書協業接続中にはコンテンツBGM再生しない
+			if (!isCollaboration) {
 				//contentsBgmFilePath
 				contentBGMPlayer = new ABVMediaPlayer(true);
 				try {
@@ -2878,6 +2889,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
 					ABVToastUtil.showMakeText(getApplicationContext(), R.string.ERROR, Toast.LENGTH_SHORT);
 				}
 			}
+		}
 		playPageBGMSound(jumpPage);
 
 		//탭사운드 플레이 Bug
@@ -3177,6 +3189,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
 					imgButton.setOnClickListener(new View.OnClickListener() {
 						@Override
 						public void onClick(View view) {
+							//文書協業接続中には差し替え動作機能制限
+							if (checkConnectedCollaboration()) {
+								return;
+							}
 							if (meetingManager.isSendable()) {
 								meetingManager.sendWs(MeetingManager.CMD_ACTION, getContentId(), pageNumber, pageObjectId, null);
 							}
@@ -3291,6 +3307,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
 	}
 
 	private void videoOnClick(PageObjectJSON pageObject, int pageidx) {
+		//文書協業接続中には全画面動画制御
+		if (checkConnectedCollaboration()) {
+			return;
+		}
 		if (mPageScrollView.isZooming() == false) {
 			//リモート機能
 		    if (meetingManager.isSendable()) {
@@ -3482,6 +3502,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
 	      	clickableArea.setOnClickListener(new View.OnClickListener() {
 	            @Override
 	            public void onClick(View view) {
+					//文書協業接続時には音声アクション制限
+					if (checkConnectedCollaboration()) {
+						return;
+					}
 	            	if (meetingManager.isSendable()) {
 			        	meetingManager.sendWs(MeetingManager.CMD_ACTION, contentId, pageObject.getPageNumber(), pageObject.getActionInfo().getObjectId(), null);
 			        }
@@ -3508,6 +3532,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
 			playIcon.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View view) {
+					//文書協業接続時には音声アクション制限
+					if (checkConnectedCollaboration()) {
+						return;
+					}
 					if (meetingManager.isSendable()) {
 						meetingManager.sendWs(MeetingManager.CMD_ACTION, contentId, pageObject.getPageNumber(), pageObject.getActionInfo().getObjectId(), null);
 					}
@@ -3525,6 +3553,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
 				if (contentBGMPlayer != null) {
 					return;
 				}
+				//文書協業接続中にはコンテンツBGM再生しない
+				if (isCollaboration) {
+					return;
+				}
 				contentBGMPlayer = new ABVMediaPlayer(true);
 				try {
 					Logger.v(TAG, "[addMusic]:MediaPlayer Content BGM");
@@ -3606,6 +3638,8 @@ public class ContentViewActivity extends ABVContentViewActivity {
 				String soundFilePath = mContentDir + "/" + contentsBGMPageObject.getActionInfo().getMusicFileName();
 				if (contentsBGMPageObject.getActionInfo().getPlayType() == 1) {
 					if (contentBGMPlayer == null) {
+						//文書協業接続中にはコンテンツBGM再生しない
+						if (!isCollaboration) {
 							contentBGMPlayer = new ABVMediaPlayer(true);
 							try {
 								if (pageBgmFlg) {
@@ -3622,6 +3656,8 @@ public class ContentViewActivity extends ABVContentViewActivity {
 								Logger.e(TAG, "Can't play content BGM", e);
 								ABVToastUtil.showMakeText(getApplicationContext(), R.string.ERROR, Toast.LENGTH_SHORT);
 							}
+						}
+
 					} else {
 						return;
 					}
@@ -3702,6 +3738,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
 	}
 	
 	private void playPageBGMSound(int pageNumber) {
+		//文書協業接続中にはページBGM再生しない
+		if (isCollaboration) {
+			return;
+		}
 		String bgmFilePath = pageBGMPathList.get(pageNumber);
 
 		//프리뷰 모드일때 사운드 계속 재생
@@ -5540,5 +5580,15 @@ public class ContentViewActivity extends ABVContentViewActivity {
 		operationTaskLayout.setIconStatus(taskKey,false);
 	}
 
+	/**
+	 * 文書協業接続中の値を返して、接続中にはエラーダイアログ表示
+	 * @return YES:接続中、NO:非接続
+	 * */
+	public boolean checkConnectedCollaboration() {
+		if (isCollaboration) {
+			showSimpleAlertDialog(R.string.msg_fail_collaboration_not_action_allow);
+		}
+		return isCollaboration;
+	}
 }
 

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/action/VideoMountAction.java

@@ -345,6 +345,11 @@ public class VideoMountAction {
     }
     
     private void videoOnClick(RelativeLayout contentPageView) {
+    	//文書協業接続中、埋め込み動画制限
+		if (mActivity.checkConnectedCollaboration()) {
+			return;
+		}
+
     	if (((ZoomRelativeLayout)contentPageView).isZooming() == false) {
 			//動画の表示・再生
 			if (meetingManager.isSendable()) {