Commit ee2ba7b2 authored by wanglei's avatar wanglei

...

parent 896f5b63
...@@ -51,16 +51,17 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -51,16 +51,17 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
private fun searchJump(content: String, newBrowser: Boolean = false) { private fun searchJump(content: String, newBrowser: Boolean = false) {
var link = "" var link = ""
LinkSearchUtils.handleInput(content, loadUrl = { LinkSearchUtils.handleInput(content, loadUrl = {
link = it link = it
}, performSearch = { }, performSearch = {
link = LinkSearchUtils.getSpSearchAction(content) link = LinkSearchUtils.getSpSearchAction(content)
}) })
SpBeanUtils.addSpBean(SEARCH_RECORD_SP_KEY, SearchRecordBean(content))
if (isHomeSearch || newBrowser) { if (isHomeSearch || newBrowser) {
startActivity(Intent(this, WebBrowserActivity::class.java).apply { startActivity(Intent(this, WebBrowserActivity::class.java).apply {
putExtra("url", link) putExtra("url", link)
addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
}) })
} else { } else {
RxBus.get().post(CHANGE_SEARCH_URL, link) RxBus.get().post(CHANGE_SEARCH_URL, link)
...@@ -142,7 +143,10 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -142,7 +143,10 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
binding.editWeb.setOnEditorActionListener { v, actionId, event -> binding.editWeb.setOnEditorActionListener { v, actionId, event ->
if (actionId == EditorInfo.IME_ACTION_DONE || (event.keyCode == KeyEvent.KEYCODE_ENTER)) { if (actionId == EditorInfo.IME_ACTION_DONE || (event.keyCode == KeyEvent.KEYCODE_ENTER)) {
val content = binding.editWeb val content = binding.editWeb.text.toString()
if (content.isNotEmpty()) {
searchJump(content)
}
} }
// 返回 true 表示你已经处理了这个事件 // 返回 true 表示你已经处理了这个事件
...@@ -179,19 +183,9 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -179,19 +183,9 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
} }
binding.tvSearch.setOnClickListener { binding.tvSearch.setOnClickListener {
val content = binding.editWeb.text.toString() val content = binding.editWeb.text.toString()
var link = "" if (content.isNotEmpty()) {
LinkSearchUtils.handleInput(content, loadUrl = { searchJump(content)
link = it }
}, performSearch = {
link = LinkSearchUtils.getSpSearchAction(content)
})
SpBeanUtils.addSpBean(SEARCH_RECORD_SP_KEY, SearchRecordBean(content))
startActivity(Intent(this, WebBrowserActivity::class.java).apply {
putExtra("url", link)
addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
})
finish()
} }
arrayOf(binding.tvWww, binding.tvM, binding.tvWap, binding.tvDian, binding.tvXieGang).forEach { arrayOf(binding.tvWww, binding.tvM, binding.tvWap, binding.tvDian, binding.tvXieGang).forEach {
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginHorizontal="15dp" android:layout_marginHorizontal="15dp"
android:layout_marginVertical="10dp"
android:background="@drawable/bg_stroke_070709" android:background="@drawable/bg_stroke_070709"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
......
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