Commit e6d9c545 by Lee Munkyeong

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

新着更新修正

See merge request !190
parents 9abbdf0a e78cf0f5
Subproject commit 8112cedc9d59badaf534e739cbbbc1f9b0467461
Subproject commit e625e830d258235603cbefc22fe4d39ad7769857
......@@ -379,14 +379,7 @@ public class OperationListActivity extends ABVUIActivity {
case ABookKeys.CMD_KEY.REFRESH_CONTENT:
clearSearch();
showProgressPopup();
dataRefresh(true);
runOnUiThread(new Runnable() {
@Override
public void run() {
mCheckWebView.loadUrl("javascript:CHK.initReportApp();");
}
});
break;
case ABookKeys.CMD_KEY.CHANGE_OPERATION_GROUP_MASTER:
......@@ -549,7 +542,6 @@ public class OperationListActivity extends ABVUIActivity {
@Override
public void onResume() {
//showProgressPopup();
Logger.i(TAG, "onResume:start");
super.onResume();
......@@ -569,7 +561,6 @@ public class OperationListActivity extends ABVUIActivity {
// 報告画面から作業一覧へ戻った時の同期処理
final long operationId = getUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, -1L);
if (operationId != -1) {
showProgressPopup();
dataRefresh(true);
// リソースパターンの適用
}
......@@ -720,7 +711,8 @@ public class OperationListActivity extends ABVUIActivity {
mCheckWebView.loadUrl("javascript:$('#searchTaskName').val('');");
mCheckWebView.loadUrl("javascript:$('#searchStartDate').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 {
}
public void screenRefresh() {
runOnUiThread(new Runnable() {
@Override
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