Commit 8f439292 authored by wanglei's avatar wanglei

...

parent 04ccaed6
...@@ -11,7 +11,7 @@ android { ...@@ -11,7 +11,7 @@ android {
compileSdk = 34 compileSdk = 34
defaultConfig { defaultConfig {
applicationId = "com.base.browserwhite" applicationId = "com.kk.cleanmaster.file.cleanmaster.master"
minSdk = 24 minSdk = 24
targetSdk = 34 targetSdk = 34
versionCode = 1 versionCode = 1
......
{ {
"project_info": { "project_info": {
"project_number": "658253136135", "project_number": "52701079012",
"project_id": "mi-broer-ivacy-34fe0", "project_id": "cleanmasterfile",
"storage_bucket": "gi-owser-ivacy-34fe0.appspot.com" "storage_bucket": "cleanmasterfile.appspot.com"
}, },
"client": [ "client": [
{ {
"client_info": { "client_info": {
"mobilesdk_app_id": "1:958255155135:android:497c4ecf6112282ae12722", "mobilesdk_app_id": "1:52701079012:android:457119c4f48cba94fa93f1",
"android_client_info": { "android_client_info": {
"package_name": "com.base.browserwhite" "package_name": "com.kk.cleanmaster.file.cleanmaster.master"
} }
}, },
"oauth_client": [], "oauth_client": [],
"api_key": [ "api_key": [
{ {
"current_key": "AIzaSyCgmUTWPllAZbbOrxLcw1uIpiCLkU3JfmE" "current_key": "AIzaSyDr_7jwK1_HHUX6gW--AiPvN4HABddApNk"
} }
], ],
"services": { "services": {
......
...@@ -93,10 +93,11 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -93,10 +93,11 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION) addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
}) })
} else { } else {
LogEx.logDebug(TAG, "bbbbbbb")
RxBus.get().post(CHANGE_SEARCH_URL, link) RxBus.get().post(CHANGE_SEARCH_URL, link)
setResult(10087) setResult(10087)
} }
RxBus.get().post(Constants.RESET_SEARCH_VIEW, 1) // RxBus.get().post(Constants.RESET_SEARCH_VIEW, 1)
finish() finish()
overridePendingTransition(0, 0) overridePendingTransition(0, 0)
} }
...@@ -149,6 +150,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -149,6 +150,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
} }
} }
@SuppressLint("SetTextI18n")
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
...@@ -176,6 +178,13 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -176,6 +178,13 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
binding.ivClear.visibility = View.VISIBLE binding.ivClear.visibility = View.VISIBLE
binding.tvSearch.visibility = View.VISIBLE binding.tvSearch.visibility = View.VISIBLE
LinkSearchUtils.handleInput(it.toString(),
loadUrl = {
binding.tvSearch.text = "Go"
}, performSearch = {
binding.tvSearch.text = "Search"
})
searchAdapter.submitList(listOf()) searchAdapter.submitList(listOf())
querySearchTip(it.toString()) querySearchTip(it.toString())
} }
...@@ -201,7 +210,6 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -201,7 +210,6 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
searchContent = "" searchContent = ""
} }
binding.editWeb.requestFocus()
binding.editWeb.postDelayed({ binding.editWeb.postDelayed({
binding.editWeb.requestFocus() binding.editWeb.requestFocus()
binding.editWeb.selectAll() binding.editWeb.selectAll()
......
...@@ -84,10 +84,9 @@ ...@@ -84,10 +84,9 @@
android:background="@null" android:background="@null"
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="Search or enter website address" android:hint="Search or enter website address"
android:imeOptions="actionDone"
android:paddingHorizontal="5dp" android:paddingHorizontal="5dp"
android:singleLine="true" android:singleLine="true"
android:textColorHint="#858587" android:textColor="#858587"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintEnd_toStartOf="@id/fl_refresh" app:layout_constraintEnd_toStartOf="@id/fl_refresh"
app:layout_constraintStart_toEndOf="@id/fl_search_engine" app:layout_constraintStart_toEndOf="@id/fl_search_engine"
......
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