diff --git a/app/src/main/assets/help/jsHelp.md b/app/src/main/assets/help/jsHelp.md index 40c368d58..b6b0a3c79 100644 --- a/app/src/main/assets/help/jsHelp.md +++ b/app/src/main/assets/help/jsHelp.md @@ -62,6 +62,7 @@ java.logType(var) * 从网络(由java.cacheFile实现)、本地导入JavaScript脚本 ``` {{java.importScript(url)}} +//相对路径支持android/data/{package}/cache {{java.importScript(relativePath)}} {{java.importScript(absolutePath)}} ``` @@ -238,4 +239,4 @@ cache.delete(key) cache.putFile(key, value, saveTime) 读取文件内容 cache.getFile(key) -``` \ No newline at end of file +``` diff --git a/app/src/main/java/io/legado/app/help/JsExtensions.kt b/app/src/main/java/io/legado/app/help/JsExtensions.kt index b5835e8f7..77d38bba9 100644 --- a/app/src/main/java/io/legado/app/help/JsExtensions.kt +++ b/app/src/main/java/io/legado/app/help/JsExtensions.kt @@ -137,22 +137,7 @@ interface JsExtensions { path.startsWith("http") -> cacheFile(path) ?: "" path.isContentScheme() -> DocumentUtils.readText(appCtx, Uri.parse(path)) path.startsWith("/storage") -> FileUtils.readText(path) - else -> { - //相对路径 - val jsPath = if (path.startsWith("/")) path else "/$path" - //先找书籍保存目录下有没有 - val publicStoragePath = AppConfig.defaultBookTreeUri - val jsString = publicStoragePath?.let { - if (it.isContentScheme()) { - val fileUri = Uri.parse(it + URLEncoder.encode(jsPath, "UTF-8")) - DocumentUtils.readText(appCtx, fileUri) - } else { - FileUtils.readText(it + jsPath) - } - } - //私有目录 - if (jsString.isNullOrBlank()) readTxtFile(path) else jsString - } + else -> readTxtFile(path) } if (result.isBlank()) throw NoStackTraceException("$path 内容获取失败或者为空") return result