Skip to content

A
abook_check
Commit e3de199f by Kim Jinsung
Options

Merge branch 'communication/develop_44365' into 'communication/develop' 

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

See merge request !222
parents 81bcfb97 da86f3ab
Showing with 94 additions and 35 deletions
ABVJE_Res_Default_Android/res/values-ja/strings.xml
...@@ -1500,4 +1500,5 @@ ...@@ -1500,4 +1500,5 @@
<string name="msg_error_favorites_100_over">お気に入りは最大100件までです。</string> <string name="msg_error_favorites_100_over">お気に入りは最大100件までです。</string>
<string name="msg_eroor_network_offline">接続しているネットワークがありません。</string> <string name="msg_eroor_network_offline">接続しているネットワークがありません。</string>
<string name="msg_error_connection_error_meeting_room">会議室サーバに接続できませんでした。</string> <string name="msg_error_connection_error_meeting_room">会議室サーバに接続できませんでした。</string>
<string name="msg_fail_collaboration_not_action_allow">文書協業中には利用できない機能です。</string>
</resources> </resources>
ABVJE_Res_Default_Android/res/values-ko/strings.xml
...@@ -1505,4 +1505,5 @@ ...@@ -1505,4 +1505,5 @@
<string name="msg_error_favorites_100_over">즐겨찾기는 최대 100개까지 입니다.</string> <string name="msg_error_favorites_100_over">즐겨찾기는 최대 100개까지 입니다.</string>
<string name="msg_eroor_network_offline">연결된 네트워크가 없습니다.</string> <string name="msg_eroor_network_offline">연결된 네트워크가 없습니다.</string>
<string name="msg_error_connection_error_meeting_room">회의실 서버에 연결할 수 없습니다.</string> <string name="msg_error_connection_error_meeting_room">회의실 서버에 연결할 수 없습니다.</string>
<string name="msg_fail_collaboration_not_action_allow">문서협업 중에는 이용할 수 없는 기능입니다.</string>
</resources> </resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/strings.xml
...@@ -1501,4 +1501,5 @@ ...@@ -1501,4 +1501,5 @@
<string name="msg_error_favorites_100_over">You can have up to 100 favorites.</string> <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_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_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> </resources>
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
...@@ -2139,16 +2139,19 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -2139,16 +2139,19 @@ public class ContentViewActivity extends ABVContentViewActivity {
ContentLogUtil.getInstance().contentPageMove(contentId, readingLogId, currentPageNumber, nextPageNumber); ContentLogUtil.getInstance().contentPageMove(contentId, readingLogId, currentPageNumber, nextPageNumber);
if (contentsBgmFlg && !StringUtil.isNullOrEmpty(contentsBgmFilePath) && !contentBGMPlayer.isPlaying()) { if (contentsBgmFlg && !StringUtil.isNullOrEmpty(contentsBgmFilePath) && !contentBGMPlayer.isPlaying()) {
//contentsBgmFilePath //文書協業接続中にはコンテンツBGM再生しない
contentBGMPlayer = new ABVMediaPlayer(true); if (!isCollaboration) {
try { //contentsBgmFilePath
Logger.v(TAG, "[addMusic]:MediaPlayer Content BGM"); contentBGMPlayer = new ABVMediaPlayer(true);
contentBGMPlayer.setDataSource(contentsBgmFilePath); try {
contentBGMPlayer.prepare(); Logger.v(TAG, "[addMusic]:MediaPlayer Content BGM");
contentBGMPlayer.start(); contentBGMPlayer.setDataSource(contentsBgmFilePath);
} catch (IOException e) { contentBGMPlayer.prepare();
Logger.e(TAG, "Can't play content BGM",e); contentBGMPlayer.start();
ABVToastUtil.showMakeText(getApplicationContext(), R.string.ERROR, Toast.LENGTH_SHORT); } catch (IOException e) {
Logger.e(TAG, "Can't play content BGM", e);
ABVToastUtil.showMakeText(getApplicationContext(), R.string.ERROR, Toast.LENGTH_SHORT);
}
} }
} }
...@@ -2638,7 +2641,13 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -2638,7 +2641,13 @@ public class ContentViewActivity extends ABVContentViewActivity {
private void handleAction(ActionButton actionButton, PageObjectJSON pageObject) { private void handleAction(ActionButton actionButton, PageObjectJSON pageObject) {
ActionInfoJSON actionInfoJSON = pageObject.getActionInfo(); ActionInfoJSON actionInfoJSON = pageObject.getActionInfo();
int pageNumber = pageObject.getPageNumber(); int pageNumber = pageObject.getPageNumber();
//文書協業接続時、機能制限する(動作再生、音声再生)
if (actionInfoJSON.getActionType() == ActionInfoJSON.VIDEO_ACTION ||
actionInfoJSON.getActionType() == ActionInfoJSON.MUSIC_ACTION) {
if (isCollaborationConnected()) {
return;
}
}
if (meetingManager.isSendable() if (meetingManager.isSendable()
&& actionInfoJSON.getActionType() != ActionInfoJSON.EMAIL_ACTION && actionInfoJSON.getActionType() != ActionInfoJSON.EMAIL_ACTION
&& actionInfoJSON.getActionType() != ActionInfoJSON.CONTENTLINK_ACTION) { // リモート送信(メール・コンテンツリンクを除く) && actionInfoJSON.getActionType() != ActionInfoJSON.CONTENTLINK_ACTION) { // リモート送信(メール・コンテンツリンクを除く)
...@@ -2867,16 +2876,19 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -2867,16 +2876,19 @@ public class ContentViewActivity extends ABVContentViewActivity {
} }
// BGM // BGM
if (contentsBgmFlg && !StringUtil.isNullOrEmpty(contentsBgmFilePath) && !contentBGMPlayer.isPlaying()) { if (contentsBgmFlg && !StringUtil.isNullOrEmpty(contentsBgmFilePath) && !contentBGMPlayer.isPlaying()) {
//contentsBgmFilePath //文書協業接続中にはコンテンツBGM再生しない
contentBGMPlayer = new ABVMediaPlayer(true); if (!isCollaboration) {
try { //contentsBgmFilePath
Logger.v(TAG, "[addMusic]:MediaPlayer Content BGM"); contentBGMPlayer = new ABVMediaPlayer(true);
contentBGMPlayer.setDataSource(contentsBgmFilePath); try {
contentBGMPlayer.prepare(); Logger.v(TAG, "[addMusic]:MediaPlayer Content BGM");
contentBGMPlayer.start(); contentBGMPlayer.setDataSource(contentsBgmFilePath);
} catch (IOException e) { contentBGMPlayer.prepare();
Logger.e(TAG, "Can't play content BGM", e); contentBGMPlayer.start();
ABVToastUtil.showMakeText(getApplicationContext(), R.string.ERROR, Toast.LENGTH_SHORT); } catch (IOException e) {
Logger.e(TAG, "Can't play content BGM", e);
ABVToastUtil.showMakeText(getApplicationContext(), R.string.ERROR, Toast.LENGTH_SHORT);
}
} }
} }
playPageBGMSound(jumpPage); playPageBGMSound(jumpPage);
...@@ -3178,6 +3190,10 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -3178,6 +3190,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
imgButton.setOnClickListener(new View.OnClickListener() { imgButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
//文書協業接続中には差し替え動作機能制限
if (isCollaborationConnected()) {
return;
}
if (meetingManager.isSendable()) { if (meetingManager.isSendable()) {
meetingManager.sendWs(MeetingManager.CMD_ACTION, getContentId(), pageNumber, pageObjectId, null); meetingManager.sendWs(MeetingManager.CMD_ACTION, getContentId(), pageNumber, pageObjectId, null);
} }
...@@ -3292,6 +3308,10 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -3292,6 +3308,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
} }
private void videoOnClick(PageObjectJSON pageObject, int pageidx) { private void videoOnClick(PageObjectJSON pageObject, int pageidx) {
//文書協業接続中には全画面動画制御
if (isCollaborationConnected()) {
return;
}
if (mPageScrollView.isZooming() == false) { if (mPageScrollView.isZooming() == false) {
//リモート機能 //リモート機能
if (meetingManager.isSendable()) { if (meetingManager.isSendable()) {
...@@ -3483,7 +3503,11 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -3483,7 +3503,11 @@ public class ContentViewActivity extends ABVContentViewActivity {
clickableArea.setOnClickListener(new View.OnClickListener() { clickableArea.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (meetingManager.isSendable()) { //文書協業接続時には音声アクション制限
if (isCollaborationConnected()) {
return;
}
if (meetingManager.isSendable()) {
meetingManager.sendWs(MeetingManager.CMD_ACTION, contentId, pageObject.getPageNumber(), pageObject.getActionInfo().getObjectId(), null); meetingManager.sendWs(MeetingManager.CMD_ACTION, contentId, pageObject.getPageNumber(), pageObject.getActionInfo().getObjectId(), null);
} }
playTapSound(soundFilePath, pageObject); playTapSound(soundFilePath, pageObject);
...@@ -3509,6 +3533,10 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -3509,6 +3533,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
playIcon.setOnClickListener(new View.OnClickListener() { playIcon.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
//文書協業接続時には音声アクション制限
if (isCollaborationConnected()) {
return;
}
if (meetingManager.isSendable()) { if (meetingManager.isSendable()) {
meetingManager.sendWs(MeetingManager.CMD_ACTION, contentId, pageObject.getPageNumber(), pageObject.getActionInfo().getObjectId(), null); meetingManager.sendWs(MeetingManager.CMD_ACTION, contentId, pageObject.getPageNumber(), pageObject.getActionInfo().getObjectId(), null);
} }
...@@ -3526,6 +3554,10 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -3526,6 +3554,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
if (contentBGMPlayer != null) { if (contentBGMPlayer != null) {
return; return;
} }
//文書協業接続中にはコンテンツBGM再生しない
if (isCollaboration) {
return;
}
contentBGMPlayer = new ABVMediaPlayer(true); contentBGMPlayer = new ABVMediaPlayer(true);
try { try {
Logger.v(TAG, "[addMusic]:MediaPlayer Content BGM"); Logger.v(TAG, "[addMusic]:MediaPlayer Content BGM");
...@@ -3607,22 +3639,26 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -3607,22 +3639,26 @@ public class ContentViewActivity extends ABVContentViewActivity {
String soundFilePath = mContentDir + "/" + contentsBGMPageObject.getActionInfo().getMusicFileName(); String soundFilePath = mContentDir + "/" + contentsBGMPageObject.getActionInfo().getMusicFileName();
if (contentsBGMPageObject.getActionInfo().getPlayType() == 1) { if (contentsBGMPageObject.getActionInfo().getPlayType() == 1) {
if (contentBGMPlayer == null) { if (contentBGMPlayer == null) {
contentBGMPlayer = new ABVMediaPlayer(true); //文書協業接続中にはコンテンツBGM再生しない
try { if (!isCollaboration) {
if (pageBgmFlg) { contentBGMPlayer = new ABVMediaPlayer(true);
contentsBgmFlg = true; try {
contentsBgmFilePath = soundFilePath; if (pageBgmFlg) {
contentsBgmFlg = true;
contentsBgmFilePath = soundFilePath;
return;
}
Logger.d(TAG, "[addMusic]:MediaPlayer Content BGM");
contentBGMPlayer.setDataSource(soundFilePath);
contentBGMPlayer.prepare();
contentBGMPlayer.start();
return; return;
} catch (IOException e) {
Logger.e(TAG, "Can't play content BGM", e);
ABVToastUtil.showMakeText(getApplicationContext(), R.string.ERROR, Toast.LENGTH_SHORT);
} }
Logger.d(TAG, "[addMusic]:MediaPlayer Content BGM");
contentBGMPlayer.setDataSource(soundFilePath);
contentBGMPlayer.prepare();
contentBGMPlayer.start();
return;
} catch (IOException e) {
Logger.e(TAG, "Can't play content BGM", e);
ABVToastUtil.showMakeText(getApplicationContext(), R.string.ERROR, Toast.LENGTH_SHORT);
} }
} else { } else {
return; return;
} }
...@@ -3703,6 +3739,10 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -3703,6 +3739,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
} }
private void playPageBGMSound(int pageNumber) { private void playPageBGMSound(int pageNumber) {
//文書協業接続中にはページBGM再生しない
if (isCollaboration) {
return;
}
String bgmFilePath = pageBGMPathList.get(pageNumber); String bgmFilePath = pageBGMPathList.get(pageNumber);
//프리뷰 모드일때 사운드 계속 재생 //프리뷰 모드일때 사운드 계속 재생
...@@ -5554,5 +5594,15 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -5554,5 +5594,15 @@ public class ContentViewActivity extends ABVContentViewActivity {
operationTaskLayout.setIconStatus(taskKey,false); operationTaskLayout.setIconStatus(taskKey,false);
} }
/**
* 文書協業接続中の値を返して、接続中にはエラーダイアログ表示
* @return YES:接続中、NO:非接続
* */
public boolean isCollaborationConnected() {
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 { ...@@ -345,6 +345,11 @@ public class VideoMountAction {
} }
private void videoOnClick(RelativeLayout contentPageView) { private void videoOnClick(RelativeLayout contentPageView) {
//文書協業接続中、埋め込み動画制限
if (mActivity.isCollaborationConnected()) {
return;
}
if (((ZoomRelativeLayout)contentPageView).isZooming() == false) { if (((ZoomRelativeLayout)contentPageView).isZooming() == false) {
//動画の表示・再生 //動画の表示・再生
if (meetingManager.isSendable()) { if (meetingManager.isSendable()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment