From f3d723fbee066e734727f6e6e5e926607a4a2583 Mon Sep 17 00:00:00 2001 From: qinglong Date: Wed, 27 May 2026 15:00:01 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=A8=A1=E5=9D=97APPBa?= =?UTF-8?q?se=20=E5=90=8C=E6=AD=A5=E6=9C=80=E6=96=B0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=87=E7=AD=BEappbase-v15.20.22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 8 ++++---- libappbase/build.properties | 8 ++++---- .../studio/libappbase/views/DebugSwitchInfoImageView.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index f2d536c..8be0c6b 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun May 24 09:53:05 HKT 2026 -stageCount=22 +#Wed May 27 14:51:29 HKT 2026 +stageCount=23 libraryProject=libappbase baseVersion=15.20 -publishVersion=15.20.21 +publishVersion=15.20.22 buildCount=0 -baseBetaVersion=15.20.22 +baseBetaVersion=15.20.23 diff --git a/libappbase/build.properties b/libappbase/build.properties index f2d536c..8be0c6b 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun May 24 09:53:05 HKT 2026 -stageCount=22 +#Wed May 27 14:51:29 HKT 2026 +stageCount=23 libraryProject=libappbase baseVersion=15.20 -publishVersion=15.20.21 +publishVersion=15.20.22 buildCount=0 -baseBetaVersion=15.20.22 +baseBetaVersion=15.20.23 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/DebugSwitchInfoImageView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/DebugSwitchInfoImageView.java index 72679ed..6c03ff2 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/DebugSwitchInfoImageView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/DebugSwitchInfoImageView.java @@ -59,7 +59,7 @@ public class DebugSwitchInfoImageView extends ImageView { final AlertDialog dialog = new AlertDialog.Builder(getContext()).create(); dialog.setTitle("调试Token"); dialog.setMessage(getDebugToken()); - dialog.setCanceledOnTouchOutside(true); + dialog.setCanceledOnTouchOutside(false); dialog.setButton(DialogInterface.BUTTON_POSITIVE, "复制到剪贴板", (DialogInterface.OnClickListener) null); dialog.setButton(DialogInterface.BUTTON_NEUTRAL, "重置", (DialogInterface.OnClickListener) null); dialog.setButton(DialogInterface.BUTTON_NEGATIVE, "关闭", (DialogInterface.OnClickListener) null); From b1059c3f46c525b322c782257bf66768b41dd06d Mon Sep 17 00:00:00 2001 From: qinglong Date: Wed, 27 May 2026 20:26:41 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=A8=A1=E5=9D=97AES?= =?UTF-8?q?=20=E5=90=8C=E6=AD=A5=E6=9C=80=E6=96=B0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=87=E7=AD=BEaes-v15.20.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 8 ++++---- .../java/cc/winboll/studio/aes/MainActivity.java | 3 ++- libaes/build.gradle | 2 +- libaes/build.properties | 8 ++++---- libaes/src/main/res/values/styles.xml | 15 +++++++++------ 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index bc15417..1f97885 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun May 24 10:48:48 HKT 2026 -stageCount=10 +#Wed May 27 20:22:45 HKT 2026 +stageCount=11 libraryProject=libaes baseVersion=15.20 -publishVersion=15.20.9 +publishVersion=15.20.10 buildCount=0 -baseBetaVersion=15.20.10 +baseBetaVersion=15.20.11 diff --git a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java index 927c852..30be2c0 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java +++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java @@ -84,11 +84,12 @@ public class MainActivity extends DrawerFragmentActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { + super.onCreateOptionsMenu(menu); getMenuInflater().inflate(R.menu.toolbar_main, menu); // if(App.isDebugging()) { // getMenuInflater().inflate(cc.winboll.studio.libaes.R.menu.toolbar_studio_debug, menu); // } - return super.onCreateOptionsMenu(menu); + return true; } @Override diff --git a/libaes/build.gradle b/libaes/build.gradle index 73ac7bc..1148094 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -66,7 +66,7 @@ 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:libappbase:15.20.22' // 备用库 jitpack.io 地址 //api 'com.github.ZhanGSKen:libappbase:appbase-v15.15.21' diff --git a/libaes/build.properties b/libaes/build.properties index bc15417..1f97885 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun May 24 10:48:48 HKT 2026 -stageCount=10 +#Wed May 27 20:22:45 HKT 2026 +stageCount=11 libraryProject=libaes baseVersion=15.20 -publishVersion=15.20.9 +publishVersion=15.20.10 buildCount=0 -baseBetaVersion=15.20.10 +baseBetaVersion=15.20.11 diff --git a/libaes/src/main/res/values/styles.xml b/libaes/src/main/res/values/styles.xml index 8354a03..b829b6e 100644 --- a/libaes/src/main/res/values/styles.xml +++ b/libaes/src/main/res/values/styles.xml @@ -2,6 +2,9 @@ - \ No newline at end of file + From 039c8fcd981a64bdd7c7f8f0a727a6cf63ef56ea Mon Sep 17 00:00:00 2001 From: qinglong Date: Tue, 2 Jun 2026 04:00:01 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=A8=A1=E5=9D=97WinBo?= =?UTF-8?q?LL=20=E5=90=8C=E6=AD=A5=E6=9C=80=E6=96=B0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=87=E7=AD=BEwinboll-v15.20.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libwinboll/build.gradle | 9 ++++----- libwinboll/build.properties | 8 ++++---- winboll/build.gradle | 8 ++++---- winboll/build.properties | 8 ++++---- .../main/java/cc/winboll/studio/winboll/App.java | 13 +++++++++++++ .../cc/winboll/studio/winboll/MainActivity.java | 2 +- .../winboll/activities/PatternLockActivity.java | 2 -- .../studio/winboll/activities/SettingsActivity.java | 2 -- 8 files changed, 30 insertions(+), 22 deletions(-) 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); From db804d1897706641ef10eb49dbdc03d4aa7af01b Mon Sep 17 00:00:00 2001 From: qinglong Date: Tue, 2 Jun 2026 08:55:05 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=A8=A1=E5=9D=97AES?= =?UTF-8?q?=20=E5=90=8C=E6=AD=A5=E6=9C=80=E6=96=B0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=87=E7=AD=BEaes-v15.20.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 8 ++-- libaes/build.properties | 8 ++-- libaes/src/main/res/values-night/colors.xml | 16 ++++---- libaes/src/main/res/values-night/styles.xml | 41 +++++++++++---------- 4 files changed, 38 insertions(+), 35 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index edaf1bf..8c8855a 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jun 02 02:23:15 HKT 2026 -stageCount=12 +#Tue Jun 02 08:54:20 HKT 2026 +stageCount=13 libraryProject=libaes baseVersion=15.20 -publishVersion=15.20.11 +publishVersion=15.20.12 buildCount=0 -baseBetaVersion=15.20.12 +baseBetaVersion=15.20.13 diff --git a/libaes/build.properties b/libaes/build.properties index edaf1bf..8c8855a 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jun 02 02:23:15 HKT 2026 -stageCount=12 +#Tue Jun 02 08:54:20 HKT 2026 +stageCount=13 libraryProject=libaes baseVersion=15.20 -publishVersion=15.20.11 +publishVersion=15.20.12 buildCount=0 -baseBetaVersion=15.20.12 +baseBetaVersion=15.20.13 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 @@