修复自动换源的bug

pull/370/head
gedoor 4 years ago
parent ab2512e7e8
commit a0fc75ba37
  1. 18
      app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt

@ -65,6 +65,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
ReadBook.loadContent(resetPageOffset = true) ReadBook.loadContent(resetPageOffset = true)
} }
} else { } else {
ReadBook.book = book
if (ReadBook.durChapterIndex != book.durChapterIndex) { if (ReadBook.durChapterIndex != book.durChapterIndex) {
ReadBook.durChapterIndex = book.durChapterIndex ReadBook.durChapterIndex = book.durChapterIndex
ReadBook.durPageIndex = book.durChapterPos ReadBook.durPageIndex = book.durChapterPos
@ -72,7 +73,6 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
ReadBook.curTextChapter = null ReadBook.curTextChapter = null
ReadBook.nextTextChapter = null ReadBook.nextTextChapter = null
} }
ReadBook.book!!.group = book.group
ReadBook.titleDate.postValue(book.name) ReadBook.titleDate.postValue(book.name)
ReadBook.upWebBook(book) ReadBook.upWebBook(book)
isInitFinish = true isInitFinish = true
@ -160,20 +160,24 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
execute { execute {
ReadBook.upMsg(null) ReadBook.upMsg(null)
ReadBook.book?.changeTo(newBook) ReadBook.book?.changeTo(newBook)
ReadBook.book = newBook
App.db.bookSourceDao().getBookSource(newBook.origin)?.let {
ReadBook.webBook = WebBook(it)
}
ReadBook.prevTextChapter = null ReadBook.prevTextChapter = null
ReadBook.curTextChapter = null ReadBook.curTextChapter = null
ReadBook.nextTextChapter = null ReadBook.nextTextChapter = null
withContext(Main) { withContext(Main) {
ReadBook.callBack?.upContent() ReadBook.callBack?.upContent()
} }
ReadBook.book = newBook
App.db.bookSourceDao().getBookSource(newBook.origin)?.let {
ReadBook.webBook = WebBook(it)
}
if (newBook.tocUrl.isEmpty()) { if (newBook.tocUrl.isEmpty()) {
loadBookInfo(newBook) { upChangeDurChapterIndex(newBook, it) } loadBookInfo(newBook) {
upChangeDurChapterIndex(newBook, it)
}
} else { } else {
loadChapterList(newBook) { upChangeDurChapterIndex(newBook, it) } loadChapterList(newBook) {
upChangeDurChapterIndex(newBook, it)
}
} }
} }
} }

Loading…
Cancel
Save