From 29f8f6be2036ea9fda1969a28a46413da4f6c2e8 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Fri, 25 Mar 2022 17:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/search/SearchActivity.kt      | 24 ++++++++++++++++++-
 .../app/ui/book/search/SearchViewModel.kt     |  2 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
index 371a55657..43e6baf65 100644
--- a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
@@ -22,6 +22,7 @@ import io.legado.app.data.appDb
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.SearchKeyword
 import io.legado.app.databinding.ActivityBookSearchBinding
+import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.theme.*
 import io.legado.app.ui.book.info.BookInfoActivity
 import io.legado.app.ui.book.source.manage.BookSourceActivity
@@ -71,6 +72,22 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
         initOtherView()
         initData()
         receiptIntent(intent)
+        viewModel.searchFinishCallback = {
+            if (it) {
+                val searchGroup = getPrefString("searchGroup")
+                if (!searchGroup.isNullOrEmpty()) {
+                    alert(R.string.empty) {
+                        setMessage("${searchGroup}分组搜索结果为空,是否切换到全部分组")
+                        cancelButton()
+                        okButton {
+                            putPrefString("searchGroup", "")
+                            viewModel.searchKey = ""
+                            viewModel.search(searchView.query.toString())
+                        }
+                    }
+                }
+            }
+        }
     }
 
     override fun onNewIntent(data: Intent?) {
@@ -126,6 +143,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
                 searchView.clearFocus()
                 query?.let {
                     viewModel.saveSearchKey(query)
+                    viewModel.searchKey = ""
                     viewModel.search(it)
                 }
                 openOrCloseHistory(false)
@@ -235,7 +253,10 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
      * 滚动到底部事件
      */
     private fun scrollToBottom() {
-        if (!viewModel.isLoading && viewModel.searchKey.isNotEmpty() && loadMoreView.hasMore) {
+        if (viewModel.isSearchLiveData.value == false
+            && viewModel.searchKey.isNotEmpty()
+            && loadMoreView.hasMore
+        ) {
             viewModel.search("")
         }
     }
@@ -371,6 +392,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
         viewModel.deleteHistory(searchKeyword)
     }
 
+
     companion object {
 
         fun start(context: Context, key: String?) {
diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt
index f28d0f205..0f7609a8f 100644
--- a/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt
@@ -15,6 +15,7 @@ import kotlinx.coroutines.flow.flowOn
 
 class SearchViewModel(application: Application) : BaseViewModel(application) {
     private val searchModel = SearchModel(viewModelScope)
+    var searchFinishCallback: ((isEmpty: Boolean) -> Unit)? = null
     var isSearchLiveData = MutableLiveData<Boolean>()
     var searchKey: String = ""
     private var searchID = 0L
@@ -32,6 +33,7 @@ class SearchViewModel(application: Application) : BaseViewModel(application) {
 
             override fun onSearchFinish(isEmpty: Boolean) {
                 isSearchLiveData.postValue(false)
+                searchFinishCallback?.invoke(isEmpty)
             }
 
             override fun onSearchCancel() {