From 981a8dd8cd72c503721266602a517820c60d93c7 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@QQ.COM>
Date: Tue, 2 Jun 2026 01:59:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20AESThemeUtil.init(null)=20NullPointerExc?=
 =?UTF-8?q?eption=20=E9=97=AA=E9=80=80=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

AESThemeUtil.init(null) 传入 null 时，Java 值传递导致
fillThemeStyleIDList 内部 new ArrayList 仅赋值给局部变量，
调用方 themeStyleIDList 仍为 null，随后的 addAll(null) 抛 NPE。

在 init() 中先创建新 ArrayList 再传入 fillThemeStyleIDList 以修复。
---
 aes/build.properties                                          | 4 ++--
 libaes/build.properties                                       | 4 ++--
 .../java/cc/winboll/studio/libaes/utils/AESThemeUtil.java     | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/aes/build.properties b/aes/build.properties
index 5295fa6..4ed5f9d 100644
--- a/aes/build.properties
+++ b/aes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Jun 01 16:38:02 GMT 2026
+#Tue Jun 02 01:57:16 HKT 2026
 stageCount=11
 libraryProject=libaes
 baseVersion=15.20
 publishVersion=15.20.10
-buildCount=4
+buildCount=6
 baseBetaVersion=15.20.11
diff --git a/libaes/build.properties b/libaes/build.properties
index 5295fa6..4ed5f9d 100644
--- a/libaes/build.properties
+++ b/libaes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Jun 01 16:38:02 GMT 2026
+#Tue Jun 02 01:57:16 HKT 2026
 stageCount=11
 libraryProject=libaes
 baseVersion=15.20
 publishVersion=15.20.10
-buildCount=4
+buildCount=6
 baseBetaVersion=15.20.11
diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java
index 1922bba..68c92e5 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java
@@ -34,6 +34,7 @@ public class AESThemeUtil {
      */
     public static void init(ArrayList<Integer> themeStyleIDList) {
 		if(themeStyleIDList == null) {
+			themeStyleIDList = new ArrayList<Integer>();
 			AESThemeBean.fillThemeStyleIDList(themeStyleIDList);
 		}
 		AESThemeUtil.themeStyleIDList.clear();