From ae39ec605177004c36fb98eb019e7b83ae383158 Mon Sep 17 00:00:00 2001 From: kunfei Date: Tue, 4 Oct 2022 23:33:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E6=A3=80=E6=B5=8Bwe?= =?UTF-8?q?bDav=E4=B9=A6=E7=B1=8D=E6=98=AF=E5=90=A6=E6=AF=94=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E6=96=B0,=E8=87=AA=E5=8A=A8=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/model/localBook/LocalBook.kt | 3 +-- .../java/io/legado/app/ui/book/info/BookInfoActivity.kt | 2 +- .../java/io/legado/app/ui/book/info/BookInfoViewModel.kt | 6 ++++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt index d0fc3b590..989671c98 100644 --- a/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt +++ b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt @@ -319,8 +319,7 @@ object LocalBook { } } return uri?.let { - localBook.bookUrl = if (it.isContentScheme()) it.toString() - else it.path!! + localBook.bookUrl = if (it.isContentScheme()) it.toString() else it.path!! localBook.save() it.inputStream(appCtx) } diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt index 406a5a9dd..2520123af 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt @@ -212,7 +212,7 @@ class BookInfoActivity : try { RemoteBookWebDav.upload(it) //更新书籍最后更新时间,使之比远程书籍的时间新 - it.latestChapterTime = System.currentTimeMillis() + it.lastCheckTime = System.currentTimeMillis() viewModel.saveBook(it) } catch (e: Exception) { toastOnUi(e.localizedMessage) diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt index fc9b94a83..62b01444e 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt @@ -8,6 +8,7 @@ import io.legado.app.R import io.legado.app.base.BaseViewModel import io.legado.app.constant.AppLog import io.legado.app.constant.BookSourceType +import io.legado.app.constant.BookType import io.legado.app.constant.EventBus import io.legado.app.data.appDb import io.legado.app.data.entities.Book @@ -116,8 +117,9 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) { book.getRemoteUrl()?.let { val remoteBook = RemoteBookWebDav.getRemoteBook(it) if (remoteBook == null) { - - } else if (remoteBook.lastModify > book.latestChapterTime) { + book.origin = BookType.localTag + } else if (remoteBook.lastModify > book.lastCheckTime) { + val uri = RemoteBookWebDav.downloadRemoteBook(remoteBook) } }