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