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

6.7.0 - Alpha23 - 修复 floaty.rawWindow 因传入错误的上下文导致部分控件显示异常的问题

Browse Source
This commit is contained in:
SuperMonster003
2026-03-14 20:55:01 +08:00
parent 36b4a02f55
commit 6ffa12165d
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.changelog/lang_zh-Hans.json
View File

@@ -63,6 +63,7 @@
"isJavaClass/isJavaPackage 等全局方法无效的问题", "isJavaClass/isJavaPackage 等全局方法无效的问题",
"timers.keepAlive 方法 timeout 参数功能无效的问题", "timers.keepAlive 方法 timeout 参数功能无效的问题",
"floaty.window/rawWindow 方法无法接受字符串参数的问题 _[`issue #467`](http://issues.autojs6.com/467)_", "floaty.window/rawWindow 方法无法接受字符串参数的问题 _[`issue #467`](http://issues.autojs6.com/467)_",
"floaty.rawWindow 因传入错误的上下文导致部分控件显示异常的问题",
"util.isString 方法无效的问题", "util.isString 方法无效的问题",
"util.class[Name]/getClass[Name] 可能返回错误结果的问题", "util.class[Name]/getClass[Name] 可能返回错误结果的问题",
"util.java.array 无法正常使用 Boolean 等类型参数的问题", "util.java.array 无法正常使用 Boolean 等类型参数的问题",

12
app/src/main/java/org/autojs/autojs/core/floaty/RawWindow.kt
View File

@@ -1,5 +1,6 @@
package org.autojs.autojs.core.floaty package org.autojs.autojs.core.floaty
import android.content.Context
import android.graphics.PixelFormat import android.graphics.PixelFormat
import android.view.Gravity import android.view.Gravity
import android.view.View import android.view.View
@@ -18,7 +19,10 @@ import org.autojs.autojs6.R
* Modified by SuperMonster003 as of Mar 27, 2022. * Modified by SuperMonster003 as of Mar 27, 2022.
* Transformed by SuperMonster003 on Mar 27, 2022. * Transformed by SuperMonster003 on Mar 27, 2022.
*/ */
class RawWindow(private val supplier: BaseResizableFloatyWindow.ViewSupplier) : FloatyWindow() { class RawWindow(
private val context: Context,
private val supplier: BaseResizableFloatyWindow.ViewSupplier,
) : FloatyWindow() {
private val mInflateException = VolatileDispose<RuntimeException>() private val mInflateException = VolatileDispose<RuntimeException>()
@@ -35,8 +39,8 @@ class RawWindow(private val supplier: BaseResizableFloatyWindow.ViewSupplier) :
} }
override fun onCreateView(floatyService: FloatyService): View { override fun onCreateView(floatyService: FloatyService): View {
val windowView = View.inflate(floatyService, R.layout.raw_window, null) as ViewGroup val windowView = View.inflate(context, R.layout.raw_window, null) as ViewGroup
contentView = supplier.inflate(floatyService, windowView) contentView = supplier.inflate(context, windowView)
return windowView return windowView
} }
@@ -83,4 +87,4 @@ class RawWindow(private val supplier: BaseResizableFloatyWindow.ViewSupplier) :
updateWindowLayoutParams(this) updateWindowLayoutParams(this)
} }
} }
} }

5
app/src/main/java/org/autojs/autojs/runtime/api/Floaty.kt
View File

@@ -177,7 +177,7 @@ class Floaty(private val uiHandler: UiHandler, private val scriptRuntime: Script
init { init {
val context = uiHandler.applicationContext val context = uiHandler.applicationContext
val window = RawWindow(supplier).also { mWindow = it } val window = RawWindow(mContext, supplier).also { mWindow = it }
val r = Runnable { val r = Runnable {
context.startService(Intent(context, FloatyService::class.java)) context.startService(Intent(context, FloatyService::class.java))
FloatyService.addWindow(window) FloatyService.addWindow(window)
@@ -332,5 +332,4 @@ class Floaty(private val uiHandler: UiHandler, private val scriptRuntime: Script
} }
} }
} }
}
}

6
version.properties
View File

@@ -1,5 +1,5 @@
#Thu Mar 12 21:00:26 CST 2026 #Sat Mar 14 20:10:59 CST 2026
BUILD_TIME=1773320426437 BUILD_TIME=1773490259819
COMPILE_SDK_VERSION=36 COMPILE_SDK_VERSION=36
IMAGE_QUANT_CMAKE_VERSION=3.22.1 IMAGE_QUANT_CMAKE_VERSION=3.22.1
IMAGE_QUANT_NDK_VERSION=26.1.10909125 IMAGE_QUANT_NDK_VERSION=26.1.10909125
@@ -27,6 +27,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=36 TARGET_SDK_VERSION=36
TARGET_SDK_VERSION_INRT=29 TARGET_SDK_VERSION_INRT=29
VERSION_BUILD=3803 VERSION_BUILD=3804
VERSION_NAME=6.7.0 Alpha23 VERSION_NAME=6.7.0 Alpha23
VSCODE_EXT_REQUIRED_VERSION=1.0.13 VSCODE_EXT_REQUIRED_VERSION=1.0.13