|
|
@@ -98,7 +98,7 @@ public class ActWebX5 extends BaseActWeb {
|
|
|
.getInstance()
|
|
|
.setShowOrHide(this, true)
|
|
|
.setTitle(this, webParams.getTitle())
|
|
|
- .setRightImgBotton(this, R.drawable.ic_edit_text_delete, view -> finish())
|
|
|
+ .setRightImgBotton(this, R.drawable.ic_edit_text_delete, view -> super.finish())
|
|
|
.setTitleFinish(this);
|
|
|
}
|
|
|
initWebViewSettings(mWebView);
|
|
|
@@ -172,12 +172,19 @@ public class ActWebX5 extends BaseActWeb {
|
|
|
|
|
|
@Override
|
|
|
protected void onDestroy() {
|
|
|
- super.onDestroy();
|
|
|
+ if(act_web_loading_iv != null){
|
|
|
+ try {
|
|
|
+ act_web_loading_iv.clearAnimation();
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
if (mWebView != null) {
|
|
|
mWebView.setVisibility(View.GONE);
|
|
|
mWebView.removeAllViews();
|
|
|
mWebView.destroy();
|
|
|
}
|
|
|
+ super.onDestroy();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -374,9 +381,13 @@ public class ActWebX5 extends BaseActWeb {
|
|
|
mWebView.addJavascriptInterface(new KFZSJs(this), "kfzsjs");
|
|
|
String loadUrl = url;
|
|
|
if(webParams.getTokenKey() != null){
|
|
|
- if(url.startsWith(Config.YF_SHOP_HOME))webParams.tokenFirstUpperCase();
|
|
|
+ if(url.startsWith(Config.YF_SHOP_HOME)){
|
|
|
+ webParams.tokenFirstUpperCase();
|
|
|
+ }
|
|
|
loadUrl = addUrlQuery(url, webParams.getTokenKey(), SpUtils.getToken(SheepApp.getInstance()));
|
|
|
- loadUrl = addUrlQuery(loadUrl, "pf", Config.YF_SHOP_PLATFORM);
|
|
|
+ if(url.startsWith(Config.YF_SHOP_HOME)){
|
|
|
+ loadUrl = addUrlQuery(loadUrl, "pf", Config.YF_SHOP_PLATFORM);
|
|
|
+ }
|
|
|
}
|
|
|
LogUtil.println("ActWeb loadUrl = " + loadUrl);
|
|
|
webViewLoadUrl(mWebView, loadUrl);
|