From 60d42105e11a3f77b65855974588eed132b98b45 Mon Sep 17 00:00:00 2001 From: SuperMonster003 Date: Wed, 10 Sep 2025 11:29:47 +0800 Subject: [PATCH] =?UTF-8?q?6.7.0=20-=20Alpha4=20-=20=E4=BF=AE=E5=A4=8D=20i?= =?UTF-8?q?mages.concat=20=E7=BA=B5=E5=90=91=E6=8B=BC=E6=8E=A5=E6=97=B6?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=80=BC=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changelog/lang_zh-Hans.json | 3 ++- app/src/main/java/org/autojs/autojs/runtime/api/Images.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json index cb5eb947..555dabe1 100644 --- a/.changelog/lang_zh-Hans.json +++ b/.changelog/lang_zh-Hans.json @@ -12,7 +12,8 @@ "fix": [ "isJavaClass/isJavaPackage 等全局方法无效的问题", "使用 XML 语法将 JavaScript 表达式作为属性值时, this 对象可能出现指向错误的问题", - "调用 images.requestScreenCapture 时用户取消授权可能导致应用崩溃的问题", + "images.concat 纵向拼接时宽度值计算错误", + "images.requestScreenCapture 调用时用户取消授权可能导致应用崩溃的问题", "images 部分相关方法出现异常时 oneShot 标记功能失效的问题 _[`issue #372`](http://issues.autojs6.com/372)_", "images 部分相关方法可能引发内存泄露的问题 _[`issue #372`](http://issues.autojs6.com/372)_", "Android 10 UiObject#child 方法可能出现 ArrayIndexOutOfBoundsException 异常的问题 _[`issue #416`](http://issues.autojs6.com/416)_", diff --git a/app/src/main/java/org/autojs/autojs/runtime/api/Images.java b/app/src/main/java/org/autojs/autojs/runtime/api/Images.java index 97624d6a..e13160c2 100644 --- a/app/src/main/java/org/autojs/autojs/runtime/api/Images.java +++ b/app/src/main/java/org/autojs/autojs/runtime/api/Images.java @@ -185,7 +185,7 @@ public class Images { width = imgA.getWidth() + imgB.getWidth(); height = Math.max(imgA.getHeight(), imgB.getHeight()); } else { - width = Math.max(imgA.getWidth(), imgB.getHeight()); + width = Math.max(imgA.getWidth(), imgB.getWidth()); height = imgA.getHeight() + imgB.getHeight(); } Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);