@@ -186,7 +186,7 @@ class CacheActivity : VMBaseActivity<ActivityCacheBookBinding, CacheViewModel>()
private fun initBookData() {
booksFlowJob?.cancel()
booksFlowJob = launch {
- appDb.bookDao.flowByGroup(groupId).conflate().map { books ->
+ appDb.bookDao.flowByGroup(groupId).map { books ->
val booksDownload = books.filter {
!it.isAudio
}
@@ -198,7 +198,7 @@ class BookshelfManageActivity :
val bookSort = AppConfig.getBookSortByGroupId(viewModel.groupId)
- appDb.bookDao.flowByGroup(viewModel.groupId).conflate().map { list ->
+ appDb.bookDao.flowByGroup(viewModel.groupId).map { list ->
when (bookSort) {
1 -> list.sortedByDescending {
it.latestChapterTime
@@ -279,7 +279,7 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
else -> {
appDb.bookSourceDao.flowSearch(searchKey)
- }.conflate().map { data ->
+ }.map { data ->
if (sortAscending) {
when (sort) {
BookSourceSort.Weight -> data.sortedBy { it.weight }
@@ -134,7 +134,7 @@ class BooksFragment() : BaseFragment(R.layout.fragment_books),
private fun upRecyclerData() {
- appDb.bookDao.flowByGroup(groupId).conflate().map { list ->
+ appDb.bookDao.flowByGroup(groupId).map { list ->
//排序
1 -> list.sortedByDescending { it.latestChapterTime }
@@ -134,7 +134,7 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
when (AppConfig.getBookSortByGroupId(groupId)) {