From 890706fa34c1cdef7c10b19d2282252780fdb30c Mon Sep 17 00:00:00 2001 From: kunfei Date: Thu, 23 Jun 2022 14:04:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/data/dao/BookDao.kt | 2 +- .../legado/app/model/localBook/LocalBook.kt | 2 -- .../app/ui/book/local/ImportBookActivity.kt | 1 + .../legado/app/ui/book/remote/RemoteBook.kt | 2 +- .../app/ui/book/remote/RemoteBookActivity.kt | 1 + .../book/remote/manager/RemoteBookWebDav.kt | 2 +- .../main/res/layout/activity_import_book.xml | 22 +++++++++---------- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/io/legado/app/data/dao/BookDao.kt b/app/src/main/java/io/legado/app/data/dao/BookDao.kt index 513c47ee1..a3a091e55 100644 --- a/app/src/main/java/io/legado/app/data/dao/BookDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/BookDao.kt @@ -88,7 +88,7 @@ interface BookDao { @Query("select 1 from books where bookUrl = :bookUrl") fun has(bookUrl: String): Boolean? - @Query("select 1 from books where bookUrl like '%' || :fileName") + @Query("select 1 from books where originName = :fileName") fun hasFile(fileName: String): Boolean? @Insert(onConflict = OnConflictStrategy.REPLACE) 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 96d911b97..4fda21143 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 @@ -18,7 +18,6 @@ import io.legado.app.model.analyzeRule.AnalyzeUrl import io.legado.app.utils.* import splitties.init.appCtx import java.io.* -import java.net.URLEncoder import java.util.regex.Pattern /** @@ -275,7 +274,6 @@ object LocalBook { fileName: String ): Boolean { return appDb.bookDao.hasFile(fileName) == true - || appDb.bookDao.hasFile(URLEncoder.encode(fileName, "UTF-8")) == true } //文件类书源 合并在线书籍信息 在线 > 本地 diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt index 8188b210a..88f7d09e0 100644 --- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt @@ -206,6 +206,7 @@ class ImportBookActivity : VMBaseActivity + app:layout_constraintTop_toBottomOf="@id/titleBar"> @@ -62,8 +62,8 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - app:layout_constraintTop_toBottomOf="@id/refresh_progress_bar" - app:layout_constraintBottom_toTopOf="@id/select_action_bar"> + app:layout_constraintBottom_toTopOf="@id/select_action_bar" + app:layout_constraintTop_toBottomOf="@id/refresh_progress_bar">