|
@@ -306,22 +306,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
|
|
|
protected void onResume() {
|
|
|
super.onResume();
|
|
|
if (null != webView && App.isRefresh) {
|
|
|
- String userToken = UserHelper.getUserToken();
|
|
|
- Authorization = TextUtils.isEmpty(userToken) ? null : userToken;
|
|
|
- if (!TextUtils.isEmpty(Authorization)) {
|
|
|
- try {
|
|
|
- authorization = URLEncoder.encode(Authorization, "UTF-8");
|
|
|
- } catch (UnsupportedEncodingException e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- boolean status = url.contains("?");
|
|
|
- if (status) {
|
|
|
- webViewUrl = (url + "&Authorization=" + authorization);
|
|
|
- } else {
|
|
|
- webViewUrl = (url + "?Authorization=" + authorization);
|
|
|
- }
|
|
|
- }
|
|
|
- webView.loadUrl(webViewUrl);
|
|
|
+ webView.reload();
|
|
|
App.isRefresh = false;
|
|
|
}
|
|
|
notifyWebViewOnResume();
|
|
@@ -946,14 +931,12 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
|
|
|
@Override
|
|
|
public void onPageStarted(WebView view, String url, Bitmap favicon) {
|
|
|
super.onPageStarted(view, url, favicon);
|
|
|
- webViewUrl = url;
|
|
|
}
|
|
|
|
|
|
|
|
|
@Override
|
|
|
public void onPageFinished(WebView view, String url) {
|
|
|
super.onPageFinished(view, url);
|
|
|
- webViewUrl = url;
|
|
|
if (!TextUtils.isEmpty(authorization)) {
|
|
|
String js = "window.localStorage.setItem('Authorization','" + authorization + "');";
|
|
|
String jsUrl = "javascript:(function({var localStorage = window.localStorage; localStorage.setItem('Authorization','" + authorization + "') })()";
|