Commit d31080fc by Lee Munkyeong

画面Flag修正。

parent 4378f72a
...@@ -229,8 +229,8 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -229,8 +229,8 @@ public class OperationListActivity extends ABVUIActivity {
ArrayList<String> paramList = new ArrayList<String>(); ArrayList<String> paramList = new ArrayList<String>();
paramList.add("debug=1"); paramList.add("debug=1");
paramList.add("mobile_flg=1");
paramList.add("app=android"); paramList.add("app=android");
paramList.add("mobile_flg=" + (isNormalSize() ? "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();
...@@ -561,6 +561,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -561,6 +561,7 @@ public class OperationListActivity extends ABVUIActivity {
@Override @Override
public void onResume() { public void onResume() {
showProgressPopup();
Logger.i(TAG, "onResume:start"); Logger.i(TAG, "onResume:start");
super.onResume(); super.onResume();
//アプリロック状態の場合、何もしない。 //アプリロック状態の場合、何もしない。
...@@ -584,7 +585,6 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -584,7 +585,6 @@ public class OperationListActivity extends ABVUIActivity {
} }
putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, -1L); putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, -1L);
activityResultFlg = false; activityResultFlg = false;
showProgressPopup();
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
...@@ -1975,6 +1975,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -1975,6 +1975,7 @@ public class OperationListActivity extends ABVUIActivity {
} }
public void createJsonForOperationList(String filePath) { public void createJsonForOperationList(String filePath) {
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);
......
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