Skip to content

A
abook_check
Commit 965295c8 by Lee Munkyeong
Options

360コンテンツが開けない不具合修正

parent eb8a5077
Showing with 21 additions and 13 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/content/ContentJSON.java
...@@ -51,6 +51,7 @@ public class ContentJSON extends AbstractJSON { ...@@ -51,6 +51,7 @@ public class ContentJSON extends AbstractJSON {
public static final String KEY_WIDTH = "width"; public static final String KEY_WIDTH = "width";
public static final String KEY_BACKGROUND_COLOR = "backgroundColor"; public static final String KEY_BACKGROUND_COLOR = "backgroundColor";
public static final String KEY_BACKGROUND_ALPHA = "backgroundAlpha"; public static final String KEY_BACKGROUND_ALPHA = "backgroundAlpha";
public static final String KEY_LIST_TYPE = "list";
private JSONArray mPages; private JSONArray mPages;
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java
...@@ -99,7 +99,7 @@ public class ABookKeys { ...@@ -99,7 +99,7 @@ public class ABookKeys {
} }
// #32782 指示者テーブル関連削除 start // #32782 指示者テーブル関連削除 startbtn_pano_edit
// TODO change TASK_DIRECTIONS 削除が必要 // TODO change TASK_DIRECTIONS 削除が必要
// public static final String TASK_DIRECTIONS = "taskReport"; // public static final String TASK_DIRECTIONS = "taskReport";
// public static final String TASK_DIRECTIONS_SUGGEST = "taskReportSuggest"; // public static final String TASK_DIRECTIONS_SUGGEST = "taskReportSuggest";
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVUIActivity.java
...@@ -216,6 +216,8 @@ public abstract class ABVUIActivity extends ABVAuthenticatedActivity { ...@@ -216,6 +216,8 @@ public abstract class ABVUIActivity extends ABVAuthenticatedActivity {
stopUpdateAnimation(); stopUpdateAnimation();
Logger.e(TAG, "Exception DataRefresh", e); Logger.e(TAG, "Exception DataRefresh", e);
handleErrorMessageToast(ErrorCode.E107); handleErrorMessageToast(ErrorCode.E107);
} finally {
closeProgressPopup();
} }
return result; return result;
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
...@@ -363,7 +363,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -363,7 +363,7 @@ public class OperationListActivity extends ABVUIActivity {
mCallBack = new Runnable() { mCallBack = new Runnable() {
@Override @Override
public void run() { public void run() {
startTaskDirectionOrReportView(panoramaOperationDto); startPanoEdit(panoramaOperationDto);
} }
}; };
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
...@@ -373,12 +373,13 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -373,12 +373,13 @@ public class OperationListActivity extends ABVUIActivity {
} }
}); });
} else { } else {
startTaskDirectionOrReportView(panoramaOperationDto); startPanoEdit(panoramaOperationDto);
} }
break; break;
case ABookKeys.CMD_KEY.REFRESH_CONTENT: case ABookKeys.CMD_KEY.REFRESH_CONTENT:
clearSearch(); clearSearch();
showProgressPopup();
dataRefresh(true); dataRefresh(true);
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
...@@ -568,14 +569,15 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -568,14 +569,15 @@ public class OperationListActivity extends ABVUIActivity {
// 報告画面から作業一覧へ戻った時の同期処理 // 報告画面から作業一覧へ戻った時の同期処理
final long operationId = getUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, -1L); final long operationId = getUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, -1L);
if (operationId != -1) { if (operationId != -1) {
final OperationDto operationDto = mOperationLogic.getOperation(operationId); showProgressPopup();
dataRefresh(true); dataRefresh(true);
// リソースパターンの適用 // リソースパターンの適用
} }
if (!activityResultFlg && operationId == -1) { // if (!activityResultFlg && operationId == -1) {
dataRefresh(true); // //dataRefresh(true);
} // }
putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, -1L); putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, -1L);
activityResultFlg = false; activityResultFlg = false;
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
...@@ -589,7 +591,6 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -589,7 +591,6 @@ public class OperationListActivity extends ABVUIActivity {
} }
} }
}); });
} }
// 検索ダイアログ表示 // 検索ダイアログ表示
...@@ -1010,7 +1011,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -1010,7 +1011,7 @@ public class OperationListActivity extends ABVUIActivity {
return; return;
} }
if (operationDto.contentId != null && operationDto.contentId != 0) { if (operationDto.contentId != null && operationDto.contentId != 0) {
showProgressPopup(); //showProgressPopup();
try { try {
String baseUrl = ABVEnvironment.getInstance().acmsAddress + ABVDataCache.getInstance().getUrlPath() + "/shop/login/authByCheck/%s/%s"; String baseUrl = ABVEnvironment.getInstance().acmsAddress + ABVDataCache.getInstance().getUrlPath() + "/shop/login/authByCheck/%s/%s";
String url = String.format(baseUrl, ABVDataCache.getInstance().getMemberInfo().sid, operationDto.contentId); String url = String.format(baseUrl, ABVDataCache.getInstance().getMemberInfo().sid, operationDto.contentId);
...@@ -1025,7 +1026,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -1025,7 +1026,7 @@ public class OperationListActivity extends ABVUIActivity {
Logger.e(TAG, e); Logger.e(TAG, e);
ErrorMessage.showErrorMessageToast(getApplicationContext(), ErrorCode.E107); ErrorMessage.showErrorMessageToast(getApplicationContext(), ErrorCode.E107);
} finally { } finally {
closeProgressPopup(); //closeProgressPopup();
} }
} }
} }
...@@ -1932,7 +1933,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -1932,7 +1933,7 @@ public class OperationListActivity extends ABVUIActivity {
// typeの値をxmlに書き込み // typeの値をxmlに書き込み
getABVUIDataCache().setOperationGroupMasterMode((int) type); getABVUIDataCache().setOperationGroupMasterMode((int) type);
// プログレスバー // プログレスバー
showProgressPopup(); //showProgressPopup();
setOperationListView(); setOperationListView();
} }
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
...@@ -131,7 +131,8 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -131,7 +131,8 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
final RelativeLayout fl = (RelativeLayout) findViewById(R.id.frameTopbar); final RelativeLayout fl = (RelativeLayout) findViewById(R.id.frameTopbar);
fl.setVisibility(View.GONE); //fl.setVisibility(View.GONE);
// ***** 戻るボタン // ***** 戻るボタン
closeButton.setOnClickListener(new View.OnClickListener() { closeButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
...@@ -405,11 +406,13 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -405,11 +406,13 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
printButtonActivityControl(); printButtonActivityControl();
historyListBtn.setVisibility(View.GONE); historyListBtn.setVisibility(View.GONE);
if (ContentJSON.KEY_LIST_TYPE.equals(mContentDto.contentType)) {
fl.setVisibility(View.GONE);
}
if (isLinkedContent) { if (isLinkedContent) {
if (ContentJSON.KEY_MOVIE_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_MUSIC_TYPE.equals(mContentDto.contentType) if (ContentJSON.KEY_MOVIE_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_MUSIC_TYPE.equals(mContentDto.contentType)
|| ContentJSON.KEY_PANO_IMAGE_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_PANO_MOVIE_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_PANO_IMAGE_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_PANO_MOVIE_TYPE.equals(mContentDto.contentType)
|| ContentJSON.KEY_OBJECTVR_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_OTHER_TYPE.equals(mContentDto.contentType)) { || ContentJSON.KEY_OBJECTVR_TYPE.equals(mContentDto.contentType) || ContentJSON.KEY_OTHER_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);
btnWebBack.setVisibility(View.GONE); btnWebBack.setVisibility(View.GONE);
...@@ -435,6 +438,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -435,6 +438,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
subMenuBtn.setVisibility(View.GONE); subMenuBtn.setVisibility(View.GONE);
} }
} else { } else {
configureRemote(); configureRemote();
} }
if (meetingManager.isCollaboration()) { if (meetingManager.isCollaboration()) {
......
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