diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aae1ee7fb..2a7fdc83a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -198,7 +198,9 @@ jobs: with: name: legado_app_${{ env.VERSION }} tag: "beta" - body: "此版本为测试版,签名与正式版不同,可能存在不稳定情况,升级前请务必备份好数据。" + body: | + 此版本为测试版,签名与正式版不同,可能存在不稳定情况,升级前请务必备份好数据。 + releaseA 为共存版本,可同时安装使用,功能没有区别。 prerelease: true artifacts: ${{ github.workspace }}/apk/*.apk diff --git a/app/src/main/java/io/legado/app/data/entities/Book.kt b/app/src/main/java/io/legado/app/data/entities/Book.kt index 3a05d2338..d0d411ff4 100644 --- a/app/src/main/java/io/legado/app/data/entities/Book.kt +++ b/app/src/main/java/io/legado/app/data/entities/Book.kt @@ -223,7 +223,7 @@ data class Book( fun getPageAnim(): Int { var pageAnim = config.pageAnim - ?: if (type and BookType.image > 0) PageAnim.scrollPageAnim else ReadBookConfig.pageAnim + ?: if (isImage) PageAnim.scrollPageAnim else ReadBookConfig.pageAnim if (pageAnim < 0) { pageAnim = ReadBookConfig.pageAnim } diff --git a/app/src/main/java/io/legado/app/help/book/BookExtensions.kt b/app/src/main/java/io/legado/app/help/book/BookExtensions.kt index 2e7f94361..a2ac13e69 100644 --- a/app/src/main/java/io/legado/app/help/book/BookExtensions.kt +++ b/app/src/main/java/io/legado/app/help/book/BookExtensions.kt @@ -3,6 +3,7 @@ package io.legado.app.help.book import android.net.Uri +import androidx.core.net.toUri import com.script.buildScriptBindings import com.script.rhino.RhinoScriptEngine import io.legado.app.constant.AppLog @@ -114,7 +115,7 @@ fun Book.getLocalUri(): Uri { return uri } uri = if (bookUrl.isUri()) { - Uri.parse(bookUrl) + bookUrl.toUri() } else { Uri.fromFile(File(bookUrl)) } @@ -130,7 +131,7 @@ fun Book.getLocalUri(): Uri { // 查找书籍保存目录 if (!defaultBookDir.isNullOrBlank()) { - val treeUri = Uri.parse(defaultBookDir) + val treeUri = defaultBookDir.toUri() val treeFileDoc = FileDoc.fromUri(treeUri, true) if (!treeFileDoc.exists()) { appCtx.toastOnUi("书籍保存目录失效,请重新设置!") @@ -149,7 +150,7 @@ fun Book.getLocalUri(): Uri { // 查找添加本地选择的目录 if (!importBookDir.isNullOrBlank() && defaultBookDir != importBookDir) { val treeUri = if (importBookDir.isUri()) { - Uri.parse(importBookDir) + importBookDir.toUri() } else { Uri.fromFile(File(importBookDir)) } @@ -171,7 +172,7 @@ fun Book.getLocalUri(): Uri { fun Book.getArchiveUri(): Uri? { val defaultBookDir = AppConfig.defaultBookTreeUri return if (isArchive && !defaultBookDir.isNullOrBlank()) { - FileDoc.fromUri(Uri.parse(defaultBookDir), true) + FileDoc.fromUri(defaultBookDir.toUri(), true) .find(archiveName)?.uri } else { null diff --git a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt index fca060189..4b81f9f94 100644 --- a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt @@ -112,16 +112,19 @@ class BackupConfigFragment : PreferenceFragment(), it.setOnBindEditTextListener { editText -> editText.inputType = InputType.TYPE_TEXT_VARIATION_PASSWORD or InputType.TYPE_CLASS_TEXT + editText.setSelection(editText.text.length) } } findPreference(PreferKey.webDavDir)?.let { it.setOnBindEditTextListener { editText -> editText.text = AppConfig.webDavDir?.toEditable() + editText.setSelection(editText.text.length) } } findPreference(PreferKey.webDavDeviceName)?.let { it.setOnBindEditTextListener { editText -> editText.text = AppConfig.webDavDeviceName?.toEditable() + editText.setSelection(editText.text.length) } } upPreferenceSummary(PreferKey.webDavUrl, getPrefString(PreferKey.webDavUrl))