From b59076d4705eb2f7a0afa32f971fb68382eff694 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 2 Jun 2026 00:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4AESUtils=20init=20=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 +-- .../main/java/cc/winboll/studio/aes/App.java | 4 ++- libaes/build.gradle | 4 +-- libaes/build.properties | 4 +-- .../studio/libaes/models/AESThemeBean.java | 29 ++++++++++++++----- .../studio/libaes/utils/AESThemeUtil.java | 6 +++- 6 files changed, 36 insertions(+), 15 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index ab30ec9..5295fa6 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu May 28 13:25:30 GMT 2026 +#Mon Jun 01 16:38:02 GMT 2026 stageCount=11 libraryProject=libaes baseVersion=15.20 publishVersion=15.20.10 -buildCount=1 +buildCount=4 baseBetaVersion=15.20.11 diff --git a/aes/src/main/java/cc/winboll/studio/aes/App.java b/aes/src/main/java/cc/winboll/studio/aes/App.java index 0a99369..8c49707 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/App.java +++ b/aes/src/main/java/cc/winboll/studio/aes/App.java @@ -5,10 +5,11 @@ package cc.winboll.studio.aes; * @Date 2024/06/13 19:03:58 * @Describe AES应用类 */ -import android.view.Gravity; +import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.ToastUtils; +import java.util.ArrayList; public class App extends GlobalApplication { @@ -18,6 +19,7 @@ public class App extends GlobalApplication { @Override public void onCreate() { super.onCreate(); + AESThemeUtil.init(null); WinBoLLActivityManager.init(this); // 初始化 Toast 框架 diff --git a/libaes/build.gradle b/libaes/build.gradle index 1148094..a7ec17b 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -66,9 +66,9 @@ dependencies { //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' // WinBoLL库 nexus.winboll.cc 地址 - api 'cc.winboll.studio:libappbase:15.20.22' + //api 'cc.winboll.studio:libappbase:15.20.22' // 备用库 jitpack.io 地址 - //api 'com.github.ZhanGSKen:libappbase:appbase-v15.15.21' + api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.22' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/libaes/build.properties b/libaes/build.properties index ab30ec9..5295fa6 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu May 28 13:25:30 GMT 2026 +#Mon Jun 01 16:38:02 GMT 2026 stageCount=11 libraryProject=libaes baseVersion=15.20 publishVersion=15.20.10 -buildCount=1 +buildCount=4 baseBetaVersion=15.20.11 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/models/AESThemeBean.java b/libaes/src/main/java/cc/winboll/studio/libaes/models/AESThemeBean.java index cc1517c..0a835ef 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/models/AESThemeBean.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/models/AESThemeBean.java @@ -10,6 +10,7 @@ import android.util.JsonWriter; import cc.winboll.studio.libaes.R; import cc.winboll.studio.libappbase.models.libs1520000.BaseBean; import java.io.IOException; +import java.util.ArrayList; public class AESThemeBean extends BaseBean { @@ -41,13 +42,28 @@ public class AESThemeBean extends BaseBean { return name; } } - + + public static void fillThemeStyleIDList(ArrayList themeStyleIDList) { + if (themeStyleIDList == null) { + themeStyleIDList = new ArrayList(); + + } + themeStyleIDList.clear(); + themeStyleIDList.add(cc.winboll.studio.libaes.R.style.AESTheme); + themeStyleIDList.add(cc.winboll.studio.libaes.R.style.DepthAESTheme); + themeStyleIDList.add(cc.winboll.studio.libaes.R.style.SkyAESTheme); + themeStyleIDList.add(cc.winboll.studio.libaes.R.style.GoldenAESTheme); + themeStyleIDList.add(cc.winboll.studio.libaes.R.style.BearingAESTheme); + themeStyleIDList.add(cc.winboll.studio.libaes.R.style.MemorAESTheme); + themeStyleIDList.add(cc.winboll.studio.libaes.R.style.TaoAESTheme); + } + // 保存当前主题 int currentThemeStyleID = getThemeStyleID(ThemeType.AES); - + public AESThemeBean() { } - + public AESThemeBean(int currentThemeStyleID) { this.currentThemeStyleID = currentThemeStyleID; } @@ -59,7 +75,7 @@ public class AESThemeBean extends BaseBean { public int getCurrentThemeTypeID() { return this.currentThemeStyleID; } - + @Override public String getName() { return AESThemeBean.class.getName(); @@ -74,8 +90,7 @@ public class AESThemeBean extends BaseBean { @Override public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException { - if(super.initObjectsFromJsonReader(jsonReader, name)) { return true; } - else{ + if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else { if (name.equals("currentThemeTypeID")) { setCurrentThemeTypeID(jsonReader.nextInt()); } else { @@ -90,7 +105,7 @@ public class AESThemeBean extends BaseBean { jsonReader.beginObject(); while (jsonReader.hasNext()) { String name = jsonReader.nextName(); - if(!initObjectsFromJsonReader(jsonReader, name)) { + if (!initObjectsFromJsonReader(jsonReader, name)) { jsonReader.skipValue(); } } 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 063d5d3..1922bba 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 @@ -33,7 +33,11 @@ public class AESThemeUtil { * 初始化主题样式ID集合 */ public static void init(ArrayList themeStyleIDList) { - AESThemeUtil.themeStyleIDList = themeStyleIDList; + if(themeStyleIDList == null) { + AESThemeBean.fillThemeStyleIDList(themeStyleIDList); + } + AESThemeUtil.themeStyleIDList.clear(); + AESThemeUtil.themeStyleIDList.addAll(themeStyleIDList); } /**