yusheng/QieKan-3.0
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

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

Browse Source
This commit is contained in:
HapeLee committed 2025-12-28 15:31:24 +08:00
1 parent 7849274fad
commit 841c3df172
1 file changed
+38 -39
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment2.kt
+38 -39
View File
@@ -249,16 +249,14 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
} }
private fun initBooksData() { private fun initBooksData() {
if (groupId == BookGroup.Companion.IdRoot) { if (groupId == BookGroup.IdRoot) {
if (isAdded) { if (isAdded) {
binding.collTopBar.title = getString(R.string.bookshelf) binding.collTopBar.title = getString(R.string.bookshelf)
binding.refreshLayout.isEnabled = true binding.refreshLayout.isEnabled = true
enableRefresh = true enableRefresh = true
} }
} else { } else {
bookGroups.firstOrNull { bookGroups.firstOrNull { groupId == it.groupId }?.let {
groupId == it.groupId
}?.let {
binding.collTopBar.title = it.groupName binding.collTopBar.title = it.groupName
binding.refreshLayout.isEnabled = it.enableRefresh binding.refreshLayout.isEnabled = it.enableRefresh
enableRefresh = it.enableRefresh enableRefresh = it.enableRefresh
@@ -266,48 +264,49 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
} }
booksFlowJob?.cancel() booksFlowJob?.cancel()
booksFlowJob = viewLifecycleOwner.lifecycleScope.launch { booksFlowJob = viewLifecycleOwner.lifecycleScope.launch {
appDb.bookDao.flowByGroup(groupId).map { list -> viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
//排序 appDb.bookDao.flowByGroup(groupId)
val isDescending = AppConfig.bookshelfSortOrder == 1 .map { list ->
val isDescending = AppConfig.bookshelfSortOrder == 1
val sortType = AppConfig.getBookSortByGroupId(groupId)
val sortType = AppConfig.getBookSortByGroupId(groupId) when (sortType) {
when (sortType) { 1 -> if (isDescending) list.sortedByDescending { it.latestChapterTime }
1 -> if (isDescending) list.sortedByDescending { it.latestChapterTime } else list.sortedBy { it.latestChapterTime }
else list.sortedBy { it.latestChapterTime }
2 -> if (isDescending) 2 -> if (isDescending)
list.sortedWith { o1, o2 -> o2.name.cnCompare(o1.name) } list.sortedWith { o1, o2 -> o2.name.cnCompare(o1.name) }
else else
list.sortedWith { o1, o2 -> o1.name.cnCompare(o2.name) } list.sortedWith { o1, o2 -> o1.name.cnCompare(o2.name) }
3 -> if (isDescending) list.sortedByDescending { it.order } 3 -> if (isDescending) list.sortedByDescending { it.order }
else list.sortedBy { 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) 5 -> if (isDescending)
list.sortedWith { o1, o2 -> o2.author.cnCompare(o1.author) } list.sortedWith { o1, o2 -> o2.author.cnCompare(o1.author) }
else else
list.sortedWith { o1, o2 -> o1.author.cnCompare(o2.author) } list.sortedWith { o1, o2 -> o1.author.cnCompare(o2.author) }
else -> if (isDescending) list.sortedByDescending { it.durChapterTime } else ->
else list.sortedBy { it.durChapterTime } 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, booksAdapter.updateItems()
Lifecycle.State.RESUMED, val empty = getItemCount() > 0
AppDatabase.Companion.BOOK_TABLE_NAME binding.emptyView.isGone = empty
).catch { binding.refreshLayout.isEnabled = enableRefresh && empty
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)
} }
} }
} }