Commit d6978d07 by Lee Munkyeong

工程管理不具合修正

parent 231dfd93
...@@ -217,7 +217,7 @@ public abstract class ABVUIActivity extends ABVAuthenticatedActivity { ...@@ -217,7 +217,7 @@ public abstract class ABVUIActivity extends ABVAuthenticatedActivity {
Logger.e(TAG, "Exception DataRefresh", e); Logger.e(TAG, "Exception DataRefresh", e);
handleErrorMessageToast(ErrorCode.E107); handleErrorMessageToast(ErrorCode.E107);
} finally { } finally {
closeProgressPopup(); //closeProgressPopup();
} }
return result; return result;
......
...@@ -7,6 +7,8 @@ import android.content.Intent; ...@@ -7,6 +7,8 @@ import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.view.Gravity; import android.view.Gravity;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
...@@ -162,6 +164,8 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -162,6 +164,8 @@ public class OperationListActivity extends ABVUIActivity {
private Integer mScanType; private Integer mScanType;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -192,7 +196,6 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -192,7 +196,6 @@ public class OperationListActivity extends ABVUIActivity {
settings.setAllowFileAccessFromFileURLs(true); settings.setAllowFileAccessFromFileURLs(true);
settings.setSaveFormData(false); settings.setSaveFormData(false);
settings.setAllowUniversalAccessFromFileURLs(true); settings.setAllowUniversalAccessFromFileURLs(true);
ArrayList<String> paramList = new ArrayList<String>(); ArrayList<String> paramList = new ArrayList<String>();
paramList.add("debug=1"); paramList.add("debug=1");
paramList.add("app=android"); paramList.add("app=android");
...@@ -341,6 +344,12 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -341,6 +344,12 @@ public class OperationListActivity extends ABVUIActivity {
break; break;
case ABookKeys.CMD_KEY.REFRESH_CONTENT: case ABookKeys.CMD_KEY.REFRESH_CONTENT:
handler.post(new Runnable() {
@Override
public void run() {
showProgressPopup();
}
});
clearSearch(); clearSearch();
dataRefresh(true); dataRefresh(true);
break; break;
...@@ -408,6 +417,26 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -408,6 +417,26 @@ public class OperationListActivity extends ABVUIActivity {
public void testScanResult(String code, int scanType) { public void testScanResult(String code, int scanType) {
onScanned(code, scanType); onScanned(code, scanType);
} }
@JavascriptInterface
public void showLoading() {
handler.post(new Runnable() {
@Override
public void run() {
showProgressPopup();
}
});
}
@JavascriptInterface
public void hideLoading() {
handler.post(new Runnable() {
@Override
public void run() {
closeProgressPopup();
}
});
}
} }
//TODO Method called when code is scanned //TODO Method called when code is scanned
...@@ -507,7 +536,12 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -507,7 +536,12 @@ 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;
......
...@@ -121,12 +121,8 @@ public class OperationRelatedContentActivity extends ABVUIActivity { ...@@ -121,12 +121,8 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
showCommunicationMenuDialog(); showCommunicationMenuDialog();
} }
}); });
if (ABVDataCache.getInstance().serviceOption.isUnableIOReport()) { findViewById(R.id.print_layout).setVisibility(View.GONE);
mQuickReportPrintButton.setVisibility(View.VISIBLE);
} else {
findViewById(R.id.print_layout).setVisibility(View.GONE);
mQuickReportPrintButton.setVisibility(View.GONE);
}
} }
private void hideBottomToolbar() { private void hideBottomToolbar() {
......
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