up

app/src/main/java/io/legado/app/constant/Bus.kt

@@ -2,5 +2,5 @@ package io.legado.app.constant
 
 object Bus {
     const val RECREATE = "RECREATE"
-    const val SOURCE_DEBUG_LOG = "sourceDebugLog"
+    const val UP_BOOK = "sourceDebugLog"
 }

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

@@ -15,6 +15,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.VMBaseFragment
+import io.legado.app.constant.Bus
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookGroup
 import io.legado.app.lib.dialogs.alert
@@ -27,10 +28,7 @@ import io.legado.app.ui.bookinfo.BookInfoActivity
 import io.legado.app.ui.bookshelf.BookshelfActivity
 import io.legado.app.ui.read.ReadActivity
 import io.legado.app.ui.search.SearchActivity
-import io.legado.app.utils.applyTint
+import io.legado.app.utils.*
-import io.legado.app.utils.getViewModel
-import io.legado.app.utils.requestInputMethod
-import io.legado.app.utils.startActivity
 import kotlinx.android.synthetic.main.dialog_edittext.view.*
 import kotlinx.android.synthetic.main.fragment_bookshelf.*
 import kotlinx.android.synthetic.main.view_title_bar.*
@@ -85,7 +83,7 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
         bookshelfAdapter = BookshelfAdapter()
         rv_bookshelf.adapter = bookshelfAdapter
         bookshelfAdapter.callBack = this
-        viewModel.adapterNotification.observe(viewLifecycleOwner, Observer { bookshelfAdapter.notification(it) })
+        observeEvent<String>(Bus.UP_BOOK) { bookshelfAdapter.notification(it) }
     }
 
     private fun initBookGroupData() {

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

@@ -1,18 +1,18 @@
 package io.legado.app.ui.main.bookshelf
 
 import android.app.Application
-import androidx.lifecycle.MediatorLiveData
 import io.legado.app.App
 import io.legado.app.base.BaseViewModel
 import io.legado.app.constant.BookType
+import io.legado.app.constant.Bus
 import io.legado.app.data.entities.BookGroup
 import io.legado.app.model.WebBook
+import io.legado.app.utils.postEvent
 import kotlinx.coroutines.Dispatchers.IO
 
 class BookshelfViewModel(application: Application) : BaseViewModel(application) {
 
     val updateList = arrayListOf<String>()
-    val adapterNotification = MediatorLiveData<String>()
 
     fun saveBookGroup(group: String?) {
         if (!group.isNullOrBlank()) {
@@ -35,7 +35,7 @@ class BookshelfViewModel(application: Application) : BaseViewModel(application)
                     val bookSource = App.db.bookSourceDao().getBookSource(book.origin)
                     bookSource?.let {
                         updateList.add(book.bookUrl)
-                        adapterNotification.postValue(book.bookUrl)
+                        postEvent(Bus.UP_BOOK, book.bookUrl)
                         WebBook(bookSource).getChapterList(book).onSuccess(IO) {
                             it?.let {
                                 if (it.size > App.db.bookChapterDao().getChapterCount(book.bookUrl)) {
@@ -44,7 +44,7 @@ class BookshelfViewModel(application: Application) : BaseViewModel(application)
                             }
                         }.onFinally {
                             updateList.remove(book.bookUrl)
-                            adapterNotification.postValue(book.bookUrl)
+                            postEvent(Bus.UP_BOOK, book.bookUrl)
                         }
                     }
                 }