主页动画

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

@@ -203,50 +203,47 @@ class BooksFragment() : BaseFragment(R.layout.fragment_books),
     private fun upRecyclerData() {
         booksFlowJob?.cancel()
         booksFlowJob = viewLifecycleOwner.lifecycleScope.launch {
-            appDb.bookDao.flowByGroup(groupId).map { list ->
-                //排序
 
-                val isDescending = AppConfig.bookshelfSortOrder == 1
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
 
-                when (bookSort) {
+                appDb.bookDao.flowByGroup(groupId)
-                    1 -> if (isDescending) list.sortedByDescending { it.latestChapterTime }
+                    .map { list ->
-                    else list.sortedBy { it.latestChapterTime }
+                        val isDescending = AppConfig.bookshelfSortOrder == 1
 
-                    2 -> if (isDescending)
+                        when (bookSort) {
-                        list.sortedWith { o1, o2 -> o2.name.cnCompare(o1.name) }
+                            1 -> if (isDescending) list.sortedByDescending { it.latestChapterTime }
-                    else
+                            else list.sortedBy { it.latestChapterTime }
-                        list.sortedWith { o1, o2 -> o1.name.cnCompare(o2.name) }
 
-                    3 -> if (isDescending) list.sortedByDescending { it.order }
+                            2 -> if (isDescending)
-                    else list.sortedBy { it.order }
+                                list.sortedWith { o1, o2 -> o2.name.cnCompare(o1.name) }
+                            else
+                                list.sortedWith { o1, o2 -> o1.name.cnCompare(o2.name) }
 
-                    4 -> if (isDescending) list.sortedByDescending {
+                            3 -> if (isDescending) list.sortedByDescending { it.order }
-                        max(
+                            else list.sortedBy { it.order }
-                            it.latestChapterTime,
+
-                            it.durChapterTime
+                            4 -> if (isDescending)
-                        )
+                                list.sortedByDescending { 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 list.sortedBy { it.durChapterTime }
+                        }
+                    }
+                    .flowOn(Dispatchers.Default)
+                    .catch { AppLog.put("书架更新出错", it) }
+                    .collect { list ->
+                        binding.emptyView.isGone = list.isNotEmpty()
+                        binding.refreshLayout.isEnabled = enableRefresh && list.isNotEmpty()
+                        booksAdapter.setItems(list)
                     }
-                    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 list.sortedBy { it.durChapterTime }
-                }
-            }.flowWithLifecycleAndDatabaseChangeFirst(
-                viewLifecycleOwner.lifecycle,
-                Lifecycle.State.RESUMED,
-                AppDatabase.BOOK_TABLE_NAME
-            ).catch {
-                AppLog.put("书架更新出错", it)
-            }.conflate().flowOn(Dispatchers.Default).collect { list ->
-                binding.emptyView.isGone = list.isNotEmpty()
-                binding.refreshLayout.isEnabled = enableRefresh && list.isNotEmpty()
-                booksAdapter.setItems(list)
-                delay(500)
             }
         }
     }

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

@@ -14,6 +14,7 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isGone
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -246,16 +247,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
@@ -263,48 +262,49 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
         }
         booksFlowJob?.cancel()
         booksFlowJob = viewLifecycleOwner.lifecycleScope.launch {
-            appDb.bookDao.flowByGroup(groupId).map { list ->
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                //排序
+                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 ->
-                books = list
-                booksAdapter.updateItems()
-                binding.emptyView.isGone = getItemCount() > 0
-                binding.refreshLayout.isEnabled = enableRefresh && getItemCount() > 0
-                delay(500)
             }
         }
     }