|
@@ -425,9 +425,14 @@ public class ActWebX5 extends BaseActWeb {
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public void onBackPressed() {
|
|
public void onBackPressed() {
|
|
|
- if (responseBack)
|
|
|
|
|
- super.onBackPressed();
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ if (responseBack) {
|
|
|
|
|
+ if (mWebView != null && mWebView.canGoBack()) {
|
|
|
|
|
+ mWebView.goBack();
|
|
|
|
|
+
|
|
|
|
|
+ } else {
|
|
|
|
|
+ super.onBackPressed();
|
|
|
|
|
+ }
|
|
|
|
|
+ } else {
|
|
|
loadJs("onBackPressed()");
|
|
loadJs("onBackPressed()");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -438,15 +443,6 @@ public class ActWebX5 extends BaseActWeb {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public void finish() {
|
|
|
|
|
- if (mWebView != null && mWebView.canGoBack()) {
|
|
|
|
|
- mWebView.goBack();
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
- super.finish();
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- @Override
|
|
|
|
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
|
if (requestCode == FILECHOOSER_RESULTCODE) {
|
|
if (requestCode == FILECHOOSER_RESULTCODE) {
|
|
|
if (null == mUploadMessage) return;
|
|
if (null == mUploadMessage) return;
|
|
@@ -481,7 +477,7 @@ public class ActWebX5 extends BaseActWeb {
|
|
|
|
|
|
|
|
mFilePathCallback.onReceiveValue(results);
|
|
mFilePathCallback.onReceiveValue(results);
|
|
|
mFilePathCallback = null;
|
|
mFilePathCallback = null;
|
|
|
- } else if(Constant.INTENT_RECHARGE == requestCode) {
|
|
|
|
|
|
|
+ } else if (Constant.INTENT_RECHARGE == requestCode) {
|
|
|
mWebView.reload();
|
|
mWebView.reload();
|
|
|
} else {
|
|
} else {
|
|
|
super.onActivityResult(requestCode, resultCode, data);
|
|
super.onActivityResult(requestCode, resultCode, data);
|