...

app/src/main/java/com/base/browserwhite/ui/activity/news/NewsActivity.kt

@@ -11,7 +11,6 @@ import com.base.browserwhite.bean.NewsCategory
 import com.base.browserwhite.databinding.ActivityNewsBinding
 import com.base.browserwhite.databinding.ItemTabNewsBinding
 import com.base.browserwhite.ui.activity.BaseActivity
-import com.base.browserwhite.ui.adapter.NewsAdapter
 import com.base.browserwhite.utils.BarUtils
 import com.base.browserwhite.utils.LogEx
 import com.base.browserwhite.help.NewsUtils

app/src/main/java/com/base/browserwhite/ui/adapter/NewsAdapter.kt → app/src/main/java/com/base/browserwhite/ui/activity/news/NewsAdapter.kt

-package com.base.browserwhite.ui.adapter
+package com.base.browserwhite.ui.activity.news
 
 import android.content.Context
 import android.graphics.drawable.Drawable

app/src/main/java/com/base/browserwhite/ui/activity/result/ResultActivity.kt

@@ -9,7 +9,7 @@ import com.base.browserwhite.bean.ConstObject.JUNK_CLEANER
 import com.base.browserwhite.databinding.ActivityResultBinding
 import com.base.browserwhite.ui.activity.BaseActivity
 import com.base.browserwhite.ui.activity.news.NewsDetailActivity
-import com.base.browserwhite.ui.adapter.NewsAdapter
+import com.base.browserwhite.ui.activity.news.NewsAdapter
 import com.base.browserwhite.utils.BarUtils
 import com.base.browserwhite.utils.KotlinExt.toFormatSize
 import com.base.browserwhite.utils.LogEx

app/src/main/java/com/base/browserwhite/ui/activity/webbrowser/WebBrowserActivity.kt

@@ -166,27 +166,9 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
         } else {
             binding.ivRight.setImageResource(R.mipmap.right_n)
         }
-        binding.editWeb.setOnEditorActionListener(object : TextView.OnEditorActionListener {
-            override fun onEditorAction(v: TextView?, actionId: Int, event: KeyEvent?): Boolean {
-                if (actionId == EditorInfo.IME_ACTION_DONE) {
-                    val input = v?.text?.toString()
-                    if (input.isNullOrEmpty()) {
-                        return true
-                    }
-                    handleInput(input,
-                        loadUrl = { url ->
-                            currentFragment?.loadWebView(url)
-                        },
-                        performSearch = { search ->
-                            currentFragment?.loadWebView(getSearchUrl(search))
-                        })
-
-                    return true // 返回true表示事件已处理
-                }
-                return false
-
-            }
-        })
+        binding.flRefresh.setOnClickListener {
+            currentFragment?.reloadWebView()
+        }
     }
 
     override fun initListener() {

app/src/main/java/com/base/browserwhite/ui/activity/webbrowser/WebViewFragment.kt

@@ -107,7 +107,7 @@ class WebViewFragment : BaseFragment<FragmentWebViewBinding>() {
     }
 
 
-    private fun reloadWebView() {
+    fun reloadWebView() {
         binding.llError.visibility = View.GONE
         binding.webView.visibility = View.VISIBLE
         binding.progressBar.visibility = View.VISIBLE
@@ -211,6 +211,7 @@ class WebViewFragment : BaseFragment<FragmentWebViewBinding>() {
                 bookmarkBean.name = tittle
                 bookmarkBean.url = url ?: ""
                 onPageFinished?.invoke(url)
+                onPageFinished = null
 
                 //添加历史记录
                 SpBeanUtils.addSpBean(

app/src/main/java/com/base/browserwhite/ui/fragment/HomeFragment.kt

@@ -12,9 +12,7 @@ import android.widget.Toast
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.base.browserwhite.R
-import com.base.browserwhite.ads.AdDialog.showAdPreparingDialog
 import com.base.browserwhite.bean.BookmarkBean
-import com.base.browserwhite.bean.ConstObject
 import com.base.browserwhite.bean.ConstObject.APP_PROCESS
 import com.base.browserwhite.bean.ConstObject.BAIDU
 import com.base.browserwhite.bean.ConstObject.BING
@@ -31,11 +29,9 @@ import com.base.browserwhite.bean.WebSiteBean
 import com.base.browserwhite.bean.defaultValue
 import com.base.browserwhite.bean.webSiteGroupBeanList
 import com.base.browserwhite.databinding.FragmentHomeBinding
-import com.base.browserwhite.fcm.NotificationUtil
 import com.base.browserwhite.help.Constants
 import com.base.browserwhite.help.NewsUtils.requestNews
 import com.base.browserwhite.help.RxBus
-import com.base.browserwhite.help.SearchTipUtils
 import com.base.browserwhite.ui.activity.search.SearchActivity
 import com.base.browserwhite.ui.activity.appprocess.AppProcessActivity
 import com.base.browserwhite.ui.activity.bookmark.BookmarkActivity
@@ -47,7 +43,7 @@ import com.base.browserwhite.ui.activity.weather.WeatherInterface
 import com.base.browserwhite.ui.activity.webbrowser.WebBrowserActivity
 import com.base.browserwhite.ui.adapter.HeadWebsiteAdapter
 import com.base.browserwhite.ui.adapter.HeaderAdapter
-import com.base.browserwhite.ui.adapter.NewsAdapter
+import com.base.browserwhite.ui.activity.news.NewsAdapter
 import com.base.browserwhite.ui.views.DialogViews.showSearchEngineDialog
 import com.base.browserwhite.utils.AppPreferences
 import com.base.browserwhite.utils.ClipboardUtils.copyText

app/src/main/res/layout/activity_web_browser.xml

@@ -18,14 +18,14 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
-            android:layout_alignBottom="@id/cl_search"
-            android:layout_alignTop="@id/cl_search"
             android:id="@+id/iv_share"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignTop="@id/cl_search"
+            android:layout_alignBottom="@id/cl_search"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="15dp"
-            android:src="@mipmap/fenxiang"
+            android:src="@mipmap/fenxiang_webbrowser"
             tools:ignore="ContentDescription" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -88,12 +88,12 @@
                 android:singleLine="true"
                 android:textColorHint="#858587"
                 android:textSize="14sp"
-                app:layout_constraintEnd_toStartOf="@id/fl_scan"
+                app:layout_constraintEnd_toStartOf="@id/fl_refresh"
                 app:layout_constraintStart_toEndOf="@id/fl_search_engine"
                 tools:ignore="Autofill,HardcodedText,TextFields" />
 
             <FrameLayout
-                android:id="@+id/fl_scan"
+                android:id="@+id/fl_refresh"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"