Merge remote-tracking branch 'origin/master'

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

@@ -44,19 +44,30 @@ class BookshelfActivity : BaseActivity<BookshelfViewModel>() {
 
     private fun upRecyclerData() {
         viewModel.bookGroup?.let {
+            bookshelfLiveData?.removeObservers(this)
             when (it.groupId) {
                 -1 -> {
-                    bookshelfLiveData?.removeObservers(this)
+
                     bookshelfLiveData =
                         LivePagedListBuilder(App.db.bookDao().observeAll(), 10).build()
-                    bookshelfLiveData?.observe(
-                        this,
-                        Observer { pageList -> bookshelfAdapter.submitList(pageList) })
                 }
-                else -> {
+                -2 -> {
+
+                }
+                -3 -> {
 
                 }
+                else -> {
+                    bookshelfLiveData =
+                        LivePagedListBuilder(
+                            App.db.bookDao().observeByGroup(it.groupId),
+                            10
+                        ).build()
+                }
             }
+            bookshelfLiveData?.observe(
+                this,
+                Observer { pageList -> bookshelfAdapter.submitList(pageList) })
         }
     }