Skip to content

A
abook_check
Commit 484b514b by Lee Munkyeong
Options

作業更新関連修正

parent 7912e132
Showing with 34 additions and 28 deletions
check @ 5d0e71bd
Subproject commit 7321568f2997cb2f8eef0e2052f0b7d481c751aa Subproject commit 5d0e71bd7ff6383baab4a0f7f333279b7307a27a
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
...@@ -128,7 +128,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -128,7 +128,7 @@ public class OperationListActivity extends ABVUIActivity {
public int sortType = 2; public int sortType = 2;
public boolean isSearch = false; public boolean isSearch = false;
public int mOperationGroupMasterId = 0; public int mOperationGroupMasterId = 0;
boolean firstFlg = true;
private EditText mSearchTextView; // 検索画面の作業名 private EditText mSearchTextView; // 検索画面の作業名
private TextView mStartDate; // 検索画面の作業開始日 private TextView mStartDate; // 検索画面の作業開始日
private TextView mEndDate; // 検索画面の作業終了日 private TextView mEndDate; // 検索画面の作業終了日
...@@ -201,6 +201,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -201,6 +201,7 @@ public class OperationListActivity extends ABVUIActivity {
paramList.add("app=android"); paramList.add("app=android");
paramList.add("mobile_flg=" + (isNormalSize() ? "1" : "0")); paramList.add("mobile_flg=" + (isNormalSize() ? "1" : "0"));
paramList.add("isRFIDBarcodeScan=" + (ABVDataCache.getInstance().serviceOption.isUsableRFIDBarcodeScan() ? "1" : "0")); paramList.add("isRFIDBarcodeScan=" + (ABVDataCache.getInstance().serviceOption.isUsableRFIDBarcodeScan() ? "1" : "0"));
paramList.add("isOperationGroupMaster=" + (ABVDataCache.getInstance().serviceOption.isOperationGroupMaster() ? "1" : "0"));
mCheckWebView.postUrl(OPERATION_LIST_PAGE + StringUtil.join("&", paramList), null); mCheckWebView.postUrl(OPERATION_LIST_PAGE + StringUtil.join("&", paramList), null);
mListHelper = getListHelper(); mListHelper = getListHelper();
updateNeedSyncRoutineOperation(); updateNeedSyncRoutineOperation();
...@@ -350,7 +351,6 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -350,7 +351,6 @@ public class OperationListActivity extends ABVUIActivity {
showProgressPopup(); showProgressPopup();
} }
}); });
clearSearch();
dataRefresh(true); dataRefresh(true);
break; break;
...@@ -478,7 +478,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -478,7 +478,7 @@ public class OperationListActivity extends ABVUIActivity {
mOperationGroupMasterId = 0; mOperationGroupMasterId = 0;
isSearch = false; isSearch = false;
sortType = 2; sortType = 2;
clearData(); //clearData();
} }
// 検索済みかどうかチェック // 検索済みかどうかチェック
...@@ -536,12 +536,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -536,12 +536,7 @@ public class OperationListActivity extends ABVUIActivity {
public void onResume() { public void onResume() {
Logger.i(TAG, "onResume:start"); Logger.i(TAG, "onResume:start");
super.onResume(); super.onResume();
handler.post(new Runnable() {
@Override
public void run() {
showProgressPopup();
}
});
if (isSearch) { if (isSearch) {
isSearch = false; isSearch = false;
return; return;
...@@ -557,28 +552,36 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -557,28 +552,36 @@ 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) {
dataRefresh(true); if (operationId == -1) {
// リソースパターンの適用 handler.post(new Runnable() {
@Override
public void run() {
showProgressPopup();
}
});
if (firstFlg) {
dataRefresh(true);
firstFlg = false;
}
runOnUiThread(new Runnable() {
@Override
public void run() {
try {
createJsonForOperationList(getCacheDir().getAbsolutePath());
//closeProgressPopup();
} catch (Exception e) {
Logger.d("Update error");
}
}
});
} }
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() {
@Override
public void run() {
try {
createJsonForOperationList(getCacheDir().getAbsolutePath());
//closeProgressPopup();
} catch (Exception e) {
Logger.d("Update error");
}
}
});
} }
// 検索ダイアログ表示 // 検索ダイアログ表示
...@@ -1947,7 +1950,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -1947,7 +1950,7 @@ public class OperationListActivity extends ABVUIActivity {
} }
public void createJsonForOperationList(String filePath) { public void createJsonForOperationList(String filePath) {
clearSearch(); //clearSearch();
List<OperationDto> operationList = mListHelper.filterOperationList(); List<OperationDto> operationList = mListHelper.filterOperationList();
mOperationLogic.createOperationListJson(operationList, filePath); mOperationLogic.createOperationListJson(operationList, filePath);
mOperationGroupMasterLogic.createOperationGroupMasterListJson(filePath); mOperationGroupMasterLogic.createOperationGroupMasterListJson(filePath);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLXWalkWebViewActivity.java
...@@ -490,7 +490,10 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity { ...@@ -490,7 +490,10 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity {
configureRemote(); configureRemote();
} }
}); });
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)
......
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