tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.6.0 - Fix6 - 修复 Temurin 平台无法构建项目

Browse Source
This commit is contained in:
SuperMonster003
2024-12-02 18:03:57 +08:00
parent c30394f24a
commit 9769950fb5
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/autojs/autojs/runtime/api/augment/ui/UI.kt
View File

@@ -186,8 +186,8 @@ class UI(private val scriptRuntime: ScriptRuntime) : AugmentableProxy(scriptRunt
val widgets = scriptRuntime.ui.widgets val widgets = scriptRuntime.ui.widgets
if (widgets.contains(viewName)) { if (widgets.contains(viewName)) {
val ctor = widgets.prop(viewName) as NativeFunction val ctor = widgets.prop(viewName) as NativeFunction
val widget = withRhinoContext { val widget = withRhinoContext { ctx ->
ctor.construct(it, scriptRuntime.topLevelScope, arrayOf()) ctor.construct(ctx, scriptRuntime.topLevelScope, arrayOf())
} as ScriptableObject } as ScriptableObject
val f = widget.prop("renderInternal") as BaseFunction val f = widget.prop("renderInternal") as BaseFunction
return __inflateRhinoRuntime__(scriptRuntime, scriptRuntime.ui.layoutInflater.newInflateContext().also { ctx -> return __inflateRhinoRuntime__(scriptRuntime, scriptRuntime.ui.layoutInflater.newInflateContext().also { ctx ->

25
libs/utils.build.gradle
View File

@@ -108,11 +108,26 @@ class Utils {
} }
LibDeployer setDestDir(String destDir) { LibDeployer setDestDir(String destDir) {
def destFile = destDir.matches("[/\\\\].+") ? project.file(destDir.substring(1)) : project.file(destDir)
println(destDir.matches("[/\\\\].+")) // @Hint by SuperMonster003 on Dec 2, 2024.
println(project.file(destDir)) // ! On some platforms (such as Temurin),
println(project.file(destDir.substring(1))) // ! using project.file might not correctly retrieve the absolute path of the current project.
println(destFile.absolutePath) // ! For example, using "/foo/bar",
// ! Expected path: "/.../AutoJs6/libs/.../src/sdk/native",
// ! Actual path: "/src/sdk/native",
// ! In this case, the leading path separator should be removed, using "foo/bar" instead of "/foo/bar".
// !
// ! zh-CN:
// !
// ! 某些平台 (如 Temurin) 使用 project.file 可能无法正确获取当前项目的绝对路径.
// ! 以 "/foo/bar" 为例,
// ! 预期路径: "/.../AutoJs6/libs/.../src/sdk/native",
// ! 实际路径: "/src/sdk/native",
// ! 这种情况下需要去除路径分隔符前缀, 即使用 "foo/bar" 而非 "/foo/bar".
def destFile = destDir.startsWith(File.separator)
? project.file(destDir.substring(1))
: project.file(destDir)
destFile.mkdirs() destFile.mkdirs()
this.destDir = destDir this.destDir = destDir
this.destFile = destFile this.destFile = destFile

6
version.properties
View File

@@ -1,5 +1,5 @@
#Mon Dec 02 16:52:56 CST 2024 #Mon Dec 02 18:03:28 CST 2024
BUILD_TIME=1733129576279 BUILD_TIME=1733133808639
COMPILE_SDK_VERSION=34 COMPILE_SDK_VERSION=34
JAVA_VERSION=23 JAVA_VERSION=23
JAVA_VERSION_MIN_RADICAL=0 JAVA_VERSION_MIN_RADICAL=0
@@ -17,6 +17,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13
RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3
TARGET_SDK_VERSION=34 TARGET_SDK_VERSION=34
TARGET_SDK_VERSION_INRT=29 TARGET_SDK_VERSION_INRT=29
VERSION_BUILD=2883 VERSION_BUILD=2884
VERSION_NAME=6.6.0 VERSION_NAME=6.6.0
VSCODE_EXT_REQUIRED_VERSION=1.0.8 VSCODE_EXT_REQUIRED_VERSION=1.0.8