kunfei 3 anni fa
parent
commit
6342a48ee7

+ 1 - 1
app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt

@@ -186,7 +186,7 @@ class CacheActivity : VMBaseActivity<ActivityCacheBookBinding, CacheViewModel>()
     private fun initBookData() {
     private fun initBookData() {
         booksFlowJob?.cancel()
         booksFlowJob?.cancel()
         booksFlowJob = launch {
         booksFlowJob = launch {
-            appDb.bookDao.flowByGroup(groupId).conflate().map { books ->
+            appDb.bookDao.flowByGroup(groupId).map { books ->
                 val booksDownload = books.filter {
                 val booksDownload = books.filter {
                     !it.isAudio
                     !it.isAudio
                 }
                 }

+ 1 - 1
app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageActivity.kt

@@ -198,7 +198,7 @@ class BookshelfManageActivity :
         booksFlowJob?.cancel()
         booksFlowJob?.cancel()
         booksFlowJob = launch {
         booksFlowJob = launch {
             val bookSort = AppConfig.getBookSortByGroupId(viewModel.groupId)
             val bookSort = AppConfig.getBookSortByGroupId(viewModel.groupId)
-            appDb.bookDao.flowByGroup(viewModel.groupId).conflate().map { list ->
+            appDb.bookDao.flowByGroup(viewModel.groupId).map { list ->
                 when (bookSort) {
                 when (bookSort) {
                     1 -> list.sortedByDescending {
                     1 -> list.sortedByDescending {
                         it.latestChapterTime
                         it.latestChapterTime

+ 1 - 1
app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt

@@ -279,7 +279,7 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
                 else -> {
                 else -> {
                     appDb.bookSourceDao.flowSearch(searchKey)
                     appDb.bookSourceDao.flowSearch(searchKey)
                 }
                 }
-            }.conflate().map { data ->
+            }.map { data ->
                 if (sortAscending) {
                 if (sortAscending) {
                     when (sort) {
                     when (sort) {
                         BookSourceSort.Weight -> data.sortedBy { it.weight }
                         BookSourceSort.Weight -> data.sortedBy { it.weight }

+ 1 - 1
app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt

@@ -134,7 +134,7 @@ class BooksFragment() : BaseFragment(R.layout.fragment_books),
     private fun upRecyclerData() {
     private fun upRecyclerData() {
         booksFlowJob?.cancel()
         booksFlowJob?.cancel()
         booksFlowJob = launch {
         booksFlowJob = launch {
-            appDb.bookDao.flowByGroup(groupId).conflate().map { list ->
+            appDb.bookDao.flowByGroup(groupId).map { list ->
                 //排序
                 //排序
                 when (bookSort) {
                 when (bookSort) {
                     1 -> list.sortedByDescending { it.latestChapterTime }
                     1 -> list.sortedByDescending { it.latestChapterTime }

+ 1 - 1
app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BookshelfFragment2.kt

@@ -134,7 +134,7 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
         }
         }
         booksFlowJob?.cancel()
         booksFlowJob?.cancel()
         booksFlowJob = launch {
         booksFlowJob = launch {
-            appDb.bookDao.flowByGroup(groupId).conflate().map { list ->
+            appDb.bookDao.flowByGroup(groupId).map { list ->
                 //排序
                 //排序
                 when (AppConfig.getBookSortByGroupId(groupId)) {
                 when (AppConfig.getBookSortByGroupId(groupId)) {
                     1 -> list.sortedByDescending {
                     1 -> list.sortedByDescending {