[修复] 修复了文件夹内没有书籍显示的问题 #509

app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment2.kt

@@ -249,16 +249,14 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
     }
 
     private fun initBooksData() {
-        if (groupId == BookGroup.Companion.IdRoot) {
+        if (groupId == BookGroup.IdRoot) {
             if (isAdded) {
                 binding.collTopBar.title = getString(R.string.bookshelf)
                 binding.refreshLayout.isEnabled = true
                 enableRefresh = true
             }
         } else {
-            bookGroups.firstOrNull {
+            bookGroups.firstOrNull { groupId == it.groupId }?.let {
-                groupId == it.groupId
-            }?.let {
                 binding.collTopBar.title = it.groupName
                 binding.refreshLayout.isEnabled = it.enableRefresh
                 enableRefresh = it.enableRefresh
@@ -266,11 +264,12 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
         }
         booksFlowJob?.cancel()
         booksFlowJob = viewLifecycleOwner.lifecycleScope.launch {
-            appDb.bookDao.flowByGroup(groupId).map { list ->
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                //排序
+                appDb.bookDao.flowByGroup(groupId)
+                    .map { list ->
                         val isDescending = AppConfig.bookshelfSortOrder == 1
-
                         val sortType = AppConfig.getBookSortByGroupId(groupId)
+
                         when (sortType) {
                             1 -> if (isDescending) list.sortedByDescending { it.latestChapterTime }
                             else list.sortedBy { it.latestChapterTime }
@@ -283,31 +282,31 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
                             3 -> if (isDescending) list.sortedByDescending { it.order }
                             else list.sortedBy { it.order }
 
-                    4 -> if (isDescending) list.sortedByDescending {
+                            4 -> if (isDescending)
-                        max(it.latestChapterTime, it.durChapterTime)
+                                list.sortedByDescending { max(it.latestChapterTime, it.durChapterTime) }
-                    } else list.sortedBy { max(it.latestChapterTime, it.durChapterTime) }
+                            else
+                                list.sortedBy { max(it.latestChapterTime, it.durChapterTime) }
 
                             5 -> if (isDescending)
                                 list.sortedWith { o1, o2 -> o2.author.cnCompare(o1.author) }
                             else
                                 list.sortedWith { o1, o2 -> o1.author.cnCompare(o2.author) }
 
-                    else -> if (isDescending) list.sortedByDescending { it.durChapterTime }
+                            else ->
+                                if (isDescending) list.sortedByDescending { it.durChapterTime }
                                 else list.sortedBy { it.durChapterTime }
                         }
+                    }
+                    .flowOn(Dispatchers.Default)
+                    .catch { AppLog.put("书架更新出错", it) }
+                    .collect { list ->
 
-            }.flowWithLifecycleAndDatabaseChangeFirst(
+                        books = list
-                viewLifecycleOwner.lifecycle,
-                Lifecycle.State.RESUMED,
-                AppDatabase.Companion.BOOK_TABLE_NAME
-            ).catch {
-                AppLog.put("书架更新出错", it)
-            }.conflate().flowOn(Dispatchers.Default).collect { list ->
-                if (view == null) return@collect
-                binding.emptyView.isGone = list.isNotEmpty()
-                binding.refreshLayout.isEnabled = enableRefresh && list.isNotEmpty()
                         booksAdapter.updateItems()
-                delay(500)
+                        val empty = getItemCount() > 0
+                        binding.emptyView.isGone = empty
+                        binding.refreshLayout.isEnabled = enableRefresh && empty
+                    }
             }
         }
     }