From 539db7b4c041119b8ce9388494f4d2c5814e0b8e Mon Sep 17 00:00:00 2001
From: Xwite <82232510+Xwite@users.noreply.github.com>
Date: Tue, 5 Apr 2022 19:09:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20java.importScript=20=E7=9B=B8?=
 =?UTF-8?q?=E5=AF=B9=E8=B7=AF=E5=BE=84=E5=8F=AA=E6=94=AF=E6=8C=81=E7=A7=81?=
 =?UTF-8?q?=E6=9C=89=E7=BC=93=E5=AD=98=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/help/JsExtensions.kt     | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

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 7a6662d68..a5229675d 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

From 235b45399da518bb6ada9c57b6a42e0ed8e37736 Mon Sep 17 00:00:00 2001
From: Xwite <82232510+Xwite@users.noreply.github.com>
Date: Tue, 5 Apr 2022 19:11:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0js=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/help/jsHelp.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
+```