From c0f32124adbe822937ce225d517f4e71b87f5ce2 Mon Sep 17 00:00:00 2001
From: Jack <1484288157@qq.com>
Date: Sat, 7 Mar 2020 10:57:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80WebFragment=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/halo/assistant/fragment/WebFragment.java | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java
index 3b681c9e63..9bf868a334 100644
--- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java
+++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java
@@ -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;