Horis 2 лет назад
Родитель
Сommit
153c88d4a4

+ 2 - 1
app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt

@@ -2,6 +2,7 @@ package io.legado.app.ui.book.explore
 
 import android.os.Bundle
 import androidx.activity.viewModels
+import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
@@ -35,7 +36,7 @@ class ExploreShowActivity : VMBaseActivity<ActivityExploreShowBinding, ExploreSh
             loadMoreView.error(it)
         }
         viewModel.upAdapterLiveData.observe(this) {
-            adapter.notifyItemRangeChanged(0, adapter.itemCount, it)
+            adapter.notifyItemRangeChanged(0, adapter.itemCount, bundleOf(it to null))
         }
     }
 

+ 2 - 1
app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt

@@ -10,6 +10,7 @@ import android.view.View.VISIBLE
 import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.appcompat.widget.SearchView
+import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -397,7 +398,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
 
     override fun observeLiveBus() {
         viewModel.upAdapterLiveData.observe(this) {
-            adapter.notifyItemRangeChanged(0, adapter.itemCount)
+            adapter.notifyItemRangeChanged(0, adapter.itemCount, bundleOf(it to null))
         }
         viewModel.searchFinishLiveData.observe(this) { isEmpty ->
             if (!isEmpty || viewModel.searchScope.isAll()) return@observe

+ 3 - 2
app/src/main/java/io/legado/app/utils/FlowExtensions.kt

@@ -231,10 +231,11 @@ fun <T> Flow<T>.flowWithLifecycleAndDatabaseChangeFirst(
     minActiveState: Lifecycle.State = Lifecycle.State.STARTED,
     table: String
 ): Flow<T> = callbackFlow {
-    val channel = appDb.invalidationTrackerFlow(table, emitInitialState = false)
+    val isActive = lifecycle.currentState.isAtLeast(minActiveState)
+    val channel = appDb.invalidationTrackerFlow(table, emitInitialState = isActive)
         .conflate()
         .produceIn(this)
-    if (!lifecycle.currentState.isAtLeast(minActiveState)) {
+    if (!isActive) {
         send(first())
     }
     lifecycle.repeatOnLifecycle(minActiveState) {