feat: 优化代码

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

@@ -45,6 +45,9 @@ interface BookDao {
     @Query("SELECT * FROM books WHERE name = :name and author = :author")
     fun getBook(name: String, author: String): Book?
 
+    @get:Query("select count(bookUrl) from books where (SELECT sum(groupId) FROM book_groups) & `group` = 0")
+    val noGroupSize: Int
+
     @get:Query("SELECT * FROM books where origin <> '${BookType.local}' and type = 0")
     val webBooks: List<Book>
 

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

@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
+import io.legado.app.constant.AppConst
 import io.legado.app.constant.PreferKey
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookGroup
@@ -105,10 +106,10 @@ class ArrangeBookActivity : VMBaseActivity<ArrangeBookViewModel>(R.layout.activi
         booksLiveData?.removeObservers(this)
         booksLiveData =
             when (groupId) {
-                -1 -> App.db.bookDao().observeAll()
+                AppConst.bookGroupAll.groupId -> App.db.bookDao().observeAll()
-                -2 -> App.db.bookDao().observeLocal()
+                AppConst.bookGroupLocal.groupId -> App.db.bookDao().observeLocal()
-                -3 -> App.db.bookDao().observeAudio()
+                AppConst.bookGroupAudio.groupId -> App.db.bookDao().observeAudio()
-                -11 -> App.db.bookDao().observeNoGroup()
+                AppConst.bookGroupNone.groupId -> App.db.bookDao().observeNoGroup()
                 else -> App.db.bookDao().observeByGroup(groupId)
             }
         booksLiveData?.observe(this, Observer { list ->
@@ -129,22 +130,22 @@ class ArrangeBookActivity : VMBaseActivity<ArrangeBookViewModel>(R.layout.activi
                 .show(supportFragmentManager, "groupManage")
             R.id.menu_no_group -> {
                 title_bar.subtitle = getString(R.string.no_group)
-                groupId = -11
+                groupId = AppConst.bookGroupNone.groupId
                 initBookData()
             }
             R.id.menu_all -> {
                 title_bar.subtitle = item.title
-                groupId = -1
+                groupId = AppConst.bookGroupAll.groupId
                 initBookData()
             }
             R.id.menu_local -> {
                 title_bar.subtitle = item.title
-                groupId = -2
+                groupId = AppConst.bookGroupLocal.groupId
                 initBookData()
             }
             R.id.menu_audio -> {
                 title_bar.subtitle = item.title
-                groupId = -3
+                groupId = AppConst.bookGroupAudio.groupId
                 initBookData()
             }
             else -> if (item.groupId == R.id.menu_group) {

app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt

@@ -39,6 +39,9 @@ import kotlinx.android.synthetic.main.dialog_edit_text.view.*
 import kotlinx.android.synthetic.main.fragment_bookshelf.*
 import kotlinx.android.synthetic.main.view_tab_layout.*
 import kotlinx.android.synthetic.main.view_title_bar.*
+import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.jetbrains.anko.startActivity
 
 
@@ -99,22 +102,32 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
         bookGroupLiveData = App.db.bookGroupDao().liveDataAll()
         bookGroupLiveData?.observe(viewLifecycleOwner, Observer {
             viewModel.checkGroup(it)
-            synchronized(this) {
+            launch {
-                tab_layout.removeOnTabSelectedListener(this)
+                synchronized(this) {
-                bookGroups.clear()
+
-                if (AppConfig.bookGroupAllShow) {
-                    bookGroups.add(AppConst.bookGroupAll)
-                }
-                if (AppConfig.bookGroupLocalShow) {
-                    bookGroups.add(AppConst.bookGroupLocal)
                 }
-                if (AppConfig.bookGroupAudioShow) {
+                withContext(IO) {
-                    bookGroups.add(AppConst.bookGroupAudio)
+                    synchronized(this@BookshelfFragment) {
+                        tab_layout.removeOnTabSelectedListener(this@BookshelfFragment)
+                        bookGroups.clear()
+                        if (AppConfig.bookGroupAllShow) {
+                            bookGroups.add(AppConst.bookGroupAll)
+                        }
+                        if (AppConfig.bookGroupLocalShow) {
+                            bookGroups.add(AppConst.bookGroupLocal)
+                        }
+                        if (AppConfig.bookGroupAudioShow) {
+                            bookGroups.add(AppConst.bookGroupAudio)
+                        }
+                        if (App.db.bookDao().noGroupSize > 0) {
+                            bookGroups.add(AppConst.bookGroupNone)
+                        }
+                        bookGroups.addAll(it)
+                    }
                 }
-                bookGroups.addAll(it)
                 view_pager_bookshelf.adapter?.notifyDataSetChanged()
                 tab_layout.getTabAt(getPrefInt(PreferKey.saveTabPosition, 0))?.select()
-                tab_layout.addOnTabSelectedListener(this)
+                tab_layout.addOnTabSelectedListener(this@BookshelfFragment)
             }
         })
     }
@@ -129,18 +142,26 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
     }
 
     override fun upGroup() {
-        synchronized(this) {
+        launch {
-            bookGroups.remove(AppConst.bookGroupAll)
+            withContext(IO) {
-            bookGroups.remove(AppConst.bookGroupLocal)
+                synchronized(this@BookshelfFragment) {
-            bookGroups.remove(AppConst.bookGroupAudio)
+                    bookGroups.remove(AppConst.bookGroupAll)
-            if (AppConfig.bookGroupAudioShow) {
+                    bookGroups.remove(AppConst.bookGroupLocal)
-                bookGroups.add(0, AppConst.bookGroupAudio)
+                    bookGroups.remove(AppConst.bookGroupAudio)
-            }
+                    bookGroups.remove(AppConst.bookGroupNone)
-            if (AppConfig.bookGroupLocalShow) {
+                    if (App.db.bookDao().noGroupSize > 0) {
-                bookGroups.add(0, AppConst.bookGroupLocal)
+                        bookGroups.add(0, AppConst.bookGroupNone)
-            }
+                    }
-            if (AppConfig.bookGroupAllShow) {
+                    if (AppConfig.bookGroupAudioShow) {
-                bookGroups.add(0, AppConst.bookGroupAll)
+                        bookGroups.add(0, AppConst.bookGroupAudio)
+                    }
+                    if (AppConfig.bookGroupLocalShow) {
+                        bookGroups.add(0, AppConst.bookGroupLocal)
+                    }
+                    if (AppConfig.bookGroupAllShow) {
+                        bookGroups.add(0, AppConst.bookGroupAll)
+                    }
+                }
             }
             view_pager_bookshelf.adapter?.notifyDataSetChanged()
         }

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

@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.BaseFragment
+import io.legado.app.constant.AppConst
 import io.legado.app.constant.BookType
 import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
@@ -98,9 +99,10 @@ class BooksFragment : BaseFragment(R.layout.fragment_books),
     private fun upRecyclerData() {
         bookshelfLiveData?.removeObservers(this)
         bookshelfLiveData = when (groupId) {
-            -1 -> App.db.bookDao().observeAll()
+            AppConst.bookGroupAll.groupId -> App.db.bookDao().observeAll()
-            -2 -> App.db.bookDao().observeLocal()
+            AppConst.bookGroupLocal.groupId -> App.db.bookDao().observeLocal()
-            -3 -> App.db.bookDao().observeAudio()
+            AppConst.bookGroupAudio.groupId -> App.db.bookDao().observeAudio()
+            AppConst.bookGroupNone.groupId -> App.db.bookDao().observeNoGroup()
             else -> App.db.bookDao().observeByGroup(groupId)
         }
         bookshelfLiveData?.observe(this, Observer { list ->