From 277ea66b99b24c2e3bdca2b214fa513b1ace5d9c Mon Sep 17 00:00:00 2001 From: kunfei Date: Tue, 27 Aug 2019 23:03:38 +0800 Subject: [PATCH] up --- .../main/java/io/legado/app/model/WebBook.kt | 2 +- .../legado/app/ui/readbook/ReadBookActivity.kt | 4 ++-- .../legado/app/ui/readbook/ReadBookViewModel.kt | 17 +++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/WebBook.kt b/app/src/main/java/io/legado/app/model/WebBook.kt index 8ed3f812b..5eaa243c5 100644 --- a/app/src/main/java/io/legado/app/model/WebBook.kt +++ b/app/src/main/java/io/legado/app/model/WebBook.kt @@ -12,7 +12,7 @@ import io.legado.app.model.webbook.BookInfo import io.legado.app.model.webbook.BookList import kotlinx.coroutines.CoroutineScope -class WebBook(private val bookSource: BookSource) { +class WebBook(val bookSource: BookSource) { val sourceUrl: String get() = bookSource.bookSourceUrl diff --git a/app/src/main/java/io/legado/app/ui/readbook/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/readbook/ReadBookActivity.kt index 66af6e9aa..f4a9540e2 100644 --- a/app/src/main/java/io/legado/app/ui/readbook/ReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/readbook/ReadBookActivity.kt @@ -95,10 +95,10 @@ class ReadBookActivity : VMBaseActivity(R.layout.activity_rea */ private fun initView() { tv_chapter_name.onClick { - viewModel.bookSource?.let { + viewModel.webBook?.let { startActivityForResult( requestCodeEditSource, - Pair("data", it.bookSourceUrl) + Pair("data", it.bookSource.bookSourceUrl) ) } } diff --git a/app/src/main/java/io/legado/app/ui/readbook/ReadBookViewModel.kt b/app/src/main/java/io/legado/app/ui/readbook/ReadBookViewModel.kt index 96a5711e0..f472024f4 100644 --- a/app/src/main/java/io/legado/app/ui/readbook/ReadBookViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/readbook/ReadBookViewModel.kt @@ -9,7 +9,6 @@ import io.legado.app.base.BaseViewModel import io.legado.app.constant.BookType import io.legado.app.data.entities.Book import io.legado.app.data.entities.BookChapter -import io.legado.app.data.entities.BookSource import io.legado.app.help.BookHelp import io.legado.app.model.WebBook import io.legado.app.service.ReadAloudService @@ -23,7 +22,6 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) { var bookData = MutableLiveData() val chapterListFinish = MutableLiveData() var chapterSize = 0 - var bookSource: BookSource? = null var callBack: CallBack? = null var durChapterIndex = 0 var durPageIndex = 0 @@ -31,7 +29,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) { var prevTextChapter: TextChapter? = null var curTextChapter: TextChapter? = null var nextTextChapter: TextChapter? = null - private var webBook: WebBook? = null + var webBook: WebBook? = null private val loadingChapters = arrayListOf() private val loadingLock = "loadingLock" @@ -49,8 +47,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) { durPageIndex = book.durChapterPos isLocalBook = book.origin == BookType.local bookData.postValue(book) - bookSource = App.db.bookSourceDao().getBookSource(book.origin) - bookSource?.let { + App.db.bookSourceDao().getBookSource(book.origin)?.let { webBook = WebBook(it) } val count = App.db.bookChapterDao().getChapterCount(book.bookUrl) @@ -211,7 +208,9 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) { } App.db.bookDao().insert(book) bookData.postValue(book) - bookSource = App.db.bookSourceDao().getBookSource(book.origin) + App.db.bookSourceDao().getBookSource(book.origin)?.let { + webBook = WebBook(it) + } if (book.tocUrl.isEmpty()) { loadBookInfo(book) } else { @@ -262,8 +261,10 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) { fun upBookSource() { execute { - bookData.value?.let { - bookSource = App.db.bookSourceDao().getBookSource(it.origin) + bookData.value?.let { book -> + App.db.bookSourceDao().getBookSource(book.origin)?.let { + webBook = WebBook(it) + } } } }