Commit acaacd1f authored by wanglei's avatar wanglei

...

parent 83fbf64c
......@@ -3,5 +3,6 @@ package com.base.browserwhite.help;
public class Constants {
public static final String CHANGE_SEARCH_TYPE="change_search_type";
public static final String CHANGE_SEARCH_TYPE = "change_search_type";
public static final String CHANGE_SEARCH_URL = "change_search_url";
}
......@@ -128,6 +128,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
binding.tvCancel.visibility = View.GONE
binding.tvSearch.visibility = View.VISIBLE
binding.ivClear.visibility = View.VISIBLE
searchContent = ""
}
......
package com.base.browserwhite.ui.activity.webbrowser
import android.annotation.SuppressLint
import android.content.Intent
import android.graphics.Color
import android.view.KeyEvent
......@@ -19,6 +20,8 @@ import com.base.browserwhite.bean.ConstObject
import com.base.browserwhite.bean.ConstObject.GOOGLE
import com.base.browserwhite.bean.ConstObject.searchEngineSp
import com.base.browserwhite.databinding.ActivityWebBrowserBinding
import com.base.browserwhite.help.Constants
import com.base.browserwhite.help.RxBus
import com.base.browserwhite.ui.activity.BaseActivity
import com.base.browserwhite.ui.activity.bookmark.BookmarkActivity
import com.base.browserwhite.ui.activity.bookmark.BookmarkEditActivity
......@@ -38,6 +41,8 @@ import com.base.browserwhite.utils.LinkSearchUtils.getYandexSearch
import com.base.browserwhite.utils.LinkSearchUtils.handleInput
import com.base.browserwhite.utils.SpBeanUtils
import com.base.browserwhite.utils.SpBeanUtils.BOOKMARK_SP_KEY
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.core.Observable
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
......@@ -50,9 +55,11 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
private val fragmentList = arrayListOf<Fragment>()
private var currentFragment: WebViewFragment? = null
private var searchAction: (context: String) -> String = ::getSpSearchAction
private var mChangeSearchUrl: Observable<String>? = null
var from: String = ""
@SuppressLint("CheckResult")
override fun initView() {
BarUtils.setStatusBarLightMode(this, true)
BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
......@@ -96,6 +103,11 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
}
mChangeSearchUrl = RxBus.get().register(Constants.CHANGE_SEARCH_URL, String::class.java)
mChangeSearchUrl?.observeOn(AndroidSchedulers.mainThread())?.subscribe { t ->
}
addNewWebSite(url)
}
......@@ -263,4 +275,12 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
}
}
override fun onDestroy() {
super.onDestroy()
mChangeSearchUrl?.let {
RxBus.get().unregister(Constants.CHANGE_SEARCH_URL, it)
}
}
}
\ No newline at end of file
......@@ -32,7 +32,6 @@ import com.base.browserwhite.help.Constants
import com.base.browserwhite.help.RxBus
import com.base.browserwhite.ui.activity.about.AboutActivity
import com.base.browserwhite.ui.activity.feedback.FeedbackActivity
import com.base.browserwhite.ui.views.DialogViews.showWebBrowserMoreDialog
import com.base.browserwhite.utils.ActivityLauncher
import com.base.browserwhite.utils.AppPreferences
import com.base.browserwhite.utils.RoleManagerUtils.isDefaultBrowser
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment