Merge pull request #1753 from Xwite/master
fix:java.importScript相对路径权限错误
This commit is contained in:
@@ -62,6 +62,7 @@ java.logType(var)
|
|||||||
* 从网络(由java.cacheFile实现)、本地导入JavaScript脚本
|
* 从网络(由java.cacheFile实现)、本地导入JavaScript脚本
|
||||||
```
|
```
|
||||||
{{java.importScript(url)}}
|
{{java.importScript(url)}}
|
||||||
|
//相对路径支持android/data/{package}/cache
|
||||||
{{java.importScript(relativePath)}}
|
{{java.importScript(relativePath)}}
|
||||||
{{java.importScript(absolutePath)}}
|
{{java.importScript(absolutePath)}}
|
||||||
```
|
```
|
||||||
@@ -238,4 +239,4 @@ cache.delete(key)
|
|||||||
cache.putFile(key, value, saveTime)
|
cache.putFile(key, value, saveTime)
|
||||||
读取文件内容
|
读取文件内容
|
||||||
cache.getFile(key)
|
cache.getFile(key)
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -137,22 +137,7 @@ interface JsExtensions {
|
|||||||
path.startsWith("http") -> cacheFile(path) ?: ""
|
path.startsWith("http") -> cacheFile(path) ?: ""
|
||||||
path.isContentScheme() -> DocumentUtils.readText(appCtx, Uri.parse(path))
|
path.isContentScheme() -> DocumentUtils.readText(appCtx, Uri.parse(path))
|
||||||
path.startsWith("/storage") -> FileUtils.readText(path)
|
path.startsWith("/storage") -> FileUtils.readText(path)
|
||||||
else -> {
|
else -> readTxtFile(path)
|
||||||
//相对路径
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (result.isBlank()) throw NoStackTraceException("$path 内容获取失败或者为空")
|
if (result.isBlank()) throw NoStackTraceException("$path 内容获取失败或者为空")
|
||||||
return result
|
return result
|
||||||
|
|||||||
Reference in New Issue
Block a user