优化
This commit is contained in:
@@ -308,8 +308,16 @@ object ReadBook : CoroutineScope by MainScope() {
|
|||||||
* @param resetPageOffset 滚动阅读是否重置滚动位置
|
* @param resetPageOffset 滚动阅读是否重置滚动位置
|
||||||
* @param success 当前章节加载完成回调
|
* @param success 当前章节加载完成回调
|
||||||
*/
|
*/
|
||||||
fun loadContent(resetPageOffset: Boolean, success: (() -> Unit)? = null) {
|
fun loadContent(
|
||||||
loadContent(durChapterIndex, resetPageOffset = resetPageOffset) {
|
resetPageOffset: Boolean,
|
||||||
|
pageChanged: Boolean = false,
|
||||||
|
success: (() -> Unit)? = null
|
||||||
|
) {
|
||||||
|
loadContent(
|
||||||
|
durChapterIndex,
|
||||||
|
resetPageOffset = resetPageOffset,
|
||||||
|
pageChanged = pageChanged
|
||||||
|
) {
|
||||||
success?.invoke()
|
success?.invoke()
|
||||||
}
|
}
|
||||||
loadContent(durChapterIndex + 1, resetPageOffset = resetPageOffset)
|
loadContent(durChapterIndex + 1, resetPageOffset = resetPageOffset)
|
||||||
|
|||||||
@@ -226,7 +226,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
|
|||||||
appDb.bookChapterDao.insert(*toc.toTypedArray())
|
appDb.bookChapterDao.insert(*toc.toTypedArray())
|
||||||
ReadBook.resetData(book)
|
ReadBook.resetData(book)
|
||||||
ReadBook.upMsg(null)
|
ReadBook.upMsg(null)
|
||||||
ReadBook.loadContent(resetPageOffset = true)
|
ReadBook.loadContent(resetPageOffset = true, pageChanged = true)
|
||||||
}.onError {
|
}.onError {
|
||||||
context.toastOnUi("换源失败\n${it.localizedMessage}")
|
context.toastOnUi("换源失败\n${it.localizedMessage}")
|
||||||
ReadBook.upMsg(null)
|
ReadBook.upMsg(null)
|
||||||
@@ -284,7 +284,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
|
|||||||
ReadBook.durChapterIndex = index
|
ReadBook.durChapterIndex = index
|
||||||
ReadBook.durChapterPos = durChapterPos
|
ReadBook.durChapterPos = durChapterPos
|
||||||
ReadBook.saveRead()
|
ReadBook.saveRead()
|
||||||
ReadBook.loadContent(resetPageOffset = true) {
|
ReadBook.loadContent(resetPageOffset = true, pageChanged = true) {
|
||||||
success?.invoke()
|
success?.invoke()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -313,7 +313,11 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
|
|||||||
appDb.bookChapterDao.getChapter(book.bookUrl, ReadBook.durChapterIndex)
|
appDb.bookChapterDao.getChapter(book.bookUrl, ReadBook.durChapterIndex)
|
||||||
?.let { chapter ->
|
?.let { chapter ->
|
||||||
BookHelp.delContent(book, chapter)
|
BookHelp.delContent(book, chapter)
|
||||||
ReadBook.loadContent(ReadBook.durChapterIndex, resetPageOffset = false)
|
ReadBook.loadContent(
|
||||||
|
ReadBook.durChapterIndex,
|
||||||
|
resetPageOffset = false,
|
||||||
|
pageChanged = true
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user