From e3c30ea9a3a0df034b47856659a52568c2f0bfa2 Mon Sep 17 00:00:00 2001 From: qinglong Date: Sun, 24 May 2026 10:49:26 +0800 Subject: [PATCH 01/37] =?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.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 8 ++++---- libaes/build.gradle | 4 ++-- libaes/build.properties | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index d3473ad..bc15417 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed May 20 20:04:49 HKT 2026 -stageCount=9 +#Sun May 24 10:48:48 HKT 2026 +stageCount=10 libraryProject=libaes baseVersion=15.20 -publishVersion=15.20.8 +publishVersion=15.20.9 buildCount=0 -baseBetaVersion=15.20.9 +baseBetaVersion=15.20.10 diff --git a/libaes/build.gradle b/libaes/build.gradle index cfb95e3..73ac7bc 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.18' + api 'cc.winboll.studio:libappbase:15.20.21' // 备用库 jitpack.io 地址 - //api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3' + //api 'com.github.ZhanGSKen:libappbase:appbase-v15.15.21' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/libaes/build.properties b/libaes/build.properties index d3473ad..bc15417 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed May 20 20:04:49 HKT 2026 -stageCount=9 +#Sun May 24 10:48:48 HKT 2026 +stageCount=10 libraryProject=libaes baseVersion=15.20 -publishVersion=15.20.8 +publishVersion=15.20.9 buildCount=0 -baseBetaVersion=15.20.9 +baseBetaVersion=15.20.10 From f3d723fbee066e734727f6e6e5e926607a4a2583 Mon Sep 17 00:00:00 2001 From: qinglong Date: Wed, 27 May 2026 15:00:01 +0800 Subject: [PATCH 02/37] =?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 03/37] =?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 07/37] =?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 08/37] =?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 @@ - \ No newline at end of file diff --git a/libwinboll/src/main/res/values/strings.xml b/libwinboll/src/main/res/values/strings.xml deleted file mode 100644 index b677aa6..0000000 --- a/libwinboll/src/main/res/values/strings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - libwinboll - Hello world! - - diff --git a/libwinboll/src/main/res/values/styles.xml b/libwinboll/src/main/res/values/styles.xml deleted file mode 100644 index 8d78246..0000000 --- a/libwinboll/src/main/res/values/styles.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/winboll/build.gradle b/winboll/build.gradle index d536381..4999551 100644 --- a/winboll/build.gradle +++ b/winboll/build.gradle @@ -18,10 +18,14 @@ def genVersionName(def versionName){ } android { - // 适配MIUI12 - compileSdkVersion 30 - buildToolsVersion "30.0.3" - + // 适配MIUI12 + compileSdkVersion 30 + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + defaultConfig { applicationId "cc.winboll.studio.winboll" minSdkVersion 26 @@ -39,7 +43,6 @@ android { } dependencies { - api project(':libwinboll') api 'com.google.code.gson:gson:2.10.1' // 下拉控件 @@ -97,8 +100,8 @@ dependencies { implementation 'androidx.biometric:biometric:1.1.0' // WinBoLL库 nexus.winboll.cc 地址 - api 'cc.winboll.studio:libappbase:15.20.33' - api 'cc.winboll.studio:libaes:15.20.16' + api 'cc.winboll.studio:libappbase:15.20.34' + api 'cc.winboll.studio:libaes:15.20.17' // 备用库 jitpack.io 地址 //api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33' diff --git a/winboll/build.properties b/winboll/build.properties index 1a600ca..3dcda4c 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Jun 24 08:11:15 CST 2026 +#Wed Jul 01 03:24:33 CST 2026 stageCount=9 -libraryProject=libwinboll +libraryProject= baseVersion=15.20 publishVersion=15.20.8 -buildCount=0 +buildCount=8 baseBetaVersion=15.20.9 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 7f34285..da137ee 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java @@ -193,9 +193,7 @@ public class MainActivity extends DrawerFragmentActivity { } else if (nItemId == R.id.item_termux_env_test) { Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class); WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class); - } else if (nItemId == R.id.item_library_activity) { - Intent intent = new Intent(getApplicationContext(), cc.winboll.studio.libwinboll.WinBoLLLibraryActivity.class); - WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class); + } else { return super.onOptionsItemSelected(item); } From 2d3592690a56299ec57433d407e705127de6757a Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 1 Jul 2026 03:49:09 +0800 Subject: [PATCH 22/37] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=B0=E7=89=88winbo?= =?UTF-8?q?ll=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From f204cd26080e7312de446ad75984c556f6c0ed8a Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 1 Jul 2026 04:08:42 +0800 Subject: [PATCH 23/37] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgit=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .winboll/bashMergeProjects-to-Projects_Keeper.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper.sh b/.winboll/bashMergeProjects-to-Projects_Keeper.sh index e633313..520bd82 100644 --- a/.winboll/bashMergeProjects-to-Projects_Keeper.sh +++ b/.winboll/bashMergeProjects-to-Projects_Keeper.sh @@ -1,5 +1,5 @@ #!/system/bin/sh -## 合并其他项目分支的模块源码到projects-keeper分支。 +## 合并其他项目分支的模块源码到projects_keeper分支。 # ====================== 0. 进入目标目录 ====================== TARGET_DIR="/sdcard/AppProjects/Projects_Keeper" @@ -36,7 +36,7 @@ fi # ====================== 3. Git 分支检查 ====================== CUR_BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null) -TARGET_BRANCH="projects-keeper" +TARGET_BRANCH="projects_keeper" if [ "$CUR_BRANCH" != "$TARGET_BRANCH" ]; then echo "错误：当前不在 $TARGET_BRANCH 分支！" From 69f79549e9be385a01b0dcc16c7ee95786a18f55 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 1 Jul 2026 04:10:40 +0800 Subject: [PATCH 24/37] =?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.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- winboll/build.gradle | 17 +++++++---------- winboll/build.properties | 6 +++--- .../cc/winboll/studio/winboll/MainActivity.java | 4 +++- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/winboll/build.gradle b/winboll/build.gradle index 4999551..d536381 100644 --- a/winboll/build.gradle +++ b/winboll/build.gradle @@ -18,14 +18,10 @@ def genVersionName(def versionName){ } android { - // 适配MIUI12 - compileSdkVersion 30 - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - + // 适配MIUI12 + compileSdkVersion 30 + buildToolsVersion "30.0.3" + defaultConfig { applicationId "cc.winboll.studio.winboll" minSdkVersion 26 @@ -43,6 +39,7 @@ android { } dependencies { + api project(':libwinboll') api 'com.google.code.gson:gson:2.10.1' // 下拉控件 @@ -100,8 +97,8 @@ dependencies { implementation 'androidx.biometric:biometric:1.1.0' // WinBoLL库 nexus.winboll.cc 地址 - api 'cc.winboll.studio:libappbase:15.20.34' - api 'cc.winboll.studio:libaes:15.20.17' + api 'cc.winboll.studio:libappbase:15.20.33' + api 'cc.winboll.studio:libaes:15.20.16' // 备用库 jitpack.io 地址 //api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33' diff --git a/winboll/build.properties b/winboll/build.properties index 3dcda4c..1a600ca 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Jul 01 03:24:33 CST 2026 +#Wed Jun 24 08:11:15 CST 2026 stageCount=9 -libraryProject= +libraryProject=libwinboll baseVersion=15.20 publishVersion=15.20.8 -buildCount=8 +buildCount=0 baseBetaVersion=15.20.9 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 da137ee..7f34285 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java @@ -193,7 +193,9 @@ public class MainActivity extends DrawerFragmentActivity { } else if (nItemId == R.id.item_termux_env_test) { Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class); WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class); - + } else if (nItemId == R.id.item_library_activity) { + Intent intent = new Intent(getApplicationContext(), cc.winboll.studio.libwinboll.WinBoLLLibraryActivity.class); + WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class); } else { return super.onOptionsItemSelected(item); } From eee880948560203371431dd1eceb234e5d34e881 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 1 Jul 2026 04:11:36 +0800 Subject: [PATCH 25/37] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgit=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh index 520335a..3676aae 100644 --- a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh +++ b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh @@ -65,6 +65,7 @@ libaes libappbase libdebugtemp libgpsrelaysentinel +libwinboll local.properties-demo mymessagemanager positions From ca33dab4da13afd124932a1b806bc6bded9f22ca Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 1 Jul 2026 04:33:36 +0800 Subject: [PATCH 26/37] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgit=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .winboll/bashMergeProjects-to-Projects_Keeper.sh | 6 ++++-- .winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper.sh b/.winboll/bashMergeProjects-to-Projects_Keeper.sh index 520bd82..18355f2 100644 --- a/.winboll/bashMergeProjects-to-Projects_Keeper.sh +++ b/.winboll/bashMergeProjects-to-Projects_Keeper.sh @@ -72,6 +72,7 @@ libaes libappbase libdebugtemp libgpsrelaysentinel +libwinboll local.properties-demo mymessagemanager positions @@ -81,13 +82,14 @@ winboll winboll.properties-demo ) -# ====================== 5. 获取当前目录真实文件列表 ====================== +# ====================== 5. 获取当前目录真实文件列表（已替换标准排序ls命令） ====================== REAL_ITEMS=() while IFS= read -r line; do if [[ "$line" != "." && "$line" != ".." ]]; then REAL_ITEMS+=("$line") fi -done < <(ls -a) +# 替换为固定ASCII排序、单列、无色彩输出，匹配白名单顺序 +done < <(LC_COLLATE=C ls -a1 --color=none) # ====================== 6. 差异比对函数 ====================== check_diff() { diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh index 3676aae..f43a172 100644 --- a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh +++ b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh @@ -78,7 +78,8 @@ winboll.properties-demo REAL_ITEMS=() while IFS= read -r line; do [[ $line != "." && $line != ".." ]] && REAL_ITEMS+=("$line") -done < <(ls -a) +# 替换为固定ASCII排序、单列无颜色输出，解决排序错乱问题 +done < <(LC_COLLATE=C ls -a1 --color=none) check_diff(){ local miss=() extra=() From 773cc9f6c161f59cbc1c4b71186b4c2b87e81e17 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 1 Jul 2026 04:42:45 +0800 Subject: [PATCH 27/37] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgit=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ashMergeProjects-to-Projects_Keeper_Tag.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh index f43a172..8811d3a 100644 --- a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh +++ b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh @@ -38,7 +38,7 @@ if [ "${NOW_BRANCH}" != "${TARGET_BRANCH}" ];then exit 1 fi -# 目录结构校验 +# 目录结构校验白名单（不含 . ..） MERGE_OBJECTS_LIST=( .git .gitignore @@ -76,9 +76,12 @@ winboll.properties-demo ) REAL_ITEMS=() +# 标准排序ls输出，循环强制过滤 . 和 .. while IFS= read -r line; do - [[ $line != "." && $line != ".." ]] && REAL_ITEMS+=("$line") -# 替换为固定ASCII排序、单列无颜色输出，解决排序错乱问题 + # 跳过虚拟目录 . 和 .. + if [[ "$line" != "." && "$line" != ".." ]]; then + REAL_ITEMS+=("$line") + fi done < <(LC_COLLATE=C ls -a1 --color=none) check_diff(){ @@ -90,7 +93,17 @@ check_diff(){ [[ ! " ${MERGE_OBJECTS_LIST[@]} " =~ " ${i} " ]] && extra+=("$i") done if [[ ${#miss[@]} -gt 0 || ${#extra[@]} -gt 0 ]];then + echo "========================================" echo "本地目录结构不一致，终止运行" + if [[ ${#miss[@]} -gt 0 ]]; then + echo -e "\n缺失条目：" + for m in "${miss[@]}"; do echo " $m"; done + fi + if [[ ${#extra[@]} -gt 0 ]]; then + echo -e "\n多余条目：" + for e in "${extra[@]}"; do echo " $e"; done + fi + echo "========================================" exit 1 fi } From 0e60d75ac60d75e70dd834baf6afbc811bd6511f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 1 Jul 2026 04:44:47 +0800 Subject: [PATCH 28/37] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgit=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .winboll/bashMergeProjects-to-Projects_Keeper.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper.sh b/.winboll/bashMergeProjects-to-Projects_Keeper.sh index 18355f2..46190ae 100644 --- a/.winboll/bashMergeProjects-to-Projects_Keeper.sh +++ b/.winboll/bashMergeProjects-to-Projects_Keeper.sh @@ -82,13 +82,13 @@ winboll winboll.properties-demo ) -# ====================== 5. 获取当前目录真实文件列表（已替换标准排序ls命令） ====================== +# ====================== 5. 获取当前目录真实文件列表（兼容过滤 . ..） ====================== REAL_ITEMS=() +# 使用固定排序ls，自动过滤 . 和 ..，不会进入比对数组 while IFS= read -r line; do if [[ "$line" != "." && "$line" != ".." ]]; then REAL_ITEMS+=("$line") fi -# 替换为固定ASCII排序、单列、无色彩输出，匹配白名单顺序 done < <(LC_COLLATE=C ls -a1 --color=none) # ====================== 6. 差异比对函数 ====================== @@ -167,7 +167,7 @@ echo -e "#@@@ 开始合并应用型模块源码 @@@# for item in "${MERGE_APP_PROJECT_LIST[@]}"; do echo "正在合并 $item 项目 ..." item_lower=$(echo "$item" | tr 'A-Z' 'a-z') -git checkout origin/$item_lower $item_lower + git checkout origin/$item_lower $item_lower git add . git commit -m "合并 $item 项目" done @@ -183,7 +183,7 @@ echo -e "#@@@ 开始合并类库型模块源码 @@@# for item in "${MERGE_LIB_PROJECT_LIST[@]}"; do echo "正在合并 $item 项目 ..." item_lower=$(echo "$item" | tr 'A-Z' 'a-z') -git checkout origin/$item_lower $item_lower lib$item_lower + git checkout origin/$item_lower $item_lower lib$item_lower git add . git commit -m "合并 $item 项目" done From 84f1c820cbcfbbf287d1c7481a3731b94968804a Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 1 Jul 2026 04:48:30 +0800 Subject: [PATCH 29/37] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgit=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .winboll/bashMergeProjects-to-Projects_Keeper.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper.sh b/.winboll/bashMergeProjects-to-Projects_Keeper.sh index 46190ae..06d54ee 100644 --- a/.winboll/bashMergeProjects-to-Projects_Keeper.sh +++ b/.winboll/bashMergeProjects-to-Projects_Keeper.sh @@ -72,7 +72,6 @@ libaes libappbase libdebugtemp libgpsrelaysentinel -libwinboll local.properties-demo mymessagemanager positions From b50e4e02ea34678fb0f1fc72c7307adfe5def95b Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 1 Jul 2026 04:49:24 +0800 Subject: [PATCH 30/37] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgit=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh index 8811d3a..9e0e041 100644 --- a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh +++ b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh @@ -65,7 +65,6 @@ libaes libappbase libdebugtemp libgpsrelaysentinel -libwinboll local.properties-demo mymessagemanager positions From bd635425a14c8369a4c975c7a9f98f2bd1c48d8c Mon Sep 17 00:00:00 2001 From: qinglong Date: Sat, 11 Jul 2026 20:17:35 +0800 Subject: [PATCH 31/37] =?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.18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 8 ++++---- aes/src/main/res/values-night/styles.xml | 2 +- aes/src/main/res/values/styles.xml | 2 +- libaes/build.properties | 8 ++++---- libaes/src/main/res/values-night/styles.xml | 2 +- libaes/src/main/res/values/styles.xml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index 7a733ca..768b8eb 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Jun 29 11:28:11 HKT 2026 -stageCount=18 +#Sat Jul 11 20:07:00 HKT 2026 +stageCount=19 libraryProject=libaes baseVersion=15.20 -publishVersion=15.20.17 +publishVersion=15.20.18 buildCount=0 -baseBetaVersion=15.20.18 +baseBetaVersion=15.20.19 diff --git a/aes/src/main/res/values-night/styles.xml b/aes/src/main/res/values-night/styles.xml index 5ac0e76..23cfdb2 100644 --- a/aes/src/main/res/values-night/styles.xml +++ b/aes/src/main/res/values-night/styles.xml @@ -5,7 +5,7 @@