gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-07-06 23:47:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
Horis 2023-02-13 15:04:14 +08:00
parent cc22d7cfdb
commit c9f41ef0cf
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt
View File

@ -75,7 +75,6 @@ class SearchContentActivity :
searchView.onActionViewExpanded()
searchView.isSubmitButtonEnabled = true
searchView.queryHint = getString(R.string.search)
searchView.clearFocus()
searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
override fun onQueryTextSubmit(query: String): Boolean {
startContentSearch(query.trim())
@ -153,12 +152,12 @@ class SearchContentActivity :
viewModel.lastQuery = query
searchJob = launch {
kotlin.runCatching {
binding.refreshProgressBar.isAutoLoading = true
binding.fbStop.visible()
withContext(IO) {
appDb.bookChapterDao.getChapterList(viewModel.bookUrl)
}.forEach { bookChapter ->
ensureActive()
binding.refreshProgressBar.isAutoLoading = true
binding.fbStop.visible()
val searchResults = withContext(IO) {
if (isLocalBook || viewModel.cacheChapterNames.contains(bookChapter.getFileName())) {
viewModel.searchChapter(query, bookChapter)
@ -171,24 +170,19 @@ class SearchContentActivity :
ensureActive()
if (searchResults != null && searchResults.isNotEmpty()) {
viewModel.searchResultList.addAll(searchResults)
binding.refreshProgressBar.isAutoLoading = false
adapter.addItems(searchResults)
}
}
binding.refreshProgressBar.isAutoLoading = false
if (viewModel.searchResultCounts == 0) {
val noSearchResult =
SearchResult(resultText = getString(R.string.search_content_empty))
adapter.addItem(noSearchResult)
}
}.onFailure {
binding.fbStop.invisible()
binding.refreshProgressBar.isAutoLoading = false
AppLog.put("全文搜索出错\n${it.localizedMessage}", it)
}.onSuccess {
binding.fbStop.invisible()
binding.refreshProgressBar.isAutoLoading = false
}
binding.fbStop.invisible()
binding.refreshProgressBar.isAutoLoading = false
}
}
}