Skip to content

A
abook_check
Commit 907fb6b4 by Lee Jaebin
Options

パノラマ、パノラマ動画の場合、ヒストリ移動レイアウトの非表示

parent f4c56812
Showing with 17 additions and 12 deletions
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
...@@ -413,10 +413,9 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -413,10 +413,9 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
historyListBtn.setVisibility(View.GONE); historyListBtn.setVisibility(View.GONE);
if (isLinkedContent) { if (isLinkedContent) {
ContentDto contentDto = AbstractDao.getDao(ContentDao.class).getContent(contentId); if (ContentJSON.KEY_MOVIE_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_MUSIC_TYPE.equals(mContentDto.contentType)
if (ContentJSON.KEY_MOVIE_TYPE.equals(contentDto.contentType) || ContentJSON.KEY_MUSIC_TYPE.equals(contentDto.contentType) || ContentJSON.KEY_PANO_IMAGE_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_PANO_MOVIE_TYPE.equals(mContentDto.contentType)
|| ContentJSON.KEY_PANO_IMAGE_TYPE.equals(contentDto.contentType) || ContentJSON.KEY_PANO_MOVIE_TYPE.equals(contentDto.contentType) || ContentJSON.KEY_OBJECTVR_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_OTHER_TYPE.equals(mContentDto.contentType)) {
|| ContentJSON.KEY_OBJECTVR_TYPE.equals(contentDto.contentType) || ContentJSON.KEY_OTHER_TYPE.equals(contentDto.contentType)) {
closeButton.setBackgroundResource(R.drawable.btn_first_back); closeButton.setBackgroundResource(R.drawable.btn_first_back);
btnLinkOriginalBack.setVisibility(View.VISIBLE); btnLinkOriginalBack.setVisibility(View.VISIBLE);
...@@ -430,7 +429,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -430,7 +429,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
pauseBtn.setVisibility(View.GONE); pauseBtn.setVisibility(View.GONE);
historyListBtn.setVisibility(View.GONE); historyListBtn.setVisibility(View.GONE);
subMenuBtn.setVisibility(View.GONE); subMenuBtn.setVisibility(View.GONE);
} else if (ContentJSON.KEY_LINK_TYPE.equals(contentDto.contentType) || ContentJSON.KEY_HTML_TYPE.equals(contentDto.contentType)) { } else if (ContentJSON.KEY_LINK_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_HTML_TYPE.equals(mContentDto.contentType)) {
closeButton.setBackgroundResource(R.drawable.btn_first_back); closeButton.setBackgroundResource(R.drawable.btn_first_back);
btnLinkOriginalBack.setVisibility(View.VISIBLE); btnLinkOriginalBack.setVisibility(View.VISIBLE);
reloadButton.setVisibility(View.GONE); reloadButton.setVisibility(View.GONE);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLXWalkWebViewActivity.java
...@@ -441,13 +441,10 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity { ...@@ -441,13 +441,10 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity {
} }
}); });
historyListBtn.setVisibility(View.GONE);
if(isLinkedContent) { if(isLinkedContent) {
ContentDto contentDto = AbstractDao.getDao(ContentDao.class).getContent(contentId); if (ContentJSON.KEY_MOVIE_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_MUSIC_TYPE.equals(mContentDto.contentType)
if (ContentJSON.KEY_MOVIE_TYPE.equals(contentDto.contentType) || ContentJSON.KEY_MUSIC_TYPE.equals(contentDto.contentType) || ContentJSON.KEY_PANO_IMAGE_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_PANO_MOVIE_TYPE.equals(mContentDto.contentType)
|| ContentJSON.KEY_PANO_IMAGE_TYPE.equals(contentDto.contentType) || ContentJSON.KEY_PANO_MOVIE_TYPE.equals(contentDto.contentType) || ContentJSON.KEY_OBJECTVR_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_OTHER_TYPE.equals(mContentDto.contentType)) {
|| ContentJSON.KEY_OBJECTVR_TYPE.equals(contentDto.contentType) || ContentJSON.KEY_OTHER_TYPE.equals(contentDto.contentType)) {
closeButton.setBackgroundResource(R.drawable.btn_first_back); closeButton.setBackgroundResource(R.drawable.btn_first_back);
btnLinkOriginalBack.setVisibility(View.VISIBLE); btnLinkOriginalBack.setVisibility(View.VISIBLE);
...@@ -461,7 +458,7 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity { ...@@ -461,7 +458,7 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity {
pauseBtn.setVisibility(View.GONE); pauseBtn.setVisibility(View.GONE);
historyListBtn.setVisibility(View.GONE); historyListBtn.setVisibility(View.GONE);
subMenuBtn.setVisibility(View.GONE); subMenuBtn.setVisibility(View.GONE);
} else if (ContentJSON.KEY_LINK_TYPE.equals(contentDto.contentType) || ContentJSON.KEY_HTML_TYPE.equals(contentDto.contentType)) { } else if (ContentJSON.KEY_LINK_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_HTML_TYPE.equals(mContentDto.contentType)) {
closeButton.setBackgroundResource(R.drawable.btn_first_back); closeButton.setBackgroundResource(R.drawable.btn_first_back);
btnLinkOriginalBack.setVisibility(View.VISIBLE); btnLinkOriginalBack.setVisibility(View.VISIBLE);
reloadButton.setVisibility(View.GONE); reloadButton.setVisibility(View.GONE);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java
...@@ -16,6 +16,7 @@ import java.util.Date; ...@@ -16,6 +16,7 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import jp.agentec.abook.abv.bl.acms.client.json.content.ContentJSON;
import jp.agentec.abook.abv.bl.acms.type.OperationType; import jp.agentec.abook.abv.bl.acms.type.OperationType;
import jp.agentec.abook.abv.bl.common.ABVEnvironment; import jp.agentec.abook.abv.bl.common.ABVEnvironment;
import jp.agentec.abook.abv.bl.common.Callback; import jp.agentec.abook.abv.bl.common.Callback;
...@@ -23,6 +24,9 @@ import jp.agentec.abook.abv.bl.common.CommonExecutor; ...@@ -23,6 +24,9 @@ import jp.agentec.abook.abv.bl.common.CommonExecutor;
import jp.agentec.abook.abv.bl.common.Constant; import jp.agentec.abook.abv.bl.common.Constant;
import jp.agentec.abook.abv.bl.common.constant.ABookKeys; import jp.agentec.abook.abv.bl.common.constant.ABookKeys;
import jp.agentec.abook.abv.bl.common.log.Logger; import jp.agentec.abook.abv.bl.common.log.Logger;
import jp.agentec.abook.abv.bl.data.dao.AbstractDao;
import jp.agentec.abook.abv.bl.data.dao.ContentDao;
import jp.agentec.abook.abv.bl.dto.ContentDto;
import jp.agentec.abook.abv.bl.logic.AbstractLogic; import jp.agentec.abook.abv.bl.logic.AbstractLogic;
import jp.agentec.abook.abv.bl.logic.ContentObjectLogLogic; import jp.agentec.abook.abv.bl.logic.ContentObjectLogLogic;
import jp.agentec.abook.abv.bl.logic.OperationLogic; import jp.agentec.abook.abv.bl.logic.OperationLogic;
...@@ -60,8 +64,10 @@ public class ParentWebViewActivity extends ABVContentViewActivity { ...@@ -60,8 +64,10 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
protected Button btnWebBack; protected Button btnWebBack;
protected Button btnWebForward; protected Button btnWebForward;
private ProgressBar m_progress; private ProgressBar m_progress;
protected ContentDto mContentDto;
protected void commonOnCreate() { protected void commonOnCreate() {
mContentDto = AbstractDao.getDao(ContentDao.class).getContent(contentId);
historyLayout = (LinearLayout) findViewById(R.id.historyLayout); historyLayout = (LinearLayout) findViewById(R.id.historyLayout);
addSceneButton = (ImageButton) findViewById(R.id.btn_add_scene); addSceneButton = (ImageButton) findViewById(R.id.btn_add_scene);
taskListButton = (ImageButton) findViewById(R.id.btn_show_task_list); taskListButton = (ImageButton) findViewById(R.id.btn_show_task_list);
...@@ -163,6 +169,9 @@ public class ParentWebViewActivity extends ABVContentViewActivity { ...@@ -163,6 +169,9 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
protected void commonConfigureRemote() { protected void commonConfigureRemote() {
historyLayout = (LinearLayout) findViewById(R.id.historyLayout); historyLayout = (LinearLayout) findViewById(R.id.historyLayout);
if (ContentJSON.KEY_PANO_IMAGE_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_PANO_MOVIE_TYPE.equals(mContentDto.contentType)) {
historyLayout.setVisibility(View.GONE);
}
addSceneButton = (ImageButton) findViewById(R.id.btn_add_scene); addSceneButton = (ImageButton) findViewById(R.id.btn_add_scene);
taskListButton = (ImageButton) findViewById(R.id.btn_show_task_list); taskListButton = (ImageButton) findViewById(R.id.btn_show_task_list);
helpButton = (ImageButton) findViewById(R.id.btn_help); helpButton = (ImageButton) findViewById(R.id.btn_help);
......
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