This commit is contained in:
kunfei
2022-03-31 11:42:44 +08:00
parent 6b3917a24a
commit 8c654faffd
@@ -168,20 +168,24 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
book: Book, book: Book,
alertSync: ((progress: BookProgress) -> Unit)? = null alertSync: ((progress: BookProgress) -> Unit)? = null
) { ) {
if (AppWebDav.syncBookProgress)
execute { execute {
if (AppWebDav.syncBookProgress) {
AppWebDav.getBookProgress(book) AppWebDav.getBookProgress(book)
}.onSuccess { ?: throw NoStackTraceException("没有进度")
it?.let { progress -> } else {
throw NoStackTraceException("进度同步未启用")
}
}.onSuccess { progress ->
if (progress.durChapterIndex < book.durChapterIndex || if (progress.durChapterIndex < book.durChapterIndex ||
(progress.durChapterIndex == book.durChapterIndex && progress.durChapterPos < book.durChapterPos) (progress.durChapterIndex == book.durChapterIndex
&& progress.durChapterPos < book.durChapterPos)
) { ) {
alertSync?.invoke(progress) alertSync?.invoke(progress)
} else { } else {
ReadBook.setProgress(progress) ReadBook.setProgress(progress)
} }
} }
}
} }
/** /**