This commit is contained in:
Horis
2024-07-10 06:16:41 +08:00
parent f0bea97471
commit 153c88d4a4
3 changed files with 7 additions and 4 deletions
@@ -2,6 +2,7 @@ package io.legado.app.ui.book.explore
import android.os.Bundle import android.os.Bundle
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.core.os.bundleOf
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import io.legado.app.R import io.legado.app.R
import io.legado.app.base.VMBaseActivity import io.legado.app.base.VMBaseActivity
@@ -35,7 +36,7 @@ class ExploreShowActivity : VMBaseActivity<ActivityExploreShowBinding, ExploreSh
loadMoreView.error(it) loadMoreView.error(it)
} }
viewModel.upAdapterLiveData.observe(this) { viewModel.upAdapterLiveData.observe(this) {
adapter.notifyItemRangeChanged(0, adapter.itemCount, it) adapter.notifyItemRangeChanged(0, adapter.itemCount, bundleOf(it to null))
} }
} }
@@ -10,6 +10,7 @@ import android.view.View.VISIBLE
import android.widget.TextView import android.widget.TextView
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
import androidx.core.os.bundleOf
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
@@ -397,7 +398,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
override fun observeLiveBus() { override fun observeLiveBus() {
viewModel.upAdapterLiveData.observe(this) { viewModel.upAdapterLiveData.observe(this) {
adapter.notifyItemRangeChanged(0, adapter.itemCount) adapter.notifyItemRangeChanged(0, adapter.itemCount, bundleOf(it to null))
} }
viewModel.searchFinishLiveData.observe(this) { isEmpty -> viewModel.searchFinishLiveData.observe(this) { isEmpty ->
if (!isEmpty || viewModel.searchScope.isAll()) return@observe if (!isEmpty || viewModel.searchScope.isAll()) return@observe
@@ -231,10 +231,11 @@ fun <T> Flow<T>.flowWithLifecycleAndDatabaseChangeFirst(
minActiveState: Lifecycle.State = Lifecycle.State.STARTED, minActiveState: Lifecycle.State = Lifecycle.State.STARTED,
table: String table: String
): Flow<T> = callbackFlow { ): Flow<T> = callbackFlow {
val channel = appDb.invalidationTrackerFlow(table, emitInitialState = false) val isActive = lifecycle.currentState.isAtLeast(minActiveState)
val channel = appDb.invalidationTrackerFlow(table, emitInitialState = isActive)
.conflate() .conflate()
.produceIn(this) .produceIn(this)
if (!lifecycle.currentState.isAtLeast(minActiveState)) { if (!isActive) {
send(first()) send(first())
} }
lifecycle.repeatOnLifecycle(minActiveState) { lifecycle.repeatOnLifecycle(minActiveState) {