Compare commits

..

9 Commits

Author SHA1 Message Date
STUDIO
1b07a72236 <aes>APK 15.20.11 release Publish. 2026-06-02 02:23:15 +08:00
8328e44b86 黑白主题着重提升黑色的专注感官,减少视觉流失感官色彩。 2026-06-02 02:18:42 +08:00
981a8dd8cd fix: AESThemeUtil.init(null) NullPointerException 闪退修复
AESThemeUtil.init(null) 传入 null 时,Java 值传递导致
fillThemeStyleIDList 内部 new ArrayList 仅赋值给局部变量,
调用方 themeStyleIDList 仍为 null,随后的 addAll(null) 抛 NPE。

在 init() 中先创建新 ArrayList 再传入 fillThemeStyleIDList 以修复。
2026-06-02 01:59:15 +08:00
6bc3cbe446 Merge branch 'aes' into merge 2026-06-02 01:54:28 +08:00
79e42e72af 移除winboll项目 2026-06-02 01:54:03 +08:00
b59076d470 提交AESUtils init 初始化方案 2026-06-02 00:39:17 +08:00
qinglong
9e9486b488 合并模块WinBoLL 同步最新时间标签winboll-v15.20.4 2026-06-01 21:00:01 +08:00
qinglong
4b8967b253 合并模块WinBoLL 同步最新时间标签winboll-v15.20.3 2026-05-31 21:00:02 +08:00
qinglong
b1059c3f46 合并模块AES 同步最新时间标签aes-v15.20.10 2026-05-27 20:26:41 +08:00
7 changed files with 47 additions and 25 deletions

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Thu May 28 13:25:30 GMT 2026 #Tue Jun 02 02:23:15 HKT 2026
stageCount=11 stageCount=12
libraryProject=libaes libraryProject=libaes
baseVersion=15.20 baseVersion=15.20
publishVersion=15.20.10 publishVersion=15.20.11
buildCount=1 buildCount=0
baseBetaVersion=15.20.11 baseBetaVersion=15.20.12

View File

@@ -5,10 +5,11 @@ package cc.winboll.studio.aes;
* @Date 2024/06/13 19:03:58 * @Date 2024/06/13 19:03:58
* @Describe AES应用类 * @Describe AES应用类
*/ */
import android.view.Gravity; import cc.winboll.studio.libaes.utils.AESThemeUtil;
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.ToastUtils; import cc.winboll.studio.libappbase.ToastUtils;
import java.util.ArrayList;
public class App extends GlobalApplication { public class App extends GlobalApplication {
@@ -18,6 +19,7 @@ public class App extends GlobalApplication {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
AESThemeUtil.init(null);
WinBoLLActivityManager.init(this); WinBoLLActivityManager.init(this);
// 初始化 Toast 框架 // 初始化 Toast 框架

View File

@@ -66,9 +66,9 @@ dependencies {
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
// WinBoLL库 nexus.winboll.cc 地址 // WinBoLL库 nexus.winboll.cc 地址
api 'cc.winboll.studio:libappbase:15.20.22' //api 'cc.winboll.studio:libappbase:15.20.22'
// 备用库 jitpack.io 地址 // 备用库 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']) api fileTree(dir: 'libs', include: ['*.jar'])
} }

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Thu May 28 13:25:30 GMT 2026 #Tue Jun 02 02:23:15 HKT 2026
stageCount=11 stageCount=12
libraryProject=libaes libraryProject=libaes
baseVersion=15.20 baseVersion=15.20
publishVersion=15.20.10 publishVersion=15.20.11
buildCount=1 buildCount=0
baseBetaVersion=15.20.11 baseBetaVersion=15.20.12

View File

@@ -10,6 +10,7 @@ import android.util.JsonWriter;
import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.R;
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean; import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
public class AESThemeBean extends BaseBean { public class AESThemeBean extends BaseBean {
@@ -41,13 +42,28 @@ public class AESThemeBean extends BaseBean {
return name; return name;
} }
} }
public static void fillThemeStyleIDList(ArrayList<Integer> themeStyleIDList) {
if (themeStyleIDList == null) {
themeStyleIDList = new ArrayList<Integer>();
}
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); int currentThemeStyleID = getThemeStyleID(ThemeType.AES);
public AESThemeBean() { public AESThemeBean() {
} }
public AESThemeBean(int currentThemeStyleID) { public AESThemeBean(int currentThemeStyleID) {
this.currentThemeStyleID = currentThemeStyleID; this.currentThemeStyleID = currentThemeStyleID;
} }
@@ -59,7 +75,7 @@ public class AESThemeBean extends BaseBean {
public int getCurrentThemeTypeID() { public int getCurrentThemeTypeID() {
return this.currentThemeStyleID; return this.currentThemeStyleID;
} }
@Override @Override
public String getName() { public String getName() {
return AESThemeBean.class.getName(); return AESThemeBean.class.getName();
@@ -74,8 +90,7 @@ public class AESThemeBean extends BaseBean {
@Override @Override
public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException { public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
if(super.initObjectsFromJsonReader(jsonReader, name)) { return true; } if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
else{
if (name.equals("currentThemeTypeID")) { if (name.equals("currentThemeTypeID")) {
setCurrentThemeTypeID(jsonReader.nextInt()); setCurrentThemeTypeID(jsonReader.nextInt());
} else { } else {
@@ -90,7 +105,7 @@ public class AESThemeBean extends BaseBean {
jsonReader.beginObject(); jsonReader.beginObject();
while (jsonReader.hasNext()) { while (jsonReader.hasNext()) {
String name = jsonReader.nextName(); String name = jsonReader.nextName();
if(!initObjectsFromJsonReader(jsonReader, name)) { if (!initObjectsFromJsonReader(jsonReader, name)) {
jsonReader.skipValue(); jsonReader.skipValue();
} }
} }

View File

@@ -33,7 +33,12 @@ public class AESThemeUtil {
* 初始化主题样式ID集合 * 初始化主题样式ID集合
*/ */
public static void init(ArrayList<Integer> themeStyleIDList) { public static void init(ArrayList<Integer> themeStyleIDList) {
AESThemeUtil.themeStyleIDList = themeStyleIDList; if(themeStyleIDList == null) {
themeStyleIDList = new ArrayList<Integer>();
AESThemeBean.fillThemeStyleIDList(themeStyleIDList);
}
AESThemeUtil.themeStyleIDList.clear();
AESThemeUtil.themeStyleIDList.addAll(themeStyleIDList);
} }
/** /**

View File

@@ -86,9 +86,9 @@
</style> </style>
<style name="TaoAESTheme" parent="AESTheme"> <style name="TaoAESTheme" parent="AESTheme">
<item name="colorPrimary">#FFACACAC</item> <item name="colorPrimary">#FF7E7E7E</item>
<item name="colorPrimaryDark">#FF898989</item> <item name="colorPrimaryDark">#FF000000</item>
<item name="colorAccent">#FFD8D8D8</item> <item name="colorAccent">#FFE2E2E2</item>
</style> </style>
<style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog"> <style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog">
@@ -112,4 +112,4 @@
<item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item> <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item>
</style> </style>
</resources> </resources>