Skip to content

A
abook_check
Commit e6d9c545 by Lee Munkyeong
Options

Merge branch 'features/1.4.0_lmk' into 'features/1.4.0' 

新着更新修正

See merge request !190
parents 9abbdf0a e78cf0f5
Showing with 3 additions and 12 deletions
check @ e625e830
Subproject commit 8112cedc9d59badaf534e739cbbbc1f9b0467461 Subproject commit e625e830d258235603cbefc22fe4d39ad7769857
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
...@@ -379,14 +379,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -379,14 +379,7 @@ public class OperationListActivity extends ABVUIActivity {
case ABookKeys.CMD_KEY.REFRESH_CONTENT: case ABookKeys.CMD_KEY.REFRESH_CONTENT:
clearSearch(); clearSearch();
showProgressPopup();
dataRefresh(true); dataRefresh(true);
runOnUiThread(new Runnable() {
@Override
public void run() {
mCheckWebView.loadUrl("javascript:CHK.initReportApp();");
}
});
break; break;
case ABookKeys.CMD_KEY.CHANGE_OPERATION_GROUP_MASTER: case ABookKeys.CMD_KEY.CHANGE_OPERATION_GROUP_MASTER:
...@@ -549,7 +542,6 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -549,7 +542,6 @@ 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();
...@@ -569,7 +561,6 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -569,7 +561,6 @@ 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) {
showProgressPopup();
dataRefresh(true); dataRefresh(true);
// リソースパターンの適用 // リソースパターンの適用
} }
...@@ -720,7 +711,8 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -720,7 +711,8 @@ public class OperationListActivity extends ABVUIActivity {
mCheckWebView.loadUrl("javascript:$('#searchTaskName').val('');"); mCheckWebView.loadUrl("javascript:$('#searchTaskName').val('');");
mCheckWebView.loadUrl("javascript:$('#searchStartDate').val('');"); mCheckWebView.loadUrl("javascript:$('#searchStartDate').val('');");
mCheckWebView.loadUrl("javascript:$('#searchEndDate').val('');"); mCheckWebView.loadUrl("javascript:$('#searchEndDate').val('');");
mCheckWebView.loadUrl("javascript:CHK.changeSortType($('#defaultSort'));"); mCheckWebView.loadUrl("javascript:$('.sort-type').removeClass('active');");
mCheckWebView.loadUrl("javascript:$('#defaultSort').addClass('active');");
} }
}); });
} }
...@@ -1956,7 +1948,6 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -1956,7 +1948,6 @@ public class OperationListActivity extends ABVUIActivity {
} }
public void screenRefresh() { public void screenRefresh() {
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
......
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