Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

回退WebFragment的修改

Browse Source
This commit is contained in:
Jack
2020-03-07 10:57:46 +08:00
parent 6d8c703f33
commit c0f32124ad
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/halo/assistant/fragment/WebFragment.java
View File

@ -1,7 +1,6 @@
package com.halo.assistant.fragment;
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@ -46,10 +45,8 @@ import com.lightgame.utils.Utils;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import butterknife.BindView;
import butterknife.OnClick;
@ -100,7 +97,6 @@ public class WebFragment extends NormalFragment {
private boolean mIsBackpressRequireConfirmation;
private String mBackConfirmationContent;
private String mGameName;
private List<String> titles = new ArrayList<>();
private TimeElapsedHelper mTimeElapsedHelper;
@ -309,11 +305,10 @@ public class WebFragment extends NormalFragment {
public void onReceivedTitle(WebView view, String title) {
super.onReceivedTitle(view, title);
// title 有可能超出边界
if (TextUtils.isEmpty(newsId) && TextUtils.isEmpty(mNavigationTitle) && !mIsTools && mAutoCompletionTitle && !view.getUrl().contains(title)) {
if (TextUtils.isEmpty(newsId) && TextUtils.isEmpty(mNavigationTitle) && !mIsTools && mAutoCompletionTitle) {
mNavigationTitle = title;
setNavigationTitle(mNavigationTitle);
}
titles.add(title);
}
});
boolean isSecurityCertification = args.getBoolean(KEY_IS_SECURITY_CERTIFICATION, false);
@ -390,11 +385,7 @@ public class WebFragment extends NormalFragment {
}, true, "H5页面", "退出弹窗");
return true;
} else if (mWebView.canGoBack()) {
mWebView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
mWebView.goBack();
titles.remove(titles.size() - 1);
String title = titles.remove(titles.size() - 1);
setNavigationTitle(title);
return true;
}
return false;