This commit is contained in:
kunfei
2022-02-24 21:25:10 +08:00
parent bf24a096cb
commit 5793f98a6d
9 changed files with 24 additions and 22 deletions
@@ -46,13 +46,14 @@ abstract class DiffRecyclerAdapter<ITEM, VB : ViewBinding>(protected val context
recyclerView.adapter = this recyclerView.adapter = this
} }
/**
* items与上一次提交的对象必须不同,如果指向相同地址即使数据变化也不会刷新
*/
@Synchronized @Synchronized
fun setItems(items: List<ITEM>?) { fun setItems(items: List<ITEM>?) {
kotlin.runCatching { kotlin.runCatching {
asyncListDiffer.submitList(items) if (items == null) {
asyncListDiffer.submitList(null)
} else {
asyncListDiffer.submitList(ArrayList(items))
}
} }
} }
@@ -15,6 +15,7 @@ import io.legado.app.utils.applyTint
import io.legado.app.utils.setLayout import io.legado.app.utils.setLayout
import io.legado.app.utils.viewbindingdelegate.viewBinding import io.legado.app.utils.viewbindingdelegate.viewBinding
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
/** /**
@@ -67,6 +68,7 @@ class ChangeCoverDialog() : BaseDialogFragment(R.layout.dialog_change_cover),
private fun initData() { private fun initData() {
launch { launch {
viewModel.dataFlow viewModel.dataFlow
.conflate()
.collect { .collect {
adapter.setItems(it) adapter.setItems(it)
delay(1000) delay(1000)
@@ -18,7 +18,6 @@ import kotlinx.coroutines.ExecutorCoroutineDispatcher
import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.flowOn
import java.util.* import java.util.*
import java.util.concurrent.Executors import java.util.concurrent.Executors
@@ -56,8 +55,7 @@ class ChangeCoverViewModel(application: Application) : BaseViewModel(application
searchBooks.clear() searchBooks.clear()
searchSuccess = null searchSuccess = null
} }
}.conflate() }.flowOn(IO)
.flowOn(IO)
@Volatile @Volatile
private var searchIndex = -1 private var searchIndex = -1
@@ -29,6 +29,7 @@ import io.legado.app.ui.widget.recycler.VerticalDivider
import io.legado.app.utils.* import io.legado.app.utils.*
import io.legado.app.utils.viewbindingdelegate.viewBinding import io.legado.app.utils.viewbindingdelegate.viewBinding
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@@ -145,6 +146,7 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_
} }
launch { launch {
viewModel.searchDataFlow viewModel.searchDataFlow
.conflate()
.collect { .collect {
adapter.setItems(it) adapter.setItems(it)
delay(1000) delay(1000)
@@ -22,7 +22,6 @@ import kotlinx.coroutines.ExecutorCoroutineDispatcher
import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import splitties.init.appCtx import splitties.init.appCtx
@@ -55,11 +54,11 @@ class ChangeBookSourceViewModel(application: Application) : BaseViewModel(applic
searchBook.name.contains(screenKey) -> searchBooks.add(searchBook) searchBook.name.contains(screenKey) -> searchBooks.add(searchBook)
else -> return else -> return
} }
trySend(searchBooks) trySend(arrayOf(searchBooks))
} }
override fun upAdapter() { override fun upAdapter() {
trySend(searchBooks) trySend(arrayOf(searchBooks))
} }
} }
@@ -67,7 +66,7 @@ class ChangeBookSourceViewModel(application: Application) : BaseViewModel(applic
getDbSearchBooks().let { getDbSearchBooks().let {
searchBooks.clear() searchBooks.clear()
searchBooks.addAll(it) searchBooks.addAll(it)
trySend(searchBooks) trySend(arrayOf(searchBooks))
} }
if (searchBooks.size <= 1) { if (searchBooks.size <= 1) {
@@ -77,8 +76,7 @@ class ChangeBookSourceViewModel(application: Application) : BaseViewModel(applic
awaitClose { awaitClose {
searchCallback = null searchCallback = null
} }
}.conflate() }.map {
.map {
searchBooks.sortedBy { it.originOrder } searchBooks.sortedBy { it.originOrder }
}.flowOn(IO) }.flowOn(IO)
@@ -31,6 +31,7 @@ import io.legado.app.ui.widget.recycler.VerticalDivider
import io.legado.app.utils.* import io.legado.app.utils.*
import io.legado.app.utils.viewbindingdelegate.viewBinding import io.legado.app.utils.viewbindingdelegate.viewBinding
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@@ -177,6 +178,7 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c
} }
launch { launch {
viewModel.searchDataFlow viewModel.searchDataFlow
.conflate()
.collect { .collect {
searchBookAdapter.setItems(it) searchBookAdapter.setItems(it)
delay(1000) delay(1000)
@@ -24,7 +24,6 @@ import kotlinx.coroutines.ExecutorCoroutineDispatcher
import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import splitties.init.appCtx import splitties.init.appCtx
@@ -83,8 +82,7 @@ class ChangeChapterSourceViewModel(application: Application) : BaseViewModel(app
awaitClose { awaitClose {
searchCallback = null searchCallback = null
} }
}.conflate() }.map {
.map {
searchBooks.sortedBy { it.originOrder } searchBooks.sortedBy { it.originOrder }
}.flowOn(IO) }.flowOn(IO)
@@ -30,6 +30,7 @@ import io.legado.app.utils.viewbindingdelegate.viewBinding
import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@@ -197,6 +198,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
private fun initData() { private fun initData() {
launch { launch {
viewModel.searchDataFlow viewModel.searchDataFlow
.conflate()
.collect { .collect {
adapter.setItems(it) adapter.setItems(it)
delay(1000) delay(1000)
@@ -10,7 +10,6 @@ import io.legado.app.data.entities.SearchKeyword
import io.legado.app.model.webBook.SearchModel import io.legado.app.model.webBook.SearchModel
import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.conflate
class SearchViewModel(application: Application) : BaseViewModel(application) { class SearchViewModel(application: Application) : BaseViewModel(application) {
private val searchModel = SearchModel(viewModelScope) private val searchModel = SearchModel(viewModelScope)
@@ -48,7 +47,7 @@ class SearchViewModel(application: Application) : BaseViewModel(application) {
awaitClose { awaitClose {
searchModel.unRegisterCallback() searchModel.unRegisterCallback()
} }
}.conflate() }
/** /**
* 开始搜索 * 开始搜索