...

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

@@ -34,6 +34,7 @@ import com.base.browserwhite.ui.views.DialogViews.showDeleteTipDialog
 import com.base.browserwhite.utils.BarUtils.setStatusBarColor
 import com.base.browserwhite.utils.BarUtils.setStatusBarLightMode
 import com.base.browserwhite.utils.LinkSearchUtils
+import com.base.browserwhite.utils.LogEx
 import com.base.browserwhite.utils.SpBeanUtils
 import com.base.browserwhite.utils.SpBeanUtils.SEARCH_RECORD_SP_KEY
 import com.google.android.flexbox.FlexDirection
@@ -45,16 +46,16 @@ import com.google.gson.Gson
 
 class SearchActivity : BaseActivity<ActivitySearchBinding>() {
 
+    private val TAG = "SearchActivity"
     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, newBrowser: Boolean = false) {
+    private fun searchJump(content: String) {
         var link = ""
         LinkSearchUtils.handleInput(content, loadUrl = {
             link = it
@@ -63,7 +64,8 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
         })
         SpBeanUtils.addSpBean(SEARCH_RECORD_SP_KEY, SearchRecordBean(content))
 
-        if (isHomeSearch || newBrowser) {
+        LogEx.logDebug(TAG, "isHomeSearch=$isHomeSearch")
+        if (isHomeSearch) {
             startActivity(Intent(this, WebBrowserActivity::class.java).apply {
                 putExtra("url", link)
                 addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
@@ -78,6 +80,8 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
         setStatusBarLightMode(this, true)
         setStatusBarColor(this, Color.TRANSPARENT)
 
+        isHomeSearch = intent.extras?.getBoolean("isHomeSearch") ?: true
+
         val layout = binding.clTop
         val layoutParams = layout.layoutParams as LinearLayout.LayoutParams
         val finalPosition = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16f, getResources().displayMetrics).toInt()
@@ -90,7 +94,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
 
         searchAdapter = SearchAdapter()
         searchAdapter.searchAction = { content ->
-            searchJump(content, true)
+            searchJump(content)
         }
         binding.rv.adapter = searchAdapter
 
@@ -163,7 +167,6 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
             binding.tvSearch.visibility = View.VISIBLE
             binding.ivClear.visibility = View.VISIBLE
             searchContent = ""
-            isHomeSearch = false
         }
 
         binding.editWeb.requestFocus()
@@ -245,7 +248,9 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
                 override fun onAnimationStart(animation: Animator) {}
                 override fun onAnimationEnd(animation: Animator) {
                     button.visibility = View.VISIBLE
-                    val intent = Intent(currentActivity, SearchActivity::class.java)
+                    val intent = Intent(currentActivity, SearchActivity::class.java).apply {
+                        putExtra("isHomeSearch", true)
+                    }
                     currentActivity.startActivityForResult(intent, 10086)
                     currentActivity.overridePendingTransition(R.anim.fade_in, R.anim.fade_out)
                 }
@@ -257,7 +262,6 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
         }
 
 
-
         fun startActivityWithButtonExpandAnimation(
             currentActivity: Activity,
             button: View,
@@ -290,8 +294,8 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
 
             val x = screenWidth.toFloat() / button.width.toFloat()
 
-            Log.d("glc","screenWidth:"+screenWidth)
-            Log.d("glc","button.width.toFloat():"+button.width.toFloat())
+            Log.d("glc", "screenWidth:" + screenWidth)
+            Log.d("glc", "button.width.toFloat():" + button.width.toFloat())
 
             val scaleXAnimator = ObjectAnimator.ofFloat(button, "scaleX", 1f, x)
             val scaleYAnimator = ObjectAnimator.ofFloat(button, "scaleY", 1f, 1.13f)
@@ -314,7 +318,9 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
                 }
 
                 override fun onAnimationEnd(animation: Animator) {
-                    val intent = Intent(currentActivity, SearchActivity::class.java)
+                    val intent = Intent(currentActivity, SearchActivity::class.java).apply {
+                        putExtra("isHomeSearch", false)
+                    }
                     currentActivity.startActivityForResult(intent, 10087)
                     currentActivity.overridePendingTransition(R.anim.fade_in, R.anim.fade_out)
                 }
@@ -379,4 +385,8 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
             searchRecordAdapter.add(SearchRecordBean().apply { isDelete = true })
         }
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+    }
 }

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

@@ -258,6 +258,7 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
                 binding.editWeb.selectAll()
                 binding.ivShare.visibility = View.INVISIBLE
                 SearchActivity.searchContent = binding.editWeb.text.toString()
+
                 SearchActivity.startActivityWithButtonExpandAnimation(this, binding.clSearch, 0)
                 v.clearFocus()
             }