diff --git a/libwinboll/build.gradle b/libwinboll/build.gradle index 9345b33..ff8b1e0 100644 --- a/libwinboll/build.gradle +++ b/libwinboll/build.gradle @@ -44,13 +44,12 @@ dependencies { //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' // WinBoLL库 nexus.winboll.cc 地址 - api 'cc.winboll.studio:libappbase:15.20.21' - api 'cc.winboll.studio:libaes:15.20.9' + //api 'cc.winboll.studio:libappbase:15.20.22' + //api 'cc.winboll.studio:libaes:15.20.11' // 备用库 jitpack.io 地址 - //api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.20' - //api 'com.github.ZhanGSKen:libaes:aes-v15.20.8' - + api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.22' + api 'com.github.ZhanGSKen:libaes:aes-v15.20.11' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/libwinboll/build.properties b/libwinboll/build.properties index 4ddb6dd..43bd693 100644 --- a/libwinboll/build.properties +++ b/libwinboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Jun 01 20:31:36 HKT 2026 -stageCount=5 +#Tue Jun 02 03:18:21 HKT 2026 +stageCount=6 libraryProject=libwinboll baseVersion=15.20 -publishVersion=15.20.4 +publishVersion=15.20.5 buildCount=0 -baseBetaVersion=15.20.5 +baseBetaVersion=15.20.6 diff --git a/winboll/build.gradle b/winboll/build.gradle index 0e408a8..04bf997 100644 --- a/winboll/build.gradle +++ b/winboll/build.gradle @@ -105,12 +105,12 @@ dependencies { implementation 'com.termux:termux-shared:0.118.0' // WinBoLL库 nexus.winboll.cc 地址 - api 'cc.winboll.studio:libappbase:15.20.22' - api 'cc.winboll.studio:libaes:15.20.10' + //api 'cc.winboll.studio:libappbase:15.20.22' + //api 'cc.winboll.studio:libaes:15.20.11' // 备用库 jitpack.io 地址 - //api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.21' - //api 'com.github.ZhanGSKen:libaes:aes-v15.20.9' + api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.22' + api 'com.github.ZhanGSKen:libaes:aes-v15.20.11' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/winboll/build.properties b/winboll/build.properties index 4ddb6dd..43bd693 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Jun 01 20:31:36 HKT 2026 -stageCount=5 +#Tue Jun 02 03:18:21 HKT 2026 +stageCount=6 libraryProject=libwinboll baseVersion=15.20 -publishVersion=15.20.4 +publishVersion=15.20.5 buildCount=0 -baseBetaVersion=15.20.5 +baseBetaVersion=15.20.6 diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/App.java b/winboll/src/main/java/cc/winboll/studio/winboll/App.java index 81b0930..99c8e4c 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/App.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/App.java @@ -40,7 +40,9 @@ import java.util.Arrays; import java.util.Date; import java.util.LinkedHashMap; import java.util.concurrent.atomic.AtomicBoolean; +import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; +import java.util.ArrayList; public class App extends GlobalApplication { @@ -62,6 +64,17 @@ public class App extends GlobalApplication { //setIsDebugging(false); WinBoLLActivityManager.init(this); + + // 初始化 AES 主题工具(注入当前应用命名空间的主题ID列表,按 ThemeType.ordinal() 顺序) + ArrayList themeStyleList = new ArrayList(); + themeStyleList.add(R.style.MyAppTheme); // AES(0) + themeStyleList.add(R.style.MyDepthAppTheme); // DEPTH(1) + themeStyleList.add(R.style.MySkyAppTheme); // SKY(2) + themeStyleList.add(R.style.MyGoldenAppTheme); // GOLDEN(3) + themeStyleList.add(R.style.MyBearingAppTheme); // BEARING(4) + themeStyleList.add(R.style.MyMemorAppTheme); // MEMOR(5) + themeStyleList.add(R.style.MyTaoAppTheme); // TAO(6) + AESThemeUtil.init(themeStyleList); // 初始化 Toast 框架 ToastUtils.init(this); diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java index 3ffc723..414241b 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java @@ -37,7 +37,7 @@ public class MainActivity extends DrawerFragmentActivity { @Override protected void onCreate(Bundle savedInstanceState) { - setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(this)); + setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(getApplicationContext())); super.onCreate(savedInstanceState); initMainHandler(); if (mBrowserFragment == null) { diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/activities/PatternLockActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/activities/PatternLockActivity.java index 6581c20..a52414f 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/PatternLockActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/PatternLockActivity.java @@ -14,7 +14,6 @@ import android.os.Looper; import android.view.MotionEvent; import android.widget.FrameLayout; import androidx.appcompat.widget.Toolbar; -import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.winboll.R; @@ -57,7 +56,6 @@ public class PatternLockActivity extends BaseWinBoLLActivity { @Override protected void onCreate(Bundle savedInstanceState) { - AESThemeUtil.applyAppTheme(this); super.onCreate(savedInstanceState); setContentView(R.layout.activity_pattern_lock); diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java index c7d877d..1dab4e6 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java @@ -3,7 +3,6 @@ package cc.winboll.studio.winboll.activities; import android.os.Bundle; import android.view.View; import androidx.appcompat.widget.Toolbar; -import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.winboll.R; import android.app.Activity; @@ -29,7 +28,6 @@ public class SettingsActivity extends BaseWinBoLLActivity { @Override protected void onCreate(Bundle savedInstanceState) { - AESThemeUtil.applyAppTheme(this); super.onCreate(savedInstanceState); setContentView(R.layout.activity_settings);