feat: 优化代码

app/src/main/java/io/legado/app/data/dao/BookDao.kt

@@ -12,16 +12,16 @@ interface BookDao {
     @Query("SELECT * FROM books order by durChapterTime desc")
     fun observeAll(): LiveData<List<Book>>
 
-    @Query("SELECT * FROM books WHERE type = ${BookType.audio} order by durChapterTime desc")
+    @Query("SELECT * FROM books WHERE type = ${BookType.audio}")
     fun observeAudio(): LiveData<List<Book>>
 
-    @Query("SELECT * FROM books WHERE origin = '${BookType.local}' order by durChapterTime desc")
+    @Query("SELECT * FROM books WHERE origin = '${BookType.local}'")
     fun observeLocal(): LiveData<List<Book>>
 
-    @Query("SELECT bookUrl FROM books WHERE origin = '${BookType.local}' order by durChapterTime desc")
+    @Query("SELECT bookUrl FROM books WHERE origin = '${BookType.local}'")
     fun observeLocalUri(): LiveData<List<String>>
 
-    @Query("SELECT * FROM books WHERE origin <> '${BookType.local}' and type = 0 order by durChapterTime desc")
+    @Query("SELECT * FROM books WHERE origin <> '${BookType.local}' and type = 0")
     fun observeDownload(): LiveData<List<Book>>
 
     @Query("SELECT * FROM books WHERE (`group` & :group) > 0")

app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt

@@ -116,7 +116,7 @@ class ArrangeBookActivity : VMBaseActivity<ArrangeBookViewModel>(R.layout.activi
                 1 -> list.sortedByDescending { it.latestChapterTime }
                 2 -> list.sortedBy { it.name }
                 3 -> list.sortedBy { it.order }
-                else -> list
+                else -> list.sortedByDescending { it.durChapterTime }
             }
             adapter.setItems(books)
             upSelectCount()

app/src/main/java/io/legado/app/ui/book/download/DownloadActivity.kt

@@ -13,6 +13,7 @@ import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
 import io.legado.app.constant.EventBus
+import io.legado.app.constant.PreferKey
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
 import io.legado.app.help.BookHelp
@@ -81,9 +82,15 @@ class DownloadActivity : VMBaseActivity<DownloadViewModel>(R.layout.activity_dow
     private fun initLiveData() {
         bookshelfLiveData?.removeObservers(this)
         bookshelfLiveData = App.db.bookDao().observeDownload()
-        bookshelfLiveData?.observe(this, Observer {
-            adapter.setItems(it)
-            initCacheSize(it)
+        bookshelfLiveData?.observe(this, Observer { list ->
+            val books = when (getPrefInt(PreferKey.bookshelfSort)) {
+                1 -> list.sortedByDescending { it.latestChapterTime }
+                2 -> list.sortedBy { it.name }
+                3 -> list.sortedBy { it.order }
+                else -> list.sortedByDescending { it.durChapterTime }
+            }
+            adapter.setItems(books)
+            initCacheSize(books)
         })
     }
 

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

@@ -108,7 +108,7 @@ class BooksFragment : BaseFragment(R.layout.fragment_books),
                 1 -> list.sortedByDescending { it.latestChapterTime }
                 2 -> list.sortedBy { it.name }
                 3 -> list.sortedBy { it.order }
-                else -> list
+                else -> list.sortedByDescending { it.durChapterTime }
             }
             val diffResult = DiffUtil
                 .calculateDiff(BooksDiffCallBack(booksAdapter.getItems(), books))