kunfei hace 4 años
padre
commit
bece7b4504

+ 2 - 2
app/src/main/java/io/legado/app/model/webBook/SearchModel.kt

@@ -128,7 +128,7 @@ class SearchModel(private val scope: CoroutineScope) {
         if (searchIndex >= bookSourceList.lastIndex
             + min(bookSourceList.size, threadCount)
         ) {
-            callBack?.onSearchFinish()
+            callBack?.onSearchFinish(searchBooks.isEmpty())
         }
     }
 
@@ -214,7 +214,7 @@ class SearchModel(private val scope: CoroutineScope) {
     interface CallBack {
         fun onSearchStart()
         fun onSearchSuccess(searchBooks: ArrayList<SearchBook>)
-        fun onSearchFinish()
+        fun onSearchFinish(isEmpty: Boolean)
         fun onSearchCancel()
     }
 

+ 1 - 5
app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt

@@ -17,7 +17,6 @@ class SearchViewModel(application: Application) : BaseViewModel(application) {
     private val searchModel = SearchModel(viewModelScope)
     var isSearchLiveData = MutableLiveData<Boolean>()
     var searchKey: String = ""
-    var isLoading = false
     private var searchID = 0L
 
     val searchDataFlow = callbackFlow {
@@ -25,21 +24,18 @@ class SearchViewModel(application: Application) : BaseViewModel(application) {
         val callback = object : SearchModel.CallBack {
             override fun onSearchStart() {
                 isSearchLiveData.postValue(true)
-                isLoading = true
             }
 
             override fun onSearchSuccess(searchBooks: ArrayList<SearchBook>) {
                 trySend(ArrayList(searchBooks))
             }
 
-            override fun onSearchFinish() {
+            override fun onSearchFinish(isEmpty: Boolean) {
                 isSearchLiveData.postValue(false)
-                isLoading = false
             }
 
             override fun onSearchCancel() {
                 isSearchLiveData.postValue(false)
-                isLoading = false
             }
         }