...

app/src/main/java/com/base/browserwhite/ui/activity/search/SearchActivity.kt

@@ -9,6 +9,7 @@ import android.graphics.Color
 import android.os.Handler
 import android.util.TypedValue
 import android.view.View
+import android.view.inputmethod.InputMethodManager
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.widget.addTextChangedListener
@@ -17,6 +18,8 @@ import com.base.browserwhite.bean.ConstObject
 import com.base.browserwhite.bean.ConstObject.searchEngineSp
 import com.base.browserwhite.bean.SearchRecordBean
 import com.base.browserwhite.databinding.ActivitySearchBinding
+import com.base.browserwhite.help.Constants.CHANGE_SEARCH_URL
+import com.base.browserwhite.help.RxBus
 import com.base.browserwhite.help.SearchTipUtils.getSearchTip
 import com.base.browserwhite.ui.activity.BaseActivity
 import com.base.browserwhite.ui.activity.webbrowser.WebBrowserActivity
@@ -37,12 +40,24 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
 
     private lateinit var searchAdapter: SearchAdapter
     private lateinit var searchRecordAdapter: SearchRecordAdapter
+    private var isHomeSearch: Boolean = true
 
 
     override val binding: ActivitySearchBinding by lazy {
         ActivitySearchBinding.inflate(layoutInflater)
     }
 
+    private fun searchJump(content: String) {
+        val link = LinkSearchUtils.getSpSearchAction(content)
+        if (isHomeSearch) {
+            startActivity(Intent(this, WebBrowserActivity::class.java).apply {
+                putExtra("url", link)
+            })
+        } else {
+            RxBus.get().post(CHANGE_SEARCH_URL, link)
+        }
+        finish()
+    }
 
     override fun initView() {
         setStatusBarLightMode(this, true)
@@ -61,19 +76,13 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
 
         searchAdapter = SearchAdapter()
         searchAdapter.searchAction = { content ->
-            startActivity(Intent(this, WebBrowserActivity::class.java).apply {
-                putExtra("url", LinkSearchUtils.getSpSearchAction(content))
-            })
-            finish()
+            searchJump(content)
         }
         binding.rv.adapter = searchAdapter
 
         searchRecordAdapter = SearchRecordAdapter()
         searchRecordAdapter.jumpAction = { content ->
-            startActivity(Intent(this, WebBrowserActivity::class.java).apply {
-                putExtra("url", LinkSearchUtils.getSpSearchAction(content))
-            })
-            finish()
+            searchJump(content)
         }
         searchRecordAdapter.deleteAction = {
             showDeleteTipDialog(desc = "Clear all search records?") {
@@ -129,6 +138,11 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
             binding.tvSearch.visibility = View.VISIBLE
             binding.ivClear.visibility = View.VISIBLE
             searchContent = ""
+            isHomeSearch = false
+            binding.root.postDelayed({
+                val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
+                imm.showSoftInput(binding.editWeb, InputMethodManager.SHOW_IMPLICIT)
+            }, 800)
         }
 
 

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

@@ -105,7 +105,7 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
 
         mChangeSearchUrl = RxBus.get().register(Constants.CHANGE_SEARCH_URL, String::class.java)
         mChangeSearchUrl?.observeOn(AndroidSchedulers.mainThread())?.subscribe { t ->
-
+            currentFragment?.loadWebView(t)
         }
 
         addNewWebSite(url)