gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-09-01 09:34:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kunfei 2023-08-02 22:34:32 +08:00
commit f543d3429e
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/io/legado/app/model/webBook/SearchModel.kt
View File

@ -13,6 +13,7 @@ import io.legado.app.utils.getPrefBoolean
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.ExecutorCoroutineDispatcher import kotlinx.coroutines.ExecutorCoroutineDispatcher
import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.ensureActive
import kotlinx.coroutines.isActive import kotlinx.coroutines.isActive
import splitties.init.appCtx import splitties.init.appCtx
import java.util.concurrent.Executors import java.util.concurrent.Executors
@ -76,23 +77,24 @@ class SearchModel(private val scope: CoroutineScope, private val callBack: CallB
} }
searchIndex++ searchIndex++
val source = bookSourceList[searchIndex] val source = bookSourceList[searchIndex]
searchPool?.let { searchPool -> val searchPool = searchPool ?: return
val task = WebBook.searchBook( val task = WebBook.searchBook(
scope, scope,
source, source,
searchKey, searchKey,
searchPage, searchPage,
context = searchPool, context = searchPool,
executeContext = searchPool executeContext = searchPool
).timeout(30000L) ).timeout(30000L)
.onSuccess { .onSuccess {
onSuccess(searchId, it) ensureActive()
} onSuccess(searchId, it)
.onFinally { }
onFinally(searchId) .onFinally {
} ensureActive()
tasks.add(task) onFinally(searchId)
} }
tasks.add(task)
} }
@Synchronized @Synchronized

6
app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
View File

@ -282,16 +282,14 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
private fun receiptIntent(intent: Intent? = null) { private fun receiptIntent(intent: Intent? = null) {
val searchScope = intent?.getStringExtra("searchScope") val searchScope = intent?.getStringExtra("searchScope")
searchScope?.let { searchScope?.let {
viewModel.searchScope.update(searchScope) viewModel.searchScope.update(searchScope, false)
} }
val key = intent?.getStringExtra("key") val key = intent?.getStringExtra("key")
if (key.isNullOrBlank()) { if (key.isNullOrBlank()) {
searchView.findViewById<TextView>(androidx.appcompat.R.id.search_src_text) searchView.findViewById<TextView>(androidx.appcompat.R.id.search_src_text)
.requestFocus() .requestFocus()
} else { } else {
searchView.post { searchView.setQuery(key, true)
searchView.setQuery(key, true)
}
} }
} }

4
app/src/main/java/io/legado/app/ui/book/search/SearchScope.kt
View File

@ -31,9 +31,9 @@ data class SearchScope(private var scope: String) {
val stateLiveData = MutableLiveData(scope) val stateLiveData = MutableLiveData(scope)
fun update(scope: String) { fun update(scope: String, postValue: Boolean = true) {
this.scope = scope this.scope = scope
stateLiveData.postValue(scope) if (postValue) stateLiveData.postValue(scope)
save() save()
} }