YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

优化 #5422

Browse Source
This commit is contained in:
Horis
2025-09-20 09:36:55 +08:00
parent 8573eccfaf
commit 824092c926
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/utils/FlowExtensions.kt
+7 -3
View File
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.channelFlow import kotlinx.coroutines.flow.channelFlow
import kotlinx.coroutines.flow.conflate import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.firstOrNull
import kotlinx.coroutines.flow.flatMapMerge import kotlinx.coroutines.flow.flatMapMerge
import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
@@ -198,7 +198,9 @@ fun <T> Flow<T>.flowWithLifecycleFirst(
minActiveState: Lifecycle.State = Lifecycle.State.STARTED minActiveState: Lifecycle.State = Lifecycle.State.STARTED
): Flow<T> = callbackFlow { ): Flow<T> = callbackFlow {
if (!lifecycle.currentState.isAtLeast(minActiveState)) { if (!lifecycle.currentState.isAtLeast(minActiveState)) {
send(first()) firstOrNull()?.let {
send(it)
}
} }
lifecycle.repeatOnLifecycle(minActiveState) { lifecycle.repeatOnLifecycle(minActiveState) {
this@flowWithLifecycleFirst.collect { this@flowWithLifecycleFirst.collect {
@@ -244,7 +246,9 @@ fun <T> Flow<T>.flowWithLifecycleAndDatabaseChangeFirst(
.onEach { update++ } .onEach { update++ }
.produceIn(this) .produceIn(this)
if (!isActive) { if (!isActive) {
send(first()) firstOrNull()?.let {
send(it)
}
} }
lifecycle.repeatOnLifecycle(minActiveState) { lifecycle.repeatOnLifecycle(minActiveState) {
if (update == 0) { if (update == 0) {