diff --git a/aes/build.properties b/aes/build.properties index ab30ec9..f68c3c6 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 -stageCount=11 +#Wed Jun 03 20:29:52 HKT 2026 +stageCount=16 libraryProject=libaes baseVersion=15.20 -publishVersion=15.20.10 -buildCount=1 -baseBetaVersion=15.20.11 +publishVersion=15.20.15 +buildCount=0 +baseBetaVersion=15.20.16 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..903cf7b 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,14 @@ 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.CrashActivity; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.ToastUtils; +import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils; +import java.io.PrintWriter; +import java.io.StringWriter; public class App extends GlobalApplication { @@ -17,11 +21,25 @@ public class App extends GlobalApplication { @Override public void onCreate() { - super.onCreate(); - WinBoLLActivityManager.init(this); + try { + super.onCreate(); + ToastUtils.init(this); + WinBoLLActivityManager.init(this); + AESThemeUtil.init(null); + } catch (Throwable e) { + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + e.printStackTrace(pw); + pw.close(); + String stackTraceStr = sw.toString(); + CrashHandleNotifyUtils.handleUncaughtException( + this, + getPackageName(), + stackTraceStr, + CrashActivity.class + ); + } - // 初始化 Toast 框架 - ToastUtils.init(this); } @Override diff --git a/libaes/build.gradle b/libaes/build.gradle index 1148094..b5643aa 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.26' // 备用库 jitpack.io 地址 - //api 'com.github.ZhanGSKen:libappbase:appbase-v15.15.21' + //api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.26' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/libaes/build.properties b/libaes/build.properties index ab30ec9..eabb756 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 -stageCount=11 +#Wed Jun 03 20:29:39 HKT 2026 +stageCount=16 libraryProject=libaes baseVersion=15.20 -publishVersion=15.20.10 -buildCount=1 -baseBetaVersion=15.20.11 +publishVersion=15.20.15 +buildCount=0 +baseBetaVersion=15.20.16 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..1987dc9 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 @@ -9,13 +9,10 @@ import android.app.Activity; import android.content.Context; import android.view.Menu; import android.view.MenuItem; - import androidx.appcompat.app.AppCompatActivity; - import cc.winboll.studio.libaes.R; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; import cc.winboll.studio.libaes.models.AESThemeBean; - import java.util.ArrayList; public class AESThemeUtil { @@ -33,14 +30,20 @@ public class AESThemeUtil { * 初始化主题样式ID集合 */ public static void init(ArrayList themeStyleIDList) { - AESThemeUtil.themeStyleIDList = themeStyleIDList; + + if (themeStyleIDList == null) { + themeStyleIDList = new ArrayList(); + AESThemeBean.fillThemeStyleIDList(themeStyleIDList); + } + AESThemeUtil.themeStyleIDList.clear(); + AESThemeUtil.themeStyleIDList.addAll(themeStyleIDList); } /** * 获取当前主题样式ID */ public static int getThemeTypeID(Context context) { - AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class); + AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class); return bean == null ? getThemeStyleID(AESThemeBean.ThemeType.AES) : bean.getCurrentThemeTypeID(); } diff --git a/libaes/src/main/res/values-night/colors.xml b/libaes/src/main/res/values-night/colors.xml index 06857dc..77b7b0a 100644 --- a/libaes/src/main/res/values-night/colors.xml +++ b/libaes/src/main/res/values-night/colors.xml @@ -3,15 +3,15 @@ #FFFFFFFF #FF03AB4E - #FF027C39 - #FF3DDC84 + #FF3DDC84 + #FF027C39 #FFFFFB8D - #FFA9A9A9 + #FF555555 #FF000000 - #FFFFFFFF - #FF7D3F12 - #FFCC6E2B - #FFF4B98F + #FF3A3A3A + #FF5A3A1A + #FFA05A2A + #FFD4A07A @color/colorPrimaryDark @color/colorPrimary @@ -24,7 +24,7 @@ @color/colorPrimary @color/colorPrimaryDark - #FF03AB4E + #FF3DDC84 #FFFFFFFF #FF2C2C2C #FFFFFFFF diff --git a/libaes/src/main/res/values-night/styles.xml b/libaes/src/main/res/values-night/styles.xml index 020baff..c660e53 100644 --- a/libaes/src/main/res/values-night/styles.xml +++ b/libaes/src/main/res/values-night/styles.xml @@ -2,6 +2,9 @@ - \ No newline at end of file +