<winboll>APK 15.20.7 release Publish.

新增 loadButtonIcon() 加载模型 iconPath 对应图片，
API 26+ 用 Icon.createWithBitmap，旧 API 用 EXTRA_SHORTCUT_ICON，
无图标时回退 ic_menu_manage。

.gitignore

@@ -100,3 +100,44 @@ lint-results.html
 /settings.gradle
 /gradle.properties
 
+## WinBoLL 项目配置
+#.git
+#.gitignore
+#.gitmodules
+#.gradle
+#.winboll
+#GenKeyStore
+#LICENSE
+#LICENSE-Private-Demo
+#LICENSE-Private-Demo_docs
+#README.md
+#aes
+#appbase
+appkey.jks
+appkey.keystore
+autonfc
+#build.gradle
+contacts
+debugtemp
+gallery
+gpsrelaysentinel
+#gradle
+gradle.properties
+#gradle.properties-android-demo
+#gradle.properties-androidx-demo
+#gradlew
+#libaes
+#libappbase
+libdebugtemp
+libgpsrelaysentinel
+#libwinboll
+local.properties
+#local.properties-demo
+mymessagemanager
+positions
+powerbell
+settings.gradle
+#settings.gradle-demo
+#winboll
+winboll.properties
+#winboll.properties-demo

.winboll/winboll_app_build.gradle

@@ -122,7 +122,6 @@ android {
                             // 如果正在调试，就拷贝到 WinBoLL 备份管理文件夹
                             // 
                             if(variant.flavorName == "beta"&&variant.buildType.name == "debug"){
-                                //File outBuildBckDir = new File(fWinBoLLStudioDir, "/${rootProject.name}/${variant.buildType.name}")
                                 File outBuildBckDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/${variant.buildType.name}")
                                 // 创建目标路径目录
                                 if(!outBuildBckDir.exists()) {
@@ -130,6 +129,7 @@ android {
                                     println "Output Folder Created.(WinBoLLStudio) : " + outBuildBckDir.getAbsolutePath()
                                 }
                                 if(outBuildBckDir.exists()) {
+                                    def targetApkFile = new File(outBuildBckDir, outputFileName)
                                     copy{
                                         from file.outputFile
                                         into outBuildBckDir
@@ -138,6 +138,14 @@ android {
                                         }
                                         println "Output APK (WinBoLLStudio): " + outBuildBckDir.getAbsolutePath() + "/${outputFileName}"
                                     }
+                                    // ========== 设置文件权限为775 ==========
+                                    if(targetApkFile.exists()){
+                                        exec {
+                                            commandLine 'chmod', '775', targetApkFile.absolutePath
+                                        }
+                                        println "Set file permission to 775 : ${targetApkFile.absolutePath}"
+                                    }
+
                                     // 检查编译标志位配置
                                     assert (winbollBuildProps['buildCount'] != null)
                                     assert (winbollBuildProps['libraryProject'] != null)
@@ -160,8 +168,7 @@ android {
                                         assert(libraryProjectBuildPropsFile.exists())
                                         java.nio.file.Path sourceFilePath = winbollBuildPropsFile.toPath();
                                         java.nio.file.Path targetFilePath = libraryProjectBuildPropsFile.toPath();
-                                        // 使用copyTo()方法复制文件，如果目标文件存在会被覆盖，可选参数可以选择不覆盖
-	                                    java.nio.file.Files.copy(sourceFilePath, targetFilePath, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+                                        java.nio.file.Files.copy(sourceFilePath, targetFilePath, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
 										
 										println "\n\n>>> Library Project build.properties saved.\n\n";
                                     }
@@ -172,16 +179,12 @@ android {
                             //
                             if(variant.flavorName == "stage"&&variant.buildType.name == "release"){
                                 // 发布 APK 文件
-                                //
-                                // 截取版本号的版本字段为短版本名
                                 String szVersionName = "${versionName}"
                                 String[] szlistTemp = szVersionName.split("-")
                                 String szShortVersionName = szlistTemp[0]
-                                //String szCommonTagAPKName = "${rootProject.name}_" + szShortVersionName + ".apk"
                                 String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk"
                                 println "CommonTagAPKName is : " + szCommonTagAPKName
                                 
-                                //File outTagDir = new File(fWinBoLLStudioDir, "/${rootProject.name}/tag/")
                                 File outTagDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/tag/")
                                 // 创建目标路径目录
                                 if(!outTagDir.exists()) {
@@ -192,12 +195,10 @@ android {
                                 if(outTagDir.exists()) {
                                     File targetAPK = new File(outTagDir, "${szCommonTagAPKName}")
                                     if(targetAPK.exists()) {
-                                        // 标签版本APK文件已经存在，构建拷贝任务停止
                                         assert (!targetAPK.exists())
-                                        // 可选择删除并继续输出APK文件
-                                        //delete targetAPK
                                     }
-                                    // 复制一个备份
+                                    // 复制完整版APK
+                                    def fullApkFile = new File(outTagDir, outputFileName)
                                     copy{
                                         from file.outputFile
                                         into outTagDir
@@ -206,7 +207,16 @@ android {
                                         }
                                         println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${outputFileName}"
                                     }
-                                    // 复制一个并重命名为短版本名
+                                    // 设置权限775。
+                                    if(fullApkFile.exists()){
+                                        exec {
+                                            commandLine 'chmod', '775', fullApkFile.absolutePath
+                                        }
+                                        println "Set file permission to 775 : ${fullApkFile.absolutePath}"
+                                    }
+
+                                    // 复制短版本名APK
+                                    def shortApkFile = new File(outTagDir, szCommonTagAPKName)
                                     copy{
                                         from file.outputFile
                                         into outTagDir
@@ -215,6 +225,14 @@ android {
                                         }
                                         println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${szCommonTagAPKName}"
                                     }
+                                    // 设置权限775。
+                                    if(shortApkFile.exists()){
+                                        exec {
+                                            commandLine 'chmod', '775', shortApkFile.absolutePath
+                                        }
+                                        println "Set file permission to 775 : ${shortApkFile.absolutePath}"
+                                    }
+
                                     // 检查编译标志位配置
                                     assert (winbollBuildProps['stageCount'] != null)
                                     assert (winbollBuildProps['publishVersion'] != null)
@@ -239,14 +257,11 @@ android {
                                     fos.close();
                                     
                                     if(winbollBuildProps['libraryProject'] != "") {
-                                        // 如果应用 build.properties 文件设置了类库模块项目文件名
-                                        // 就拷贝一份新的编译标志配置到类库项目文件夹
                                         File libraryProjectBuildPropsFile = new File("$RootProjectDir/" + winbollBuildProps['libraryProject'] + "/build.properties")
                                         assert(winbollBuildPropsFile.exists())
                                         assert(libraryProjectBuildPropsFile.exists())
                                         java.nio.file.Path sourceFilePath = winbollBuildPropsFile.toPath();
                                         java.nio.file.Path targetFilePath = libraryProjectBuildPropsFile.toPath();
-                                        // 使用copyTo()方法复制文件，如果目标文件存在会被覆盖，可选参数可以选择不覆盖
                                         java.nio.file.Files.copy(sourceFilePath, targetFilePath, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
                                     }
                                     
@@ -263,17 +278,12 @@ android {
 							// 如果正在调试发布版，就只生成和输出APK文件，不处理 Git 仓库提交与更新问题。
 							//
 					        if(variant.flavorName == "stage"&&variant.buildType.name == "debug"){
-                                // 发布 APK 文件
-                                //
-                                // 截取版本号的版本字段为短版本名
                                 String szVersionName = "${versionName}"
                                 String[] szlistTemp = szVersionName.split("-")
                                 String szShortVersionName = szlistTemp[0]
-                                //String szCommonTagAPKName = "${rootProject.name}_" + szShortVersionName + ".apk"
                                 String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk"
                                 println "CommonTagAPKName is : " + szCommonTagAPKName
                                 
-                                //File outTagDir = new File(fWinBoLLStudioDir, "/${rootProject.name}/tag/")
                                 File outTagDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/${variant.buildType.name}/")
                                 // 创建目标路径目录
                                 if(!outTagDir.exists()) {
@@ -284,13 +294,11 @@ android {
                                 if(outTagDir.exists()) {
                                     File targetAPK = new File(outTagDir, "${szCommonTagAPKName}")
                                     if(targetAPK.exists()) {
-                                        // 标签版本APK文件已经存在，构建拷贝任务停止
 										println '如果是在调试 Stage 版应用包构建，请删除(注：在debug目录)现有的 Stage 应用包('+targetAPK.getAbsolutePath()+')。再编译一次。'
                                         assert (!targetAPK.exists())
-                                        // 可选择删除并继续输出APK文件
-                                        //delete targetAPK
                                     }
-                                    // 复制一个备份
+                                    // 复制完整版APK
+                                    def debugFullApk = new File(outTagDir, outputFileName)
                                     copy{
                                         from file.outputFile
                                         into outTagDir
@@ -299,7 +307,16 @@ android {
                                         }
                                         println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${outputFileName}"
                                     }
-                                    // 复制一个并重命名为短版本名
+                                    // 权限设为775。
+                                    if(debugFullApk.exists()){
+                                        exec {
+                                            commandLine 'chmod', '775', debugFullApk.absolutePath
+                                        }
+                                        println "Set file permission to 775 : ${debugFullApk.absolutePath}"
+                                    }
+
+                                    // 复制短版本名APK
+                                    def debugShortApk = new File(outTagDir, szCommonTagAPKName)
                                     copy{
                                         from file.outputFile
                                         into outTagDir
@@ -308,8 +325,13 @@ android {
                                         }
                                         println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${szCommonTagAPKName}"
                                     }
-                                    
-                                    //不保存编译标志配置
+                                    // 权限设为775
+                                    if(debugShortApk.exists()){
+                                        exec {
+                                            commandLine 'chmod', '775', debugShortApk.absolutePath
+                                        }
+                                        println "Set file permission to 775 : ${debugShortApk.absolutePath}"
+                                    }
                                 }
                             }
                             
@@ -328,6 +350,13 @@ android {
                                         }
                                         println "Output APK (Common): " + outCommonDir.getAbsolutePath() + "/${commandAPKName}"
                                     }
+                                    // 额外输出文件设置775权限
+                                    if(apkFile.exists()){
+                                        exec {
+                                            commandLine 'chmod', '775', apkFile.absolutePath
+                                        }
+                                        println "Set file permission to 775 : ${apkFile.absolutePath}"
+                                    }
                                 }
 						    }
                             

aes/README.md

@@ -20,7 +20,7 @@ WinBoLL AndroidX 可视化元素类库。
 
 1.  Fork 本仓库
 2.  新建 Feat_xxx 分支
-3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
+3.  提交代码 : ZhanGSKen(ZhanGSKen<ZhanGSKen@QQ.COM>)
 4.  新建 Pull Request
 
 

aes/build.gradle

@@ -26,7 +26,10 @@ android {
         applicationId "cc.winboll.studio.aes"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 1
+        //1. Android 官方规则
+		//-  versionCode  类型：int 整型
+		//- Java int 最大值：2147483647
+        versionCode 1520000
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun May 17 20:53:39 HKT 2026
-stageCount=5
+#Tue Jun 02 08:54:20 HKT 2026
+stageCount=13
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.4
+publishVersion=15.20.12
 buildCount=0
-baseBetaVersion=15.20.5
+baseBetaVersion=15.20.13

aes/src/main/java/cc/winboll/studio/aes/App.java

@@ -5,10 +5,11 @@ 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.GlobalApplication;
 import cc.winboll.studio.libappbase.ToastUtils;
+import java.util.ArrayList;
 
 
 public class App extends GlobalApplication {
@@ -18,8 +19,7 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-		setIsDebugging(BuildConfig.DEBUG);
-		//setIsDebugging(false);
+		AESThemeUtil.init(null);
 		WinBoLLActivityManager.init(this);
 
         // 初始化 Toast 框架

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

appbase/README.md

@@ -20,7 +20,7 @@ WinBoLL 安卓手机端安卓应用开发基础类库。
 
 1.  Fork 本仓库
 2.  新建 Feat_xxx 分支
-3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
+3.  提交代码 : ZhanGSKen(ZhanGSKen<ZhanGSKen@QQ.COM>)
 4.  新建 Pull Request
 
 

appbase/build.gradle

@@ -26,7 +26,10 @@ android {
         applicationId "cc.winboll.studio.appbase"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 1
+		//1. Android 官方规则
+		//-  versionCode  类型：int 整型
+		//- Java int 最大值：2147483647
+        versionCode 1520000
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun May 17 16:16:36 HKT 2026
-stageCount=16
+#Wed May 27 14:51:29 HKT 2026
+stageCount=23
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.15
+publishVersion=15.20.22
 buildCount=0
-baseBetaVersion=15.20.16
+baseBetaVersion=15.20.23

appbase/src/main/java/cc/winboll/studio/appbase/AboutActivity.java

@@ -37,7 +37,7 @@ public class AboutActivity extends Activity {
         appInfo.setAppName("APPBase");
         appInfo.setAppIcon(R.drawable.ic_winboll);
         appInfo.setAppDescription(getString(R.string.app_description));
-        appInfo.setAppGitName("WinBoLL");
+        appInfo.setAppGitName("APPBase");
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(branchName);
         appInfo.setAppGitAPPSubProjectFolder(branchName);

appbase/src/main/java/cc/winboll/studio/appbase/App.java

@@ -22,12 +22,6 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-		// 如果应用不在调试状态，就根据编译类型设置调试状态
-		if (isDebugging() != true) {
-			setIsDebugging(BuildConfig.DEBUG);
-		}
-		// release 版调试码
-		//setIsDebugging(!BuildConfig.DEBUG);
 		
         // 初始化 Toast 工具类（传入应用全局上下文，确保 Toast 可在任意地方调用）
         ToastUtils.init(getApplicationContext());

appbase/src/main/java/cc/winboll/studio/appbase/model/TestBean.java

@@ -2,8 +2,8 @@ package cc.winboll.studio.appbase.model;
 
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
 import java.io.IOException;
 
 /**

dailystamp/.gitignore

@@ -1 +0,0 @@
-/build

dailystamp/build.properties

@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Mon May 18 14:32:43 GMT 2026
-stageCount=0
-libraryProject=
-baseVersion=15.20
-publishVersion=15.20.0
-buildCount=1
-baseBetaVersion=15.20.1

dailystamp/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

dailystamp/src/beta/res/values-zh/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">印记标签 ☼</string>
-</resources>

dailystamp/src/beta/res/values/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Daily Stamp ☼</string>
-</resources>

dailystamp/src/main/AndroidManifest.xml

@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.dailystamp">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:label="@string/app_name"
-        android:theme="@style/MyAppTheme"
-        android:resizeableActivity="true"
-        android:name=".App">
-
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name">
-
-            <intent-filter>
-
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-
-            </intent-filter>
-
-        </activity>
-
-        <meta-data
-            android:name="android.max_aspect"
-            android:value="4.0"/>
-
-        <activity android:name=".GlobalApplication$CrashActivity"/>
-
-    </application>
-
-</manifest>

dailystamp/src/main/java/cc/winboll/studio/dailystamp/MainActivity.java

@@ -1,31 +0,0 @@
-package cc.winboll.studio.dailystamp;
-
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.ToastUtils;
-
-public class MainActivity extends AppCompatActivity {
-
-    LogView mLogView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-		Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
-		setSupportActionBar(toolbar);
-
-        mLogView = findViewById(R.id.logview);
-        
-        ToastUtils.show("onCreate");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-}

dailystamp/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>

dailystamp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

dailystamp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

dailystamp/src/main/res/values-zh/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">印记标签 ☼</string>
-</resources>

dailystamp/src/main/res/values/styles.xml

@@ -1,34 +0,0 @@
-<resources>
-
-    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-
-        <item name="themeDebug">@style/MyDebugActivityTheme</item>
-        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
-        <item name="toolbarTextColor">@color/toolbarTextColor</item>
-        <item name="textViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
-        <item name="textViewTextColor">?attr/mainWindowTextColor</item>
-        <item name="editTextBackgroundColor">?attr/mainWindowBackgroundColor</item>
-        <item name="editTextTextColor">?attr/mainWindowTextColor</item>
-        <item name="scrollViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
-        <item name="activityBackgroundColor">?attr/mainWindowBackgroundColor</item>
-        <item name="activityTextColor">?attr/mainWindowTextColor</item>
-        <item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
-        <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
-        <item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
-        <item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
-    </style>
-
-    <style name="MyDebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
-        <item name="colorTittle">?attr/mainWindowTextColor</item>
-        <item name="colorTittleBackgound">?attr/toolbarBackgroundColor</item>
-        <item name="colorText">?attr/debugTextColor</item>
-        <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
-        <item name="debugTextColor">@color/debugTextColor</item>
-        <item name="toolbarTextColor">@color/toolbarTextColor</item>
-    </style>
-
-</resources>

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.9'
+    //api 'cc.winboll.studio:libappbase:15.20.22'
 	// 备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'
+	api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.22'
 	
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun May 17 20:53:39 HKT 2026
-stageCount=5
+#Tue Jun 02 08:54:20 HKT 2026
+stageCount=13
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.4
+publishVersion=15.20.12
 buildCount=0
-baseBetaVersion=15.20.5
+baseBetaVersion=15.20.13

libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java

@@ -15,6 +15,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
+
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -22,8 +23,10 @@ import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+
 import cc.winboll.studio.libaes.DrawerMenuDataAdapter;
 import cc.winboll.studio.libaes.R;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.models.AESThemeBean;
 import cc.winboll.studio.libaes.models.DrawerMenuBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
@@ -34,8 +37,8 @@ import cc.winboll.studio.libaes.views.ADsBannerView;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import com.baoyz.widget.PullRefreshLayout;
+
 import java.util.ArrayList;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 
 public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBoLLActivity, AdapterView.OnItemClickListener {
 
@@ -44,7 +47,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
     static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
 
-    //protected Context mContext;
     ActivityType mActivityType;
     ActionBarDrawerToggle mActionBarDrawerToggle;
     DrawerLayout mDrawerLayout;
@@ -59,13 +61,14 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     public enum ActivityType { Main, Secondary }
     protected volatile AESThemeBean.ThemeType mThemeType;
     protected ArrayList<DrawerMenuBean> malDrawerMenuItem;
+
     abstract protected ActivityType initActivityType();
-    //abstract protected View initContentView(LayoutInflater inflater, ViewGroup rootView);
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        // 替换：使用工具类统一应用主题
+        AESThemeUtil.applyAppCompatTheme(this);
         mThemeType = AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
-        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
         super.onCreate(savedInstanceState);
         WinBoLLActivityManager.getInstance().add(this);
         mActivityType = initActivityType();
@@ -78,53 +81,32 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         return this;
     }
 
-	@Override
-	public String getTag() {
-		return TAG;
-	}
+    @Override
+    public String getTag() {
+        return TAG;
+    }
 
     @Override
     protected void onDestroy() {
-		WinBoLLActivityManager.getInstance().registeRemove(this);
+        WinBoLLActivityManager.getInstance().registeRemove(this);
         super.onDestroy();
-		// 修复：释放广告资源，避免内存泄漏
-		ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
-		if (adsBannerView != null) {
-			adsBannerView.releaseAdResources();
-		}
+        // 修复：释放广告资源，避免内存泄漏
+        ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
+        if (adsBannerView != null) {
+            adsBannerView.releaseAdResources();
+        }
     }
 
-    /*@Override
-	 public Intent getIntent() {
-	 // TODO: Implement this method
-	 return super.getIntent();
-	 }
-
-	 public Context getContext() {
-	 return this.mContext;
-	 }*/
-
     @Override
     public MenuInflater getMenuInflater() {
-        // TODO: Implement this method
         return super.getMenuInflater();
     }
 
-    /*public void setSubtitle(CharSequence context) {
-	 // TODO: Implement this method
-	 getSupportActionBar().setSubtitle(context);
-	 }*/
-
     @Override
     public void recreate() {
         super.recreate();
     }
 
-    /*@Override
-	 public boolean moveTaskToBack(boolean nonRoot) {
-	 return super.moveTaskToBack(nonRoot);
-	 }*/
-
     @Override
     public void startActivity(Intent intent) {
         super.startActivity(intent);
@@ -135,26 +117,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         super.startActivityForResult(intent, requestCode, options);
     }
 
-    /*@Override
-	 public FragmentManager getSupportFragmentManager() {
-	 return super.getSupportFragmentManager();
-	 }
-
-	 public void setSubtitle(int resId) {
-	 // TODO: Implement this method
-	 getSupportActionBar().setSubtitle(resId);
-	 }
-
-	 public void setTitle(CharSequence context) {
-	 // TODO: Implement this method
-	 getSupportActionBar().setTitle(context);
-	 }
-
-	 public void setTitle(int resId) {
-	 // TODO: Implement this method
-	 getSupportActionBar().setTitle(resId);
-	 }*/
-
     @Override
     public SharedPreferences getSharedPreferences(String name, int mode) {
         return super.getSharedPreferences(name, mode);
@@ -162,7 +124,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
 
     @Override
     public Context getApplicationContext() {
-        // TODO: Implement this method
         return super.getApplicationContext();
     }
 
@@ -173,25 +134,27 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (AESThemeUtil.onAppThemeItemSelected(this, item)) {
+        // 替换为 DrawerFragmentActivity 专属点击处理方法
+        if (AESThemeUtil.onWinBoLLThemeItemSelected(this, item)) {
             recreate();
-        } if (DevelopUtils.onDevelopItemSelected(this, item)) {
-			LogUtils.d(TAG, String.format("onOptionsItemSelected item.getItemId() %d ", item.getItemId()));
-		} else {
-			return super.onOptionsItemSelected(item);
-		}
+        }
+        if (DevelopUtils.onDevelopItemSelected(this, item)) {
+            LogUtils.d(TAG, String.format("onOptionsItemSelected item.getItemId() %d ", item.getItemId()));
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
 
-		return true;
+        return true;
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
-		ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
-		if (adsBannerView != null) {
-			adsBannerView.resumeADs(DrawerFragmentActivity.this);
-		}
+        ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
+        if (adsBannerView != null) {
+            adsBannerView.resumeADs(DrawerFragmentActivity.this);
+        }
     }
 
     void initRootView() {
@@ -213,14 +176,13 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         mPullRefreshLayout = findViewById(R.id.activitydrawerfragmentPullRefreshLayout1);
 
         mPullRefreshLayout.setOnRefreshListener(new PullRefreshLayout.OnRefreshListener() {
-                @Override
-                public void onRefresh() {
-                    //LogUtils.d(TAG, "onRefresh");
-                    reinitDrawerMenuItemList(malDrawerMenuItem);
-                    mDrawerMenuDataAdapter.notifyDataSetChanged();
-                    mPullRefreshLayout.setRefreshing(false);
-                }
-            });
+				@Override
+				public void onRefresh() {
+					reinitDrawerMenuItemList(malDrawerMenuItem);
+					mDrawerMenuDataAdapter.notifyDataSetChanged();
+					mPullRefreshLayout.setRefreshing(false);
+				}
+			});
 
         malDrawerMenuItem = new ArrayList<DrawerMenuBean>();
 
@@ -236,68 +198,51 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
 
         mActionBarDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, mToolbar, R.string.lib_name, R.string.lib_name) {
             @Override
-            public void onDrawerOpened(View drawerView) {//完全打开时触发
+            public void onDrawerOpened(View drawerView) {
                 super.onDrawerOpened(drawerView);
                 mIsDrawerOpened = true;
                 mIsDrawerOpening = false;
-                //Toast.makeText(MainActivity.this,"onDrawerOpened",Toast.LENGTH_SHORT).show();
             }
 
             @Override
-            public void onDrawerClosed(View drawerView) {//完全关闭时触发
+            public void onDrawerClosed(View drawerView) {
                 super.onDrawerClosed(drawerView);
                 mIsDrawerOpened = false;
                 mIsDrawerClosing = false;
-                //Toast.makeText(MainActivity.this,"onDrawerClosed",Toast.LENGTH_SHORT).show();
             }
 
-            /** 
-             * 当抽屉被滑动的时候调用此方法 
-             * slideOffset表示 滑动的幅度（0-1） 
-             */  
             @Override
             public void onDrawerSlide(View drawerView, float slideOffset) {
                 super.onDrawerSlide(drawerView, slideOffset);
             }
 
-            /** 
-             * 当抽屉滑动状态改变的时候被调用 
-             * 状态值是STATE_IDLE（闲置--0）, STATE_DRAGGING（拖拽的--1）, STATE_SETTLING（固定--2）中之一。 
-             *具体状态可以慢慢调试
-             */  
             @Override
             public void onDrawerStateChanged(int newState) {
                 super.onDrawerStateChanged(newState);
             }
         };
 
-        //设置显示旋转菜单
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        //通过下面这句实现toolbar和Drawer的联动：如果没有这行代码，箭头是不会随着侧滑菜单的开关而变换的（或者没有箭头），
-        // 可以尝试一下，不影响正常侧滑
         mActionBarDrawerToggle.syncState();
         mDrawerLayout.setDrawerListener(mActionBarDrawerToggle);
 
-        //去掉侧滑的默认图标（动画箭头图标），也可以选择不去，
-        //不去的话把这一行注释掉或者改成true，然后把toolbar.setNavigationIcon注释掉就行了
-        //mActionBarDrawerToggle.setDrawerIndicatorEnabled(false);
         mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (mIsDrawerOpened || mIsDrawerOpening) {
-                        mIsDrawerClosing = true;
-                        mIsDrawerOpening = false;
-                        mDrawerLayout.closeDrawer(mPullRefreshLayout);
-                        return;
-                    } 
-                    if (!mIsDrawerOpened || mIsDrawerClosing) {
-                        mIsDrawerOpening = true;
-                        mIsDrawerClosing = false;
-                        mDrawerLayout.openDrawer(mPullRefreshLayout);
-                        return;
-                    }
-                }
-            });
+				@Override
+				public void onClick(View v) {
+					if (mIsDrawerOpened || mIsDrawerOpening) {
+						mIsDrawerClosing = true;
+						mIsDrawerOpening = false;
+						mDrawerLayout.closeDrawer(mPullRefreshLayout);
+						return;
+					}
+					if (!mIsDrawerOpened || mIsDrawerClosing) {
+						mIsDrawerOpening = true;
+						mIsDrawerClosing = false;
+						mDrawerLayout.openDrawer(mPullRefreshLayout);
+						return;
+					}
+				}
+			});
 
         initDrawerMenuItemList(malDrawerMenuItem);
     }
@@ -305,12 +250,11 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     void initSecondaryRootView() {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    //LogUtils.d(TAG, "onClick " + Integer.toString(v.getId()));
-                    finish();
-                }
-            });
+				@Override
+				public void onClick(View v) {
+					finish();
+				}
+			});
     }
 
     public <T extends Fragment> int removeFragment(T fragment) {
@@ -375,13 +319,13 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         if (mActivityType == ActivityType.Main) {
-			// 主题菜单
-            AESThemeUtil.inflateMenu(this, menu);
-			// 调试工具菜单
-			if (GlobalApplication.isDebugging()) {
-				DevelopUtils.inflateMenu(this, menu);
-			}
-			// 应用信息菜单
+            // 替换为兼容版菜单加载方法
+            AESThemeUtil.inflateCompatThemeMenu(this, menu);
+            // 调试工具菜单
+            if (GlobalApplication.isDebugging()) {
+                DevelopUtils.inflateMenu(this, menu);
+            }
+            // 应用信息菜单
             getMenuInflater().inflate(R.menu.toolbar_drawerbase, menu);
         }
         return super.onCreateOptionsMenu(menu);
@@ -392,3 +336,4 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         super.onActivityResult(who, targetFragment, requestCode);
     }
 }
+

libaes/src/main/java/cc/winboll/studio/libaes/models/AESThemeBean.java

@@ -8,8 +8,9 @@ package cc.winboll.studio.libaes.models;
 import android.util.JsonReader;
 import android.util.JsonWriter;
 import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libappbase.BaseBean;
+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<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);
-    
+
     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();
             }
         }

libaes/src/main/java/cc/winboll/studio/libaes/models/WinBoLLClientServiceBean.java

@@ -7,7 +7,7 @@ package cc.winboll.studio.libaes.models;
 import android.content.Context;
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
+import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
 import java.io.IOException;
 
 public class WinBoLLClientServiceBean extends BaseBean {

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java

@@ -12,7 +12,6 @@ import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libaes.views.ASupportToolbar;
 import cc.winboll.studio.libappbase.LogUtils;
 
 public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBoLLActivity  {
@@ -28,11 +27,12 @@ public class TestASupportToolbarActivity extends AppCompatActivity implements IW
     public String getTag() {
         return TAG;
     }
-    
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         LogUtils.d(TAG, "onCreate() start");
-        AESThemeUtil.applyAppTheme(this);
+        // 替换此处：原 applyAppTheme -> 新方法 applyAppCompatTheme
+        AESThemeUtil.applyAppCompatTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_testasupporttoolbar);
         LogUtils.d(TAG, "setContentView() done");
@@ -45,3 +45,4 @@ public class TestASupportToolbarActivity extends AppCompatActivity implements IW
         LogUtils.d(TAG, "onCreate() end");
     }
 }
+

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java

@@ -14,10 +14,11 @@ import cc.winboll.studio.libaes.utils.AESThemeUtil;
 public class TestAToolbarActivity extends Activity {
 
     public static final String TAG = "TestAToolbarActivity";
-    
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        AESThemeUtil.applyAppTheme(this);
+        // 原生Activity 使用 applyTheme
+        AESThemeUtil.applyTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_testatoolbar);
         Toolbar toolbar = findViewById(R.id.activitytestatoolbarAToolbar1);
@@ -26,3 +27,4 @@ public class TestAToolbarActivity extends Activity {
     }
 
 }
+

libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java

@@ -9,203 +9,165 @@ 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 {
 
     public static final String TAG = "AESThemeUtil";
+    private static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
+    private static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
 
-    static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
-    static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
+    // 私有静态集合，外部不可直接修改
+    private static ArrayList<Integer> themeStyleIDList = new ArrayList<>();
 
-    protected volatile AESThemeBean.ThemeType mThemeType;
+    // 移除无用实例成员 mThemeType，工具类不保留实例字段
 
-    public static <T extends Context> int getThemeTypeID(T context) {
-        AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
-        return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES): bean.getCurrentThemeTypeID();
+    /**
+     * 初始化主题样式ID集合
+     */
+    public static void init(ArrayList<Integer> themeStyleIDList) {
+		if(themeStyleIDList == null) {
+			themeStyleIDList = new ArrayList<Integer>();
+			AESThemeBean.fillThemeStyleIDList(themeStyleIDList);
+		}
+		AESThemeUtil.themeStyleIDList.clear();
+		AESThemeUtil.themeStyleIDList.addAll(themeStyleIDList);
     }
 
-    public static <T extends Context> void saveThemeStyleID(T context, int nThemeTypeID) {
-        AESThemeBean bean = new AESThemeBean(nThemeTypeID);
+    /**
+     * 获取当前主题样式ID
+     */
+    public static int getThemeTypeID(Context context) {
+        AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
+        return bean == null ? getThemeStyleID(AESThemeBean.ThemeType.AES) : bean.getCurrentThemeTypeID();
+    }
+
+    /**
+     * 保存主题样式ID
+     */
+    public static void saveThemeStyleID(Context context, int themeTypeID) {
+        AESThemeBean bean = new AESThemeBean(themeTypeID);
         AESThemeBean.saveBean(context, bean);
     }
 
-    public static <T extends Activity> void applyAppTheme(T activity) {
+    // ====================== 应用主题 - 规范重载 ======================
+    /**
+     * 应用当前持久化主题（通用 Activity）
+     */
+    public static void applyTheme(Activity activity) {
         activity.setTheme(getThemeTypeID(activity));
     }
 
-    public static <T extends AppCompatActivity> void applyAppCompatTheme(T activity) {
+    /**
+     * 应用指定主题（通用 Activity）
+     */
+    public static void applyTheme(Activity activity, AESThemeBean.ThemeType themeType) {
+        activity.setTheme(getThemeStyleID(themeType));
+    }
+
+    /**
+     * 应用当前持久化主题（AppCompat 兼容 Activity）
+     */
+    public static void applyAppCompatTheme(AppCompatActivity activity) {
         activity.setTheme(getThemeTypeID(activity));
     }
 
-    /*public static <T extends WinBoLLActivity> void applyWinBoLLTheme(T activity) {
-	 activity.setTheme(getThemeTypeID(activity.getApplicationContext()));
-	 }*/
-
-    public static <T extends Activity> void applyAppTheme(Activity activity, AESThemeBean.ThemeType themeType) {
-        activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
+    /**
+     * 应用指定主题（AppCompat 兼容 Activity）
+     */
+    public static void applyAppCompatTheme(AppCompatActivity activity, AESThemeBean.ThemeType themeType) {
+        activity.setTheme(getThemeStyleID(themeType));
     }
 
-    public static <T extends AppCompatActivity> void applyAppCompatTheme(Activity activity, AESThemeBean.ThemeType themeType) {
-        activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
-    }
-
-    /*public static <T extends WinBoLLActivity> void applyWinBoLLTheme(Activity activity, AESThemeBean.ThemeType themeType) {
-	 activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
-	 }*/
-
-    public static <T extends Activity> void inflateMenu(T activity, Menu menu) {
+    // ====================== 加载菜单 ======================
+    /**
+     * 加载主题菜单（通用 Activity）
+     */
+    public static void inflateThemeMenu(Activity activity, Menu menu) {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
     }
 
-    public static <T extends AppCompatActivity> void inflateCompatMenu(T activity, Menu menu) {
+    /**
+     * 加载主题菜单（AppCompat Activity）
+     */
+    public static void inflateCompatThemeMenu(AppCompatActivity activity, Menu menu) {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
     }
 
-    /*public static <T extends WinBoLLActivity> void inflateWinBoLLMenu(T activity, Menu menu) {
-	 activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
-	 }*/
-
-    public static <T extends Activity> boolean onAppThemeItemSelected(T activity, MenuItem item) {
-        int nThemeStyleID;
-        if (R.id.item_depththeme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        } else if (R.id.item_skytheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        } else if (R.id.item_goldentheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        } else if (R.id.item_bearingtheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        } else if (R.id.item_memortheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        } else if (R.id.item_taotheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
+    // ====================== 菜单点击统一核心逻辑（消除重复代码） ======================
+    /**
+     * 主题菜单项点击统一处理
+     * @param context 上下文（用于持久化）
+     * @param item 点击的菜单项
+     * @return 是否消费点击事件
+     */
+    public static boolean handleThemeMenuClick(Context context, MenuItem item) {
+        int themeStyleId;
+        int itemId = item.getItemId();
+        if (R.id.item_depththeme == itemId) {
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
+        } else if (R.id.item_skytheme == itemId) {
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.SKY);
+        } else if (R.id.item_goldentheme == itemId) {
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
+        } else if (R.id.item_bearingtheme == itemId) {
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.BEARING);
+        } else if (R.id.item_memortheme == itemId) {
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
+        } else if (R.id.item_taotheme == itemId) {
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.TAO);
+        } else if (R.id.item_defaulttheme == itemId) {
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.AES);
+        } else {
+            return false;
         }
-
-        return false;
+        saveThemeStyleID(context, themeStyleId);
+        return true;
     }
 
-    public static <T extends AppCompatActivity> boolean onAppCompatThemeItemSelected(T activity, MenuItem item) {
-        int nThemeStyleID;
-        if (R.id.item_depththeme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        } else if (R.id.item_skytheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        } else if (R.id.item_goldentheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        } else if (R.id.item_bearingtheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        } else if (R.id.item_memortheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        } else if (R.id.item_taotheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        }
-
-        return false;
+    // 对外暴露不同 Activity 类型的入口，内部调用统一核心方法
+    public static boolean onThemeItemSelected(Activity activity, MenuItem item) {
+        return handleThemeMenuClick(activity, item);
     }
 
-    public static <T extends AppCompatActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) {
-        int nThemeStyleID;
-        if (R.id.item_depththeme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_skytheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_goldentheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_bearingtheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_memortheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_taotheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        }
-
-        return false;
+    public static boolean onAppCompatThemeItemSelected(AppCompatActivity activity, MenuItem item) {
+        return handleThemeMenuClick(activity, item);
     }
 
-    public static <T extends DrawerFragmentActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) {
-        int nThemeStyleID;
-        if (R.id.item_depththeme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_skytheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_goldentheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_bearingtheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_memortheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_taotheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        }
+    public static boolean onWinBoLLThemeItemSelected(AppCompatActivity activity, MenuItem item) {
+        // 使用 Application 上下文保存，避免 Activity 泄漏
+        return handleThemeMenuClick(activity.getApplicationContext(), item);
+    }
 
-        return false;
+    public static boolean onWinBoLLThemeItemSelected(DrawerFragmentActivity activity, MenuItem item) {
+        return handleThemeMenuClick(activity.getApplicationContext(), item);
+    }
+
+    // ====================== 主题类型转换工具 ======================
+    /**
+     * 根据枚举获取对应样式ID
+     */
+    public static int getThemeStyleID(AESThemeBean.ThemeType themeType) {
+        return themeStyleIDList.get(themeType.ordinal());
+    }
+
+    /**
+     * 根据样式ID反向获取主题枚举
+     */
+    public static AESThemeBean.ThemeType getThemeStyleType(int themeStyleID) {
+        for (int i = 0; i < themeStyleIDList.size(); i++) {
+            if (themeStyleIDList.get(i) == themeStyleID) {
+                return AESThemeBean.ThemeType.values()[i];
+            }
+        }
+        return AESThemeBean.ThemeType.values()[0];
     }
 }
+

libaes/src/main/res/values-night/colors.xml

@@ -3,15 +3,15 @@
 
     <color name="colorTextColor">#FFFFFFFF</color>
     <color name="colorPrimary">#FF03AB4E</color>
-    <color name="colorPrimaryDark">#FF027C39</color>
-    <color name="colorAccent">#FF3DDC84</color>
+    <color name="colorPrimaryDark">#FF3DDC84</color>
+    <color name="colorAccent">#FF027C39</color>
     <color name="colorText">#FFFFFB8D</color>
-    <color name="colorToastFrame">#FFA9A9A9</color>
+    <color name="colorToastFrame">#FF555555</color>
     <color name="colorToastShadow">#FF000000</color>
-    <color name="colorToastBackgroung">#FFFFFFFF</color>
-    <color name="colorAToolbarStartColor">#FF7D3F12</color>
-    <color name="colorAToolbarCenterColor">#FFCC6E2B</color>
-    <color name="colorAToolbarEndColor">#FFF4B98F</color>
+    <color name="colorToastBackgroung">#FF3A3A3A</color>
+    <color name="colorAToolbarStartColor">#FF5A3A1A</color>
+    <color name="colorAToolbarCenterColor">#FFA05A2A</color>
+    <color name="colorAToolbarEndColor">#FFD4A07A</color>
 
     <color name="colorACardShadow">@color/colorPrimaryDark</color>
     <color name="colorACardFrame">@color/colorPrimary</color>
@@ -24,7 +24,7 @@
     <color name="colorOHPCTSSecondaryProgress">@color/colorPrimary</color>
     <color name="colorOHPCTSProgress">@color/colorPrimaryDark</color>
 
-    <color name="toolbarBackgroundColor">#FF03AB4E</color>
+    <color name="toolbarBackgroundColor">#FF3DDC84</color>
     <color name="toolbarTextColor">#FFFFFFFF</color>
     <color name="mainWindowBackgroundColor">#FF2C2C2C</color>
     <color name="mainWindowTextColor">#FFFFFFFF</color>

libaes/src/main/res/values-night/styles.xml

@@ -2,6 +2,9 @@
 <resources>
 
     <style name="AESTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="colorPrimary">#FF03AB4E</item>
+        <item name="colorPrimaryDark">#FF3DDC84</item>
+        <item name="colorAccent">#FF027C39</item>
         <item name="themeDebug">@style/DebugActivityTheme</item>
         <item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
         <item name="aboutViewTextColor">@color/mainWindowTextColor</item>
@@ -40,52 +43,52 @@
 
     <style name="AESAToolbar">
         <item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">@color/colorPrimary</item>
-        <item name="attrAToolbarEndColor">@color/colorAccent</item>
+        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
     </style>
 
     <style name="AESASupportToolbar">
         <item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">@color/colorAccent</item>
+        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
     </style>
 
     <style name="DepthAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FF0065EC</item>
-        <item name="colorPrimaryDark">#FF004DB4</item>
-        <item name="colorAccent">#FF4A97FF</item>
+        <item name="colorPrimaryDark">#FF4A97FF</item>
+        <item name="colorAccent">#FF004DB4</item>
     </style>
 
     <style name="SkyAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FF00A6FF</item>
-        <item name="colorPrimaryDark">#FF007ABB</item>
-        <item name="colorAccent">#FF84D4FF</item>
+        <item name="colorPrimaryDark">#FF84D4FF</item>
+        <item name="colorAccent">#FF007ABB</item>
     </style>
 
     <style name="GoldenAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FFF0CA11</item>
-        <item name="colorPrimaryDark">#FFD3AF00</item>
-        <item name="colorAccent">#FFFFE35C</item>
+        <item name="colorPrimaryDark">#FFFFE35C</item>
+        <item name="colorAccent">#FFD3AF00</item>
     </style>
 
     <style name="BearingAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FF840FFF</item>
-        <item name="colorPrimaryDark">#FF6900D7</item>
-        <item name="colorAccent">#FFBA78FF</item>
+        <item name="colorPrimaryDark">#FFBA78FF</item>
+        <item name="colorAccent">#FF6900D7</item>
     </style>
 
     <style name="MemorAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FFFF00F5</item>
-        <item name="colorPrimaryDark">#FFE500DC</item>
-        <item name="colorAccent">#FFFF76FA</item>
+        <item name="colorPrimaryDark">#FFFF76FA</item>
+        <item name="colorAccent">#FFE500DC</item>
     </style>
 
     <style name="TaoAESTheme" parent="AESTheme">
-        <item name="colorPrimary">#FFACACAC</item>
-        <item name="colorPrimaryDark">#FF898989</item>
-        <item name="colorAccent">#FFD8D8D8</item>
+        <item name="colorPrimary">#FF7E7E7E</item>
+        <item name="colorPrimaryDark">#FFE2E2E2</item>
+        <item name="colorAccent">#FF000000</item>
     </style>
 
     <style name="NormalDialogStyle" parent="Theme.AppCompat.Dialog">

libaes/src/main/res/values/styles.xml

@@ -2,6 +2,9 @@
 <resources>
 
     <style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">#FF03AB4E</item>
+        <item name="colorPrimaryDark">#FF027C39</item>
+        <item name="colorAccent">#FF3DDC84</item>
         <item name="themeDebug">@style/DebugActivityTheme</item>
         <item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
         <item name="aboutViewTextColor">@color/mainWindowTextColor</item>
@@ -40,16 +43,16 @@
 
     <style name="AESAToolbar">
         <item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">@color/colorPrimary</item>
-        <item name="attrAToolbarEndColor">@color/colorAccent</item>
+        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
     </style>
 
     <style name="AESASupportToolbar">
         <item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">@color/colorAccent</item>
+        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
     </style>
 
     <style name="DepthAESTheme" parent="AESTheme">
@@ -83,9 +86,9 @@
     </style>
 
     <style name="TaoAESTheme" parent="AESTheme">
-        <item name="colorPrimary">#FFACACAC</item>
-        <item name="colorPrimaryDark">#FF898989</item>
-        <item name="colorAccent">#FFD8D8D8</item>
+        <item name="colorPrimary">#FF7E7E7E</item>
+        <item name="colorPrimaryDark">#FF000000</item>
+        <item name="colorAccent">#FFE2E2E2</item>
     </style>
 
     <style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog">
@@ -109,4 +112,4 @@
         <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item>
     </style>
 
-</resources>
+</resources>

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun May 17 16:16:36 HKT 2026
-stageCount=16
+#Wed May 27 14:51:29 HKT 2026
+stageCount=23
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.15
+publishVersion=15.20.22
 buildCount=0
-baseBetaVersion=15.20.16
+baseBetaVersion=15.20.23

libappbase/src/main/java/cc/winboll/studio/libappbase/APPModel.java

@@ -2,6 +2,7 @@ package cc.winboll.studio.libappbase;
 
 import android.util.JsonReader;
 import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
 import java.io.IOException;
 
 /**

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java

@@ -129,11 +129,10 @@ public class GlobalApplication extends Application {
         // 初始化单例实例（确保在所有初始化操作前完成）
         sInstance = this;
 
+        restoreDebugStatus();
         // 初始化基础组件（日志、崩溃处理、Toast）
         initCoreComponents();
-        // 恢复/初始化调试模式状态（从本地文件读取，无文件则默认关闭调试）
-        restoreDebugStatus();
-        // 新增：初始化服务器地址（从 SP 读取到内存，提高后续访问效率）
+        // 初始化服务器地址（从 SP 读取到内存，提高后续访问效率）
         initWinbollHost();
 
         LogUtils.d(TAG, "GlobalApplication 初始化完成，单例实例已创建");
@@ -144,7 +143,11 @@ public class GlobalApplication extends Application {
      */
     private void initCoreComponents() {
         // 初始化日志工具（传入 Application 上下文）
-        LogUtils.init(this);
+		
+		// 调试状态下初始化日志工具
+		if (GlobalApplication.isDebugging()) {
+			LogUtils.init(this);
+		}
         // 初始化全局异常处理器（捕获应用崩溃信息，用于调试或上报）
         CrashHandler.init(this);
         // 初始化 Toast 工具（统一 Toast 样式、避免内存泄漏等）

libappbase/src/main/java/cc/winboll/studio/libappbase/LogActivity.java

@@ -27,6 +27,11 @@ public class LogActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+		if(!GlobalApplication.isDebugging()) {
+			ToastUtils.show("非调试状态日志功能不可用");
+			finish();
+		}
+		
         // 设置布局文件（包含 LogView 控件）
         setContentView(R.layout.activity_log);
 

libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java

@@ -67,45 +67,29 @@ public class LogUtils {
 
     // ====================== 初始化入口 ======================
     public static void init(final Context context) {
-        init(context, LOG_LEVEL.Off);
+		init(context, LOG_LEVEL.Off);
     }
 
     public static void init(final Context context, final LOG_LEVEL logLevel) {
-        Log.d(TAG, "init 执行日志工具初始化");
-        _mContext = context;
+		if (!GlobalApplication.isDebugging()) {
+			return;
+		}
+		Log.d(TAG, "init 执行日志工具初始化");
+		_mContext = context;
 
-        if (GlobalApplication.isDebugging()) {
-            initDebugDir();
-        } else {
-            initReleaseDir();
-        }
+		initLogUtilsDir();
 
-        initLogConfigBean();
-        addClassTAGList();
-        loadTAGBeanSettings();
-        checkAndTrimLogFileSize();
+		initLogConfigBean();
+		addClassTAGList();
+		loadTAGBeanSettings();
+		checkAndTrimLogFileSize();
 
-        _IsInited = true;
-        Log.d(TAG, "init 日志工具初始化完成");
+		_IsInited = true;
+		Log.d(TAG, "init 执行日志工具初始化完成");
     }
 
     // ====================== 目录初始化 ======================
-    private static void initDebugDir() {
-        final Context appContext = _mContext.getApplicationContext();
-        _mfLogCacheDir = new File(appContext.getExternalCacheDir(), TAG);
-        if (!_mfLogCacheDir.exists()) {
-            _mfLogCacheDir.mkdirs();
-        }
-        _mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
-
-        _mfLogDataDir = appContext.getExternalFilesDir(TAG);
-        if (!_mfLogDataDir.exists()) {
-            _mfLogDataDir.mkdirs();
-        }
-        _mfLogUtilsBeanFile = new File(_mfLogDataDir, TAG + ".json");
-    }
-
-    private static void initReleaseDir() {
+    private static void initLogUtilsDir() {
         final Context appContext = _mContext.getApplicationContext();
         _mfLogCacheDir = new File(appContext.getCacheDir(), TAG);
         if (!_mfLogCacheDir.exists()) {
@@ -113,7 +97,7 @@ public class LogUtils {
         }
         _mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
 
-        _mfLogDataDir = new File(appContext.getFilesDir(), TAG);
+        _mfLogDataDir = appContext.getExternalFilesDir(TAG);
         if (!_mfLogDataDir.exists()) {
             _mfLogDataDir.mkdirs();
         }
@@ -136,7 +120,7 @@ public class LogUtils {
         }
 
 		final long KEEP_FILE_SIZE = 25000L; // ~25KB 确保剪贴板可完整复制
-        final long MAX_FILE_SIZE = 2*KEEP_FILE_SIZE;
+        final long MAX_FILE_SIZE = 2 * KEEP_FILE_SIZE;
         final long fileSize = _mfLogCatchFile.length();
 
         if (fileSize <= MAX_FILE_SIZE) {
@@ -266,6 +250,9 @@ public class LogUtils {
     }
 
     public static void setTAGListEnable(final String tag, final boolean isEnable) {
+        if (!_IsInited) {
+            return;
+        }
         final Iterator<Map.Entry<String, Boolean>> iterator = mapTAGList.entrySet().iterator();
         while (iterator.hasNext()) {
             final Map.Entry<String, Boolean> entry = iterator.next();
@@ -279,6 +266,9 @@ public class LogUtils {
     }
 
     public static void setALlTAGListEnable(final boolean isEnable) {
+        if (!_IsInited) {
+            return;
+        }
         for (final Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
             entry.setValue(isEnable);
         }
@@ -288,15 +278,22 @@ public class LogUtils {
 
     // ====================== 日志级别控制 ======================
     public static void setLogLevel(final LOG_LEVEL logLevel) {
+        if (_mLogUtilsBean == null) {
+            Log.d(TAG, "setLogLevel LogUtils未初始化，忽略设置日志级别");
+            return;
+        }
         _mLogUtilsBean.setLogLevel(logLevel);
         _mLogUtilsBean.saveBeanToFile(_mfLogUtilsBeanFile.getPath(), _mLogUtilsBean);
     }
 
     public static LOG_LEVEL getLogLevel() {
-        return _mLogUtilsBean.getLogLevel();
+        return _mLogUtilsBean == null ?LOG_LEVEL.Off: _mLogUtilsBean.getLogLevel();
     }
 
     private static boolean isLoggable(final String tag, final LOG_LEVEL logLevel) {
+		if (!GlobalApplication.isDebugging()) {
+			return false;
+		}
         if (!_IsInited) {
             return false;
         }

libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtilsBean.java

@@ -2,6 +2,7 @@ package cc.winboll.studio.libappbase;
 
 import android.util.JsonReader;
 import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
 import java.io.IOException;
 
 /**

libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtilsClassTAGBean.java

@@ -2,6 +2,7 @@ package cc.winboll.studio.libappbase;
 
 import android.util.JsonReader;
 import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
 import java.io.IOException;
 
 /**

libappbase/src/main/java/cc/winboll/studio/libappbase/LogViewThread.java

@@ -1,6 +1,7 @@
 package cc.winboll.studio.libappbase;
 
 import android.os.FileObserver;
+import java.io.File;
 import java.lang.ref.WeakReference;
 
 /**
@@ -51,30 +52,38 @@ public class LogViewThread extends Thread {
      */
     @Override
     public void run() {
-        // 获取日志缓存目录路径（从 LogUtils 统一获取，确保路径一致性）
-        String logDirPath = LogUtils.getLogCacheDir().getPath();
-        LogUtils.d(TAG, "启动日志文件监听，监听目录：" + logDirPath);
+		// 调试状态进行日志输出任务
+		if (GlobalApplication.isDebugging()) {
+			// 获取日志缓存目录路径（从 LogUtils 统一获取，确保路径一致性）
+			File logDir = LogUtils.getLogCacheDir();
+			if (logDir == null) {
+				LogUtils.d(TAG, "日志缓存目录未初始化，线程退出");
+				return;
+			}
+			String logDirPath = logDir.getPath();
+			LogUtils.d(TAG, "启动日志文件监听，监听目录：" + logDirPath);
 
-        // 初始化日志文件监听器（监听目标目录的文件事件）
-        mLogListener = new LogListener(logDirPath);
-        // 开始监听文件事件（非阻塞，内部通过 Native 层实现）
-        mLogListener.startWatching();
+			// 初始化日志文件监听器（监听目标目录的文件事件）
+			mLogListener = new LogListener(logDirPath);
+			// 开始监听文件事件（非阻塞，内部通过 Native 层实现）
+			mLogListener.startWatching();
 
-        // 循环等待退出标志（每 1 秒检查一次，降低 CPU 占用）
-        while (!isExit()) {
-            try {
-                Thread.sleep(1000); // 休眠 1 秒，避免忙等
-            } catch (InterruptedException e) {
-                // 线程被中断时，恢复中断标志并退出循环（避免无限阻塞）
-                Thread.currentThread().interrupt();
-                LogUtils.d(TAG, "日志监听线程被中断，准备退出。" + e);
-                break;
-            }
-        }
+			// 循环等待退出标志（每 1 秒检查一次，降低 CPU 占用）
+			while (!isExit()) {
+				try {
+					Thread.sleep(1000); // 休眠 1 秒，避免忙等
+				} catch (InterruptedException e) {
+					// 线程被中断时，恢复中断标志并退出循环（避免无限阻塞）
+					Thread.currentThread().interrupt();
+					LogUtils.d(TAG, "日志监听线程被中断，准备退出。" + e);
+					break;
+				}
+			}
 
-        // 收到退出标志，停止监听并释放资源
-        mLogListener.stopWatching();
-        LogUtils.d(TAG, "日志文件监听已停止，线程退出");
+			// 收到退出标志，停止监听并释放资源
+			mLogListener.stopWatching();
+			LogUtils.d(TAG, "日志文件监听已停止，线程退出");
+		}
     }
 
     /**

libappbase/src/main/java/cc/winboll/studio/libappbase/models/libs1520000/BaseBean.java

@@ -0,0 +1,415 @@
+package cc.winboll.studio.libappbase.models.libs1520000;
+
+import android.content.Context;
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.UTF8FileUtils;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+
+/**
+ * WinBoLL JSON 数据模型基类（抽象类）
+ * 定义 Json Bean 的核心规范：序列化/反序列化、文件持久化、列表处理等通用逻辑，
+ * 子类需实现抽象方法，完成自身字段JSON读写业务逻辑
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @CreateTime 2026/05/19 22:33:00
+ * @EditTime 2026/05/19 23:15:48
+ * @param <T> 泛型约束，限定子类必须继承自BaseBean
+ */
+public abstract class BaseBean<T extends BaseBean> {
+
+    // ====================== 静态常量 ======================
+    /** 日志输出标识TAG */
+    public static final String TAG = "BaseBean";
+    /** JSON存储Bean类名字段Key，用于类型校验 */
+    static final String BEAN_NAME = "BeanName";
+
+    // ====================== 构造方法 ======================
+    /**
+     * 无参空构造，满足反射实例化要求
+     */
+    public BaseBean() {
+
+    }
+
+    // ====================== 抽象方法 ======================
+    /**
+     * 获取当前实体类全类名
+     * @return 全限定类名字符串
+     */
+    public abstract String getName();
+
+    /**
+     * 从JSON读取器解析构建实体对象
+     * @param jsonReader JSON读取流
+     * @return 解析完成实体对象
+     * @throws IOException IO读写异常
+     */
+    public abstract T readBeanFromJsonReader(final JsonReader jsonReader) throws IOException;
+
+    // ====================== 路径获取相关 ======================
+    /**
+     * 获取单个实体默认存储JSON文件路径
+     * @param context 应用上下文
+     * @return 文件绝对路径
+     */
+    public String getBeanJsonFilePath(final Context context) {
+        return context.getExternalFilesDir(TAG) + "/" + getName() + ".json";
+    }
+
+    /**
+     * 获取实体列表默认存储JSON文件路径
+     * @param context 应用上下文
+     * @return 文件绝对路径
+     */
+    public String getBeanListJsonFilePath(final Context context) {
+        return context.getExternalFilesDir(TAG) + "/" + getName() + "_List.json";
+    }
+
+    // ====================== JSON序列化基础方法 ======================
+    /**
+     * 写入基础Bean标识字段至JSON
+     * @param jsonWriter JSON写入流
+     * @throws IOException 写入异常
+     */
+    public void writeThisToJsonWriter(final JsonWriter jsonWriter) throws IOException {
+        jsonWriter.name(BEAN_NAME).value(getName());
+    }
+
+    /**
+     * 基类通用字段解析回调
+     * @param jsonReader JSON读取流
+     * @param name 字段名
+     * @return 是否完成当前字段解析
+     * @throws IOException 读取异常
+     */
+    public boolean initObjectsFromJsonReader(final JsonReader jsonReader, final String name) throws IOException {
+        return false;
+    }
+
+    // ====================== 实体字符串序列化 ======================
+    @Override
+    public String toString() {
+        LogUtils.d(TAG, "执行BaseBean实体转JSON字符串");
+        final StringWriter stringWriter = new StringWriter();
+        final JsonWriter jsonWriter = new JsonWriter(stringWriter);
+        jsonWriter.setIndent("  ");
+        try {
+            jsonWriter.beginObject();
+            writeThisToJsonWriter(jsonWriter);
+            jsonWriter.endObject();
+            return stringWriter.toString();
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "实体转JSON字符串异常", Thread.currentThread().getStackTrace());
+        }
+        return "";
+    }
+
+    // ====================== 列表序列化工具 ======================
+    /**
+     * Bean列表转为格式化JSON数组字符串
+     * @param beanList 实体集合
+     * @param <T> 实体泛型
+     * @return JSON字符串
+     */
+    public static <T extends BaseBean> String toStringByBeanList(final ArrayList<T> beanList) {
+        LogUtils.d(TAG, "执行Bean列表序列化JSON操作");
+        try {
+            final StringWriter stringWriter = new StringWriter();
+            final JsonWriter jsonWriter = new JsonWriter(stringWriter);
+            jsonWriter.setIndent("  ");
+            jsonWriter.beginArray();
+            for (int i = 0; i < beanList.size(); i++) {
+                jsonWriter.beginObject();
+                beanList.get(i).writeThisToJsonWriter(jsonWriter);
+                jsonWriter.endObject();
+            }
+            jsonWriter.endArray();
+            jsonWriter.close();
+            return stringWriter.toString();
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "列表序列化JSON异常", Thread.currentThread().getStackTrace());
+        }
+        return "";
+    }
+
+    // ====================== JSON字符串解析实体 ======================
+    /**
+     * JSON文本解析为单个实体对象
+     * @param szBean JSON文本
+     * @param clazz 实体Class字节码
+     * @param <T> 实体泛型
+     * @return 解析完成实体
+     * @throws IOException 解析IO异常
+     */
+    public static <T extends BaseBean> T parseStringToBean(final String szBean, final Class<T> clazz) throws IOException {
+        LogUtils.d(TAG, "进入字符串解析实体方法，目标Class：" + clazz.getSimpleName());
+        final StringReader stringReader = new StringReader(szBean);
+        final JsonReader jsonReader = new JsonReader(stringReader);
+        try {
+            final T beanTemp = clazz.newInstance();
+            return (T) beanTemp.readBeanFromJsonReader(jsonReader);
+        } catch (final InstantiationException e) {
+            LogUtils.d(TAG, "实体反射实例化失败(InstantiationException)", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            LogUtils.d(TAG, "实体反射权限访问失败(IllegalAccessException)", Thread.currentThread().getStackTrace());
+        }
+        return null;
+    }
+
+    /**
+     * JSON数组文本解析填充实体列表
+     * @param szBeanList JSON数组文本
+     * @param beanList 目标存储集合
+     * @param clazz 实体字节码
+     * @param <T> 实体泛型
+     * @return 解析结果
+     */
+    public static <T extends BaseBean> boolean parseStringToBeanList(final String szBeanList, ArrayList<T> beanList, final Class<T> clazz) {
+        LogUtils.d(TAG, "进入列表字符串解析方法");
+        try {
+            if (beanList == null) {
+                beanList = new ArrayList<T>();
+            } else {
+                beanList.clear();
+            }
+            final StringReader stringReader = new StringReader(szBeanList);
+            final JsonReader jsonReader = new JsonReader(stringReader);
+            jsonReader.beginArray();
+            while (jsonReader.hasNext()) {
+                final T beanTemp = clazz.newInstance();
+                final T bean = (T) beanTemp.readBeanFromJsonReader(jsonReader);
+                if (bean != null) {
+                    beanList.add(bean);
+                }
+            }
+            jsonReader.endArray();
+            return true;
+        } catch (final InstantiationException e) {
+            LogUtils.d(TAG, "列表解析反射实例化异常", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            LogUtils.d(TAG, "列表解析反射权限异常", Thread.currentThread().getStackTrace());
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "列表解析JSON读写异常", Thread.currentThread().getStackTrace());
+        }
+        return false;
+    }
+
+    // ====================== 文件加载实体 ======================
+    /**
+     * 从默认路径加载单个实体
+     * @param context 上下文
+     * @param clazz 实体字节码
+     * @param <T> 实体泛型
+     * @return 加载实体
+     */
+    public static <T extends BaseBean> T loadBean(final Context context, final Class<T> clazz) {
+        LogUtils.d(TAG, "执行默认路径加载实体数据");
+        try {
+            final T beanTemp = clazz.newInstance();
+            return loadBeanFromFile(beanTemp.getBeanJsonFilePath(context), clazz);
+        } catch (final InstantiationException e) {
+            LogUtils.d(TAG, "加载实体反射实例化失败", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            LogUtils.d(TAG, "加载实体反射权限失败", Thread.currentThread().getStackTrace());
+        }
+        return null;
+    }
+
+    /**
+     * 自定义文件路径加载单个实体
+     * @param szFilePath 文件路径
+     * @param clazz 实体字节码
+     * @param <T> 实体泛型
+     * @return 实体对象
+     */
+    public static <T extends BaseBean> T loadBeanFromFile(final String szFilePath, final Class<T> clazz) {
+        LogUtils.d(TAG, "指定路径加载实体，路径：" + szFilePath);
+        try {
+            final File file = new File(szFilePath);
+            if (file.exists()) {
+                final T beanTemp = clazz.newInstance();
+                final String json = UTF8FileUtils.readStringFromFile(szFilePath);
+                return beanTemp.parseStringToBean(json, clazz);
+            }
+        } catch (final InstantiationException e) {
+            LogUtils.d(TAG, "文件加载实体反射实例化异常", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            LogUtils.d(TAG, "文件加载实体反射权限异常", Thread.currentThread().getStackTrace());
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "文件读取JSON数据异常", Thread.currentThread().getStackTrace());
+        }
+        return null;
+    }
+
+    /**
+     * 默认路径加载实体列表
+     * @param context 上下文
+     * @param beanListDst 目标集合
+     * @param clazz 实体字节码
+     * @param <T> 实体泛型
+     * @return 加载结果
+     */
+    public static <T extends BaseBean> boolean loadBeanList(final Context context, final ArrayList<T> beanListDst, final Class<T> clazz) {
+        LogUtils.d(TAG, "默认路径加载实体列表数据");
+        try {
+            final T beanTemp = clazz.newInstance();
+            return loadBeanListFromFile(beanTemp.getBeanListJsonFilePath(context), beanListDst, clazz);
+        } catch (final InstantiationException e) {
+            LogUtils.d(TAG, "列表加载反射实例化异常", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            LogUtils.d(TAG, "列表加载反射权限异常", Thread.currentThread().getStackTrace());
+        }
+        return false;
+    }
+
+    /**
+     * 自定义路径加载实体列表
+     * @param szFilePath 文件路径
+     * @param beanList 目标集合
+     * @param clazz 实体字节码
+     * @param <T> 实体泛型
+     * @return 加载结果
+     */
+    public static <T extends BaseBean> boolean loadBeanListFromFile(final String szFilePath, final ArrayList<T> beanList, final Class<T> clazz) {
+        LogUtils.d(TAG, "指定路径加载实体列表，路径：" + szFilePath);
+        try {
+            final File file = new File(szFilePath);
+            if (file.exists()) {
+                final String listJson = UTF8FileUtils.readStringFromFile(szFilePath);
+                return parseStringToBeanList(listJson, beanList, clazz);
+            }
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "列表文件读取异常", Thread.currentThread().getStackTrace());
+        }
+        return false;
+    }
+
+    // ====================== 实体数据保存文件 ======================
+    /**
+     * 默认路径保存单个实体
+     * @param context 上下文
+     * @param bean 待保存实体
+     * @param <T> 实体泛型
+     * @return 保存结果
+     */
+    public static <T extends BaseBean> boolean saveBean(final Context context, final T bean) {
+        return saveBeanToFile(bean.getBeanJsonFilePath(context), bean);
+    }
+
+    /**
+     * 自定义路径保存单个实体
+     * @param szFilePath 保存路径
+     * @param bean 待保存实体
+     * @param <T> 实体泛型
+     * @return 保存结果
+     */
+    public static <T extends BaseBean> boolean saveBeanToFile(final String szFilePath, final T bean) {
+        LogUtils.d(TAG, "执行实体数据写入文件操作");
+        try {
+            final String json = bean.toString();
+            UTF8FileUtils.writeStringToFile(szFilePath, json);
+            return true;
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "实体写入文件异常", Thread.currentThread().getStackTrace());
+        }
+        return false;
+    }
+
+    /**
+     * 默认路径保存实体列表
+     * @param context 上下文
+     * @param beanList 实体集合
+     * @param clazz 实体字节码
+     * @param <T> 实体泛型
+     * @return 保存结果
+     */
+    public static <T extends BaseBean> boolean saveBeanList(final Context context, final ArrayList<T> beanList, final Class<T> clazz) {
+        LogUtils.d(TAG, "默认路径保存实体列表数据");
+        try {
+            final T beanTemp = clazz.newInstance();
+            return saveBeanListToFile(beanTemp.getBeanListJsonFilePath(context), beanList);
+        } catch (final InstantiationException e) {
+            LogUtils.d(TAG, "列表保存反射实例化异常", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            LogUtils.d(TAG, "列表保存反射权限异常", Thread.currentThread().getStackTrace());
+        }
+        return false;
+    }
+
+    /**
+     * 自定义路径保存实体列表
+     * @param szFilePath 保存路径
+     * @param beanList 实体集合
+     * @param <T> 实体泛型
+     * @return 保存结果
+     */
+    public static <T extends BaseBean> boolean saveBeanListToFile(final String szFilePath, final ArrayList<T> beanList) {
+        LogUtils.d(TAG, "指定路径保存实体列表数据");
+        try {
+            final String json = toStringByBeanList(beanList);
+            UTF8FileUtils.writeStringToFile(szFilePath, json);
+            return true;
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "列表数据写入文件异常", Thread.currentThread().getStackTrace());
+        }
+        return false;
+    }
+
+    // ====================== Bean类型一致性校验 ======================
+    /**
+     * 校验本地JSON列表内实体类型是否统一
+     * @param szFilePath 列表文件路径
+     * @param clazz 目标校验实体Class
+     * @param <T> 实体泛型
+     * @return 校验结果信息
+     */
+    public static <T extends BaseBean> String checkIsTheSameBeanListAndFile(final String szFilePath, final Class<T> clazz) {
+        final StringBuilder sbResult = new StringBuilder();
+        final String szErrorInfo = "Check Is The Same Bean List And File Error : ";
+        try {
+            int sameCount = 0;
+            int totalCount = 0;
+            final T beanTemp = clazz.newInstance();
+            final String targetBeanName = beanTemp.getName();
+            final String listJson = UTF8FileUtils.readStringFromFile(szFilePath);
+            final StringReader stringReader = new StringReader(listJson);
+            final JsonReader jsonReader = new JsonReader(stringReader);
+            jsonReader.beginArray();
+            while (jsonReader.hasNext()) {
+                totalCount++;
+                jsonReader.beginObject();
+                while (jsonReader.hasNext()) {
+                    final String name = jsonReader.nextName();
+                    if (BEAN_NAME.equals(name)) {
+                        if (targetBeanName.equals(jsonReader.nextString())) {
+                            sameCount++;
+                        }
+                    } else {
+                        jsonReader.skipValue();
+                    }
+                }
+                jsonReader.endObject();
+            }
+            jsonReader.endArray();
+            if (sameCount != totalCount) {
+                sbResult.append("Total : ").append(totalCount).append(" Diff : ").append(totalCount - sameCount);
+            }
+        } catch (final InstantiationException e) {
+            sbResult.append(szErrorInfo).append(e);
+            LogUtils.d(TAG, "类型校验反射实例化异常", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            sbResult.append(szErrorInfo).append(e);
+            LogUtils.d(TAG, "类型校验反射权限异常", Thread.currentThread().getStackTrace());
+        } catch (final IOException e) {
+            sbResult.append(szErrorInfo).append(e);
+            LogUtils.d(TAG, "类型校验文件读取解析异常", Thread.currentThread().getStackTrace());
+        }
+        return sbResult.toString();
+    }
+}
+

libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java

@@ -1,6 +1,8 @@
 package cc.winboll.studio.libappbase.views;
 
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
@@ -12,6 +14,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.R;
@@ -74,12 +77,12 @@ public class AboutView extends LinearLayout {
     private EditText metDevUserPassword;
 
     // ===================================== 页面视图控件 =====================================
-    private DebugSwitchImageView ivAppIcon;
+    private DebugSwitchInfoImageView ivAppIcon;
     private TextView tvAppNameVersion;
     private TextView tvAppDesc;
     private LinearLayout llFunctionContainer;
 	private ImageButton ibSebugStepOver;
-    private ImageButton ibSigngetDialog;
+    private ImageButton ibDebugUnlock;
     private ImageButton ibWinBoLLHostDialog;
 
     // ===================================== 构造方法（按参数从少到多排序） =====================================
@@ -193,12 +196,12 @@ public class AboutView extends LinearLayout {
 		llFunctionContainer = findViewById(R.id.ll_function_container);
 		// 功能按钮绑定
 		ibSebugStepOver = findViewById(R.id.ib_debug_step_over);
-		ibSigngetDialog = findViewById(R.id.ib_signgetdialog);
+		ibDebugUnlock = findViewById(R.id.ib_debug_unlock);
 		ibWinBoLLHostDialog = findViewById(R.id.ib_winbollhostdialog);
 
 		// 调试按钮统一只在调试模式显示
 		ibWinBoLLHostDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
-		//ibSigngetDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
+		//ibDebugUnlock.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
 		ibSebugStepOver.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
 
 		// 绑定按钮点击事件
@@ -310,6 +313,47 @@ public class AboutView extends LinearLayout {
         LogUtils.d(TAG, "initAboutPageView()：视图组装完成，功能项加载完毕");
     }
 
+    // ===================================== 调试解锁弹窗 =====================================
+    private void showDebugUnlockDialog() {
+        final AlertDialog dialog = new AlertDialog.Builder(mContext).create();
+        dialog.setTitle("应用调试解锁");
+        dialog.setCanceledOnTouchOutside(true);
+
+        final EditText etToken = new EditText(mContext);
+        etToken.setHint("请输入调试Token");
+        dialog.setView(etToken);
+
+        dialog.setButton(DialogInterface.BUTTON_POSITIVE, "调试解锁", (DialogInterface.OnClickListener) null);
+        dialog.setButton(DialogInterface.BUTTON_NEGATIVE, "关闭", (DialogInterface.OnClickListener) null);
+        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+            @Override
+            public void onShow(DialogInterface d) {
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        String inputToken = etToken.getText().toString().trim();
+                        String savedToken = DebugSwitchInfoImageView.getDebugToken();
+                        if (savedToken != null && savedToken.equals(inputToken)) {
+                            GlobalApplication.setIsDebugging(true);
+                            GlobalApplication.saveDebugStatus(GlobalApplication.getInstance());
+                            Toast.makeText(mContext, "调试解锁成功，重启应用后生效", Toast.LENGTH_SHORT).show();
+                        } else {
+                            Toast.makeText(mContext, "调试Token不匹配", Toast.LENGTH_SHORT).show();
+                            dialog.dismiss();
+                        }
+                    }
+                });
+                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        dialog.dismiss();
+                    }
+                });
+            }
+        });
+        dialog.show();
+    }
+
     // ===================================== 内部工具/事件方法 =====================================
     /**
      * 绑定功能按钮点击事件，处理正版校验、调试地址配置弹窗唤起
@@ -335,6 +379,15 @@ public class AboutView extends LinearLayout {
 					new DebugHostDialog(mContext).show();
 				}
 			});
+
+        // 应用调试解锁按钮
+        ibDebugUnlock.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "ibDebugUnlock onClick：弹出调试解锁对话框");
+					showDebugUnlockDialog();
+				}
+			});
         LogUtils.d(TAG, "setBtnClickListener()：功能按钮点击事件绑定完成");
     }
 

libappbase/src/main/java/cc/winboll/studio/libappbase/views/DebugSwitchInfoImageView.java

@@ -0,0 +1,127 @@
+package cc.winboll.studio.libappbase.views;
+
+import android.app.AlertDialog;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import java.util.UUID;
+import cc.winboll.studio.libappbase.GlobalApplication;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/04/06 19:32
+ * @Describe 应用Logo控件，连续点击6次弹出调试Token对话框，支持复制与重置
+ */
+public class DebugSwitchInfoImageView extends ImageView {
+
+    public static final String TAG = "DebugSwitchInfoImageView";
+
+    // 连续点击计数
+    private int mClickCount = 0;
+    // 目标点击次数
+    private static final int TARGET_CLICK_COUNT = 7;
+
+    private static String mDebugToken = null;
+    private static final String SP_DEBUG_TOKEN = "debug_token_prefs";
+    private static final String KEY_DEBUG_TOKEN = "debug_token";
+
+    public static String getDebugToken() {
+        if (mDebugToken != null) {
+            return mDebugToken;
+        }
+        Context context = GlobalApplication.getInstance();
+        if (context != null) {
+            SharedPreferences sp = context.getSharedPreferences(SP_DEBUG_TOKEN, Context.MODE_PRIVATE);
+            mDebugToken = sp.getString(KEY_DEBUG_TOKEN, null);
+            if (mDebugToken == null) {
+                mDebugToken = UUID.randomUUID().toString();
+                sp.edit().putString(KEY_DEBUG_TOKEN, mDebugToken).apply();
+            }
+        }
+        return mDebugToken;
+    }
+
+    public static void resetDebugToken() {
+        Context context = GlobalApplication.getInstance();
+        if (context != null) {
+            mDebugToken = UUID.randomUUID().toString();
+            SharedPreferences sp = context.getSharedPreferences(SP_DEBUG_TOKEN, Context.MODE_PRIVATE);
+            sp.edit().putString(KEY_DEBUG_TOKEN, mDebugToken).apply();
+        }
+    }
+
+    private void showDebugTokenDialog() {
+        final AlertDialog dialog = new AlertDialog.Builder(getContext()).create();
+        dialog.setTitle("调试Token");
+        dialog.setMessage(getDebugToken());
+        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);
+        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+            @Override
+            public void onShow(DialogInterface d) {
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        ClipboardManager cm = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                        cm.setPrimaryClip(ClipData.newPlainText("DebugToken", getDebugToken()));
+                    }
+                });
+                dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        resetDebugToken();
+                        dialog.setMessage(getDebugToken());
+                    }
+                });
+                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        dialog.dismiss();
+                    }
+                });
+            }
+        });
+        dialog.show();
+    }
+
+	public DebugSwitchInfoImageView(Context context) {
+        super(context);
+        init();
+    }
+
+    public DebugSwitchInfoImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public DebugSwitchInfoImageView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public DebugSwitchInfoImageView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init();
+    }
+
+    private void init() {
+        setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					mClickCount++;
+					if (mClickCount >= TARGET_CLICK_COUNT) {
+						mClickCount = 0;
+						showDebugTokenDialog();
+					}
+				}
+			});
+    }
+}
+

libappbase/src/main/res/layout-night/layout_about_view.xml

@@ -15,7 +15,7 @@
 		android:paddingRight="16dp"
 		android:paddingBottom="16dp">
 
-		<cc.winboll.studio.libappbase.views.DebugSwitchImageView
+		<cc.winboll.studio.libappbase.views.DebugSwitchInfoImageView
 			android:id="@+id/iv_app_icon"
 			android:layout_width="48dp"
 			android:layout_height="48dp"
@@ -81,7 +81,8 @@
 				android:layout_width="48dp"
 				android:layout_height="48dp"
 				android:src="@drawable/ic_key"
-				android:id="@+id/ib_signgetdialog"
+				android:id="@+id/ib_debug_unlock"
+				android:contentDescription="应用调试解锁"
 				android:scaleType="fitCenter"
 				android:adjustViewBounds="true"
 				android:background="@null"/>

libappbase/src/main/res/layout/layout_about_view.xml

@@ -15,7 +15,7 @@
 		android:paddingRight="16dp"
 		android:paddingBottom="16dp">
 
-		<cc.winboll.studio.libappbase.views.DebugSwitchImageView
+		<cc.winboll.studio.libappbase.views.DebugSwitchInfoImageView
 			android:id="@+id/iv_app_icon"
 			android:layout_width="48dp"
 			android:layout_height="48dp"
@@ -81,7 +81,8 @@
 				android:layout_width="48dp"
 				android:layout_height="48dp"
 				android:src="@drawable/ic_key"
-				android:id="@+id/ib_signgetdialog"
+				android:id="@+id/ib_debug_unlock"
+				android:contentDescription="应用调试解锁"
 				android:scaleType="fitCenter"
 				android:adjustViewBounds="true"
 				android:background="@null"/>

libappbase/src/main/res/values/attrs.xml

@@ -60,4 +60,7 @@
     <!-- DebugLogStyle 应用调试日志样式属性 -->
     <attr name="debugTextColor" format="color"/>
 
+    <!-- 边框圆角属性 -->
+    <attr name="borderCornerRadius" format="dimension"/>
+
 </resources>

libwinboll/.gitignore

@@ -0,0 +1 @@
+/build

libwinboll/build.gradle

@@ -0,0 +1,55 @@
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply from: '../.winboll/winboll_lib_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+android {
+	// 适配MIUI12
+	compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 26
+        targetSdkVersion 30
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+	// 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+	// Gson
+	api 'com.google.code.gson:gson:2.8.9'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+	// 添加JSch依赖（SFTP核心，com.jcraft:jsch:0.1.54）
+	api 'com.jcraft:jsch:0.1.54'
+	
+	// 米盟
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+     //注意：以下5个库必须要引入
+    //implementation 'androidx.appcompat:appcompat:1.4.1'
+    api 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'com.google.code.gson:gson:2.8.5'
+    api 'com.github.bumptech.glide:glide:4.9.0'
+    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+	
+	// WinBoLL库 nexus.winboll.cc 地址
+    api 'cc.winboll.studio:libappbase:15.20.25'
+    api 'cc.winboll.studio:libaes:15.20.14'
+	
+	// 备用库 jitpack.io 地址
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.25'
+	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.14'
+	
+    api fileTree(dir: 'libs', include: ['*.jar'])
+}

libwinboll/build.properties

@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Wed Jun 03 07:32:48 HKT 2026
+stageCount=8
+libraryProject=libwinboll
+baseVersion=15.20
+publishVersion=15.20.7
+buildCount=0
+baseBetaVersion=15.20.8

libwinboll/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:/tools/adt-bundle-windows-x86_64-20131030/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

libwinboll/src/main/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cc.winboll.studio.libwinboll" >
+
+    <application>
+        <activity
+            android:name=".WinBoLLLibraryActivity">
+        </activity>
+    </application>
+
+</manifest>
+

libwinboll/src/main/java/cc/winboll/studio/libwinboll/WinBoLLLibraryActivity.java

@@ -0,0 +1,17 @@
+package cc.winboll.studio.libwinboll;
+
+import android.app.Activity;
+import android.os.Bundle;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+public class WinBoLLLibraryActivity extends Activity 
+{
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_winbolllibrary);
+		
+		ToastUtils.show("WinBoLLLibraryActivity onCreate");
+    }
+}

libwinboll/src/main/res/layout/activity_winbolllibrary.xml

@@ -0,0 +1,11 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="cc.winboll.studio.libwinboll.WinBoLLLibraryActivity"/>
+
+</LinearLayout>

libwinboll/src/main/res/values-v21/styles.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.Material.Light">
+	</style>
+</resources>

libwinboll/src/main/res/values/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="lib_name">libwinboll</string>
+    <string name="hello_world">Hello world!</string>
+
+</resources>

libwinboll/src/main/res/values/styles.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.Holo.Light">
+	</style>
+</resources>

settings.gradle-demo

@@ -96,7 +96,3 @@
 // AutoNFC 项目编译设置
 //include ':autonfc'
 //rootProject.name = "autonfc"
-
-// DailyStamp 项目编译设置
-//include ':dailystamp'
-//rootProject.name = "dailystamp"

winboll/README.md

@@ -0,0 +1,37 @@
+# WinBoLL
+
+#### 介绍
+WinBoLL 网站浏览器。
+
+#### 软件架构
+适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
+也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
+
+
+#### Gradle 编译说明
+调试版编译命令 ：gradle assembleBetaDebug
+阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh winboll
+
+#### 使用说明
+3. Termux应用配置：
+- 已安装Termux（包名 com.termux ）；
+- 执行  echo "allow-external-apps = true" > ~/.termux/termux.properties
+
+#### 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码 : ZhanGSKen(ZhanGSKen<ZhanGSKen@QQ.COM>)
+4.  新建 Pull Request
+
+
+#### 特技
+
+1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
+5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+
+#### 参考文档

winboll/build.gradle

@@ -18,33 +18,44 @@ def genVersionName(def versionName){
 }
 
 android {
-    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.dailystamp"
+        applicationId "cc.winboll.studio.winboll"
         minSdkVersion 26
+		// 适配MIUI12
         targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.20" 
+        versionName "15.20"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
     }
+
+	// 米盟 SDK
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
+    }
+	
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs'] // 若SO库放在libs目录下
+        }
+    }
 }
 
 dependencies {
-    // 下拉控件
+	api project(':libwinboll')
+    api 'com.google.code.gson:gson:2.10.1'
+	
+	// 下拉控件
     api 'com.baoyz.pullrefreshlayout:library:1.2.0'
-    // 拼音搜索
-    // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
-    api 'com.github.open-android:pinyin4j:2.5.0'
+    
     // SSH
     api 'com.jcraft:jsch:0.1.55'
     // Html 解析
@@ -54,27 +65,55 @@ dependencies {
     api 'com.journeyapps:zxing-android-embedded:3.6.0'
     // 应用介绍页类库
     api 'io.github.medyo:android-about-page:2.0.0'
-    // 网络连接类库
+	// 网络连接类库
     api 'com.squareup.okhttp3:okhttp:4.4.1'
-    // AndroidX 类库
-    api 'androidx.appcompat:appcompat:1.1.0'
-    api 'androidx.cardview:cardview:1.0.0'
-    api 'com.google.android.material:material:1.4.0'
+     // FastJSON解析
+     implementation 'com.alibaba:fastjson:1.2.76'
+    
+	// AndroidX 类库
+    /*api 'androidx.appcompat:appcompat:1.1.0'
+    //api 'com.google.android.material:material:1.4.0'
     //api 'androidx.viewpager:viewpager:1.0.0'
     //api 'androidx.vectordrawable:vectordrawable:1.1.0'
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    //api 'androidx.fragment:fragment:1.1.0'
+    //api 'androidx.fragment:fragment:1.1.0'*/
 	
-	//注意：以下5个库必须要引入
+	
+	// 米盟
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+     //注意：以下5个库必须要引入
     //implementation 'androidx.appcompat:appcompat:1.4.1'
     api 'androidx.recyclerview:recyclerview:1.0.0'
-    api 'com.google.code.gson:gson:2.8.5'
     api 'com.github.bumptech.glide:glide:4.9.0'
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+
+	implementation "androidx.annotation:annotation:1.3.0"
+    implementation "androidx.core:core:1.6.0"
+    implementation "androidx.drawerlayout:drawerlayout:1.1.1"
+    implementation "androidx.preference:preference:1.1.1"
+    implementation "androidx.viewpager:viewpager:1.0.0"
+    implementation "com.google.android.material:material:1.4.0"
+    implementation "com.google.guava:guava:24.1-jre"
+    /*
+	implementation "io.noties.markwon:core:$markwonVersion"
+    implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
+    implementation "io.noties.markwon:linkify:$markwonVersion"
+    implementation "io.noties.markwon:recycler:$markwonVersion"
+	*/
+	implementation 'com.termux:terminal-emulator:0.118.0'
+	implementation 'com.termux:terminal-view:0.118.0'
+	implementation 'com.termux:termux-shared:0.118.0'
+
+	// Biometric (指纹识别)
+	implementation 'androidx.biometric:biometric:1.1.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.20.4'
-    api 'cc.winboll.studio:libappbase:15.20.15'
+    api 'cc.winboll.studio:libappbase:15.20.25'
+    api 'cc.winboll.studio:libaes:15.20.14'
+	
+	// 备用库 jitpack.io 地址
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.25'
+	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.14'
 	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }

winboll/build.properties

@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Wed Jun 03 07:32:48 HKT 2026
+stageCount=8
+libraryProject=libwinboll
+baseVersion=15.20
+publishVersion=15.20.7
+buildCount=0
+baseBetaVersion=15.20.8

winboll/proguard-rules.pro

@@ -0,0 +1,137 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\tools\adt-bundle-windows-x86_64-20131030\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# ============================== 基础通用规则 ==============================
+# 保留系统组件
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+
+# 保留 WinBoLL 核心包及子类（合并简化规则）
+-keep class cc.winboll.studio.** { *; }
+-keepclassmembers class cc.winboll.studio.** { *; }
+
+# 保留所有类中的 public static final String TAG 字段（便于日志定位）
+-keepclassmembers class * {
+    public static final java.lang.String TAG;
+}
+
+# 保留序列化类（避免Parcelable/Gson解析异常）
+-keep class * implements android.os.Parcelable {
+    public static final android.os.Parcelable$Creator *;
+}
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+# 保留 R 文件（避免资源ID混淆）
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# 保留 native 方法（避免JNI调用失败）
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# 保留注解和泛型（避免反射/序列化异常）
+-keepattributes *Annotation*
+-keepattributes Signature
+
+# 屏蔽 Java 8+ 警告（适配 Java 7 语法）
+-dontwarn java.lang.invoke.*
+-dontwarn android.support.v8.renderscript.*
+-dontwarn java.util.function.**
+
+# ============================== 第三方框架专项规则 ==============================
+# OkHttp 4.4.1（米盟广告请求依赖，完善Lambda兼容）
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-keep class okhttp3.internal.** { *; }
+-keep class okio.** { *; }
+-dontwarn okhttp3.internal.platform.**
+-dontwarn okio.**
+
+# Glide 4.9.0（米盟广告图片加载依赖）
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$ImageType {
+    **[] $VALUES;
+    public *;
+}
+-keepclassmembers class * implements com.bumptech.glide.module.AppGlideModule {
+    <init>();
+}
+-dontwarn com.bumptech.glide.**
+
+# Gson 2.8.5（米盟广告数据序列化依赖）
+-keep class com.google.gson.** { *; }
+-keep interface com.google.gson.** { *; }
+-keepclassmembers class * {
+    @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# 米盟 SDK（核心广告组件，完整保留避免加载失败）
+-keep class com.miui.zeus.** { *; }
+-keep interface com.miui.zeus.** { *; }
+# 保留米盟日志字段（便于广告加载失败排查）
+-keepclassmembers class com.miui.zeus.mimo.sdk.** {
+    public static final java.lang.String TAG;
+}
+
+# RecyclerView 1.0.0（米盟广告布局渲染依赖）
+-keep class androidx.recyclerview.** { *; }
+-keep interface androidx.recyclerview.** { *; }
+-keepclassmembers class androidx.recyclerview.widget.RecyclerView$Adapter {
+    public *;
+}
+
+# 其他第三方框架（按引入依赖保留，无则可删除）
+# XXPermissions 18.63
+-keep class com.hjq.permissions.** { *; }
+-keep interface com.hjq.permissions.** { *; }
+
+# ZXing 二维码（核心解析组件）
+-keep class com.google.zxing.** { *; }
+-keep class com.journeyapps.zxing.** { *; }
+
+# Jsoup HTML解析
+-keep class org.jsoup.** { *; }
+
+# Pinyin4j 拼音搜索
+-keep class net.sourceforge.pinyin4j.** { *; }
+
+# JSch SSH组件
+-keep class com.jcraft.jsch.** { *; }
+
+# AndroidX 基础组件
+-keep class androidx.appcompat.** { *; }
+-keep interface androidx.appcompat.** { *; }
+
+# ============================== 优化与调试配置 ==============================
+# 优化级别（平衡混淆效果与性能）
+-optimizationpasses 5
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+
+# 调试辅助（保留行号便于崩溃定位）
+-verbose
+-dontpreverify
+-dontusemixedcaseclassnames
+-keepattributes SourceFile,LineNumberTable
+

winboll/src/beta/AndroidManifest.xml

@@ -2,7 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" >
 
-    <application>
+    <application
+        tools:replace="android:icon"
+        android:icon="@drawable/ic_launcher_beta">
 
         <!-- Put flavor specific code here -->
 

winboll/src/beta/java/cc/winboll/studio/winboll/activities/OllamaWindowActivity.java

@@ -0,0 +1,32 @@
+package cc.winboll.studio.winboll.activities;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import cc.winboll.studio.winboll.R;
+
+/**
+ * Ollama 模型对话窗口
+ */
+public class OllamaWindowActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_ollama_window);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setTitle("Ollama 窗口");
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_ollama_window, menu);
+        return true;
+    }
+}

winboll/src/beta/res/layout/activity_ollama_window.xml

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#1E1E1E"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#333333"
+            android:elevation="4dp"
+            android:theme="@style/ThemeOverlay.MaterialComponents.ActionBar" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="56dp"
+        android:layout_marginBottom="48dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Ollama 模型对话"
+                android:textColor="#FFFFFF"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="系统提示："
+                    android:textColor="#B0B0B0" />
+
+                <EditText
+                    android:id="@+id/etSystemPrompt"
+                    android:layout_width="match_parent"
+                    android:layout_height="100dp"
+                    android:background="#2D2D2D"
+                    android:hint="请输入系统提示"
+                    android:textColor="#FFFFFF"
+                    android:textColorHint="#666666"
+                    android:gravity="top|start"
+                    android:inputType="textMultiLine" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:text="模型名称："
+                    android:textColor="#B0B0B0" />
+
+                <EditText
+                    android:id="@+id/etModelName"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:background="#2D2D2D"
+                    android:hint="llama3"
+                    android:text="llama3"
+                    android:textColor="#FFFFFF"
+                    android:textColorHint="#666666"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="系统消息："
+                    android:textColor="#B0B0B0" />
+
+                <EditText
+                    android:id="@+id/etUserMessage"
+                    android:layout_width="match_parent"
+                    android:layout_height="120dp"
+                    android:background="#2D2D2D"
+                    android:ems="10"
+                    android:gravity="top|start"
+                    android:hint="输入你要发送的消息..."
+                    android:inputType="textMultiLine" />
+
+                <EditText
+                    android:id="@+id/etAssistantMessage"
+                    android:layout_width="match_parent"
+                    android:layout_height="120dp"
+                    android:background="#2D2D2D"
+                    android:gravity="top|start"
+                    android:hint="模型响应将显示在这里..."
+                    android:inputType="textMultiLine" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btnSend"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="3"
+                    android:text="发送"
+                    android:textColor="#FFFFFF" />
+
+                <Button
+                    android:id="@+id/btnStop"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_weight="1"
+                    android:text="停止"
+                    android:textColor="#FF5252" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</LinearLayout>

winboll/src/beta/res/menu/menu_ollama_window.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_config"
+        android:title="配置"
+        android:orderInCategory="100"
+        app:showAsAction="always" />
+
+</menu>

winboll/src/beta/res/values-zh/strings.xml

@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Daily Stamp</string>
 </resources>

winboll/src/beta/res/values/strings.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">WinBoLL+</string>
+    <string name="app_name_cn1">筋斗云★</string>
+    <string name="app_name_cn2">金抖云☆</string>
+
+</resources>

winboll/src/beta/res/xml/shortcutsmaincn1.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 切换启动入口的快捷菜单 -->
+	<shortcut
+        android:shortcutId="switchto_en1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_en1"
+        android:shortcutLongLabel="@string/switchto_en1"
+        android:shortcutDisabledMessage="@string/en1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_EN1"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_en1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<!--<shortcut
+	android:shortcutId="switchto_cn1"
+	android:enabled="true"
+	android:icon="@drawable/ic_launcher"
+	android:shortcutShortLabel="@string/switchto_cn1"
+	android:shortcutLongLabel="@string/switchto_cn1"
+	android:shortcutDisabledMessage="@string/cn1_switch_disabled">
+	<intent
+	android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN1"
+	android:targetPackage="cc.winboll.studio.winboll.beta"
+	android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+	android:data="switchto_cn1" />
+	<categories android:name="android.shortcut.conversation" />
+    </shortcut>-->
+	<shortcut
+        android:shortcutId="switchto_cn2"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn2"
+        android:shortcutLongLabel="@string/switchto_cn2"
+        android:shortcutDisabledMessage="@string/cn2_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN2"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_cn2" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>

winboll/src/beta/res/xml/shortcutsmaincn2.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 切换启动入口的快捷菜单 -->
+	<shortcut
+        android:shortcutId="switchto_en1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_en1"
+        android:shortcutLongLabel="@string/switchto_en1"
+        android:shortcutDisabledMessage="@string/en1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_EN1"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_en1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<shortcut
+        android:shortcutId="switchto_cn1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn1"
+        android:shortcutLongLabel="@string/switchto_cn1"
+        android:shortcutDisabledMessage="@string/cn1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN1"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_cn1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<!--<shortcut
+	android:shortcutId="switchto_cn2"
+	android:enabled="true"
+	android:icon="@drawable/ic_launcher"
+	android:shortcutShortLabel="@string/switchto_cn2"
+	android:shortcutLongLabel="@string/switchto_cn2"
+	android:shortcutDisabledMessage="@string/cn2_switch_disabled">
+	<intent
+	android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN2"
+	android:targetPackage="cc.winboll.studio.winboll.beta"
+	android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+	android:data="switchto_cn2" />
+	<categories android:name="android.shortcut.conversation" />
+    </shortcut>-->
+</shortcuts>

winboll/src/beta/res/xml/shortcutsmainen1.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 切换启动入口的快捷菜单 -->
+	<!--<shortcut
+	android:shortcutId="switchto_en1"
+	android:enabled="true"
+	android:icon="@drawable/ic_launcher"
+	android:shortcutShortLabel="@string/switchto_en1"
+	android:shortcutLongLabel="@string/switchto_en1"
+	android:shortcutDisabledMessage="@string/en1_switch_disabled">
+	<intent
+	android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_EN1"
+	android:targetPackage="cc.winboll.studio.winboll.beta"
+	android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+	android:data="switchto_en1" />
+	<categories android:name="android.shortcut.conversation" />
+    </shortcut>-->
+	<shortcut
+        android:shortcutId="switchto_cn1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn1"
+        android:shortcutLongLabel="@string/switchto_cn1"
+        android:shortcutDisabledMessage="@string/cn1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN1"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_cn1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<shortcut
+        android:shortcutId="switchto_cn2"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn2"
+        android:shortcutLongLabel="@string/switchto_cn2"
+        android:shortcutDisabledMessage="@string/cn2_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN2"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_cn2" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>

winboll/src/main/AndroidManifest.xml

@@ -0,0 +1,353 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="cc.winboll.studio.winboll"
+    android:sharedUserId="com.termux">
+
+    <!-- 拥有完全的网络访问权限 -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <!-- 发送持久广播 -->
+    <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
+
+    <!-- 创建桌面快捷方式（Android 8.0 以下兼容） -->
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
+
+    <!-- 对正在运行的应用重新排序 -->
+    <uses-permission android:name="android.permission.REORDER_TASKS"/>
+
+    <!-- 计算应用存储空间 -->
+    <uses-permission
+        android:name="android.permission.GET_PACKAGE_SIZE"/>
+
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission"/>
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:roundIcon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/MyAppTheme"
+        android:resizeableActivity="true"
+        android:name=".App"
+        android:usesCleartextTraffic="true"
+        android:networkSecurityConfig="@xml/network_security_config">
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:exported="true"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data android:scheme="http"/>
+                <data android:scheme="https"/>
+            </intent-filter>
+
+        </activity>
+
+        <activity android:name=".activities.ShortcutActionActivity"/>
+
+        <activity-alias
+            android:name=".MainActivityEN1"
+            android:targetActivity=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:icon="@drawable/ic_launcher"
+            android:enabled="true">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcutsmainen1"/>
+
+        </activity-alias>
+
+        <activity-alias
+            android:name=".MainActivityCN1"
+            android:targetActivity=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name_cn1"
+            android:icon="@drawable/ic_winboll_jindouyun1"
+            android:enabled="false">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcutsmaincn1"/>
+
+        </activity-alias>
+
+        <activity-alias
+            android:name=".MainActivityCN2"
+            android:targetActivity=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name_cn2"
+            android:icon="@drawable/ic_winboll_jindouyun2"
+            android:enabled="false">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcutsmaincn2"/>
+
+        </activity-alias>
+
+        <activity
+            android:name=".activities.WinBoLLUnitTestActivity"
+            android:label="@string/app_name"
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
+
+            <intent-filter>
+
+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <activity
+            android:name=".activities.NewActivity"
+            android:label="NewActivity"
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
+
+        <activity
+            android:name=".activities.New2Activity"
+            android:label="New2Activity"
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
+
+        <service
+            android:name=".MyTileService"
+            android:exported="true"
+            android:label="@string/tileservice_name"
+            android:icon="@drawable/ic_launcher"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+
+            <intent-filter>
+
+                <action android:name="android.service.quicksettings.action.QS_TILE"/>
+
+            </intent-filter>
+
+        </service>
+
+        <service
+            android:name=".services.MainService"
+            android:exported="true"/>
+
+        <service
+            android:name="cc.winboll.studio.appbase.services.TestDemoBindService"
+            android:exported="true"/>
+
+        <service
+            android:name="cc.winboll.studio.appbase.services.TestDemoService"
+            android:exported="true"/>
+
+        <service android:name=".services.AssistantService"/>
+
+        <receiver
+            android:name="cc.winboll.studio.appbase.receivers.MainReceiver"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.appbase.receivers.MainReceiver"/>
+
+            </intent-filter>
+
+        </receiver>
+
+        <receiver
+            android:name=".widgets.APPNewsWidget"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.appbase.widgets.APPNewsWidget.ACTION_WAKEUP_SERVICE"/>
+
+                <action android:name="cc.winboll.studio.appbase.widgets.APPNewsWidget.ACTION_RELOAD_REPORT"/>
+
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_provider_info_sos"/>
+
+        </receiver>
+
+        <receiver
+            android:name=".receivers.APPNewsWidgetClickListener"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.appbase.receivers.APPNewsWidgetClickListener.ACTION_PRE"/>
+
+                <action android:name="cc.winboll.studio.appbase.receivers.APPNewsWidgetClickListener.ACTION_NEXT"/>
+
+            </intent-filter>
+
+        </receiver>
+
+        <service
+            android:name=".SimpleOperateSignalCenterService"
+            android:exported="true">
+
+        </service>
+
+        <service
+            android:name=".services.TestService"
+            android:exported="true"/>
+
+        <receiver
+            android:name=".receiver.MyBroadcastReceiver"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.libappbase.action.SOS"/>
+
+            </intent-filter>
+
+        </receiver>
+
+        <receiver
+            android:name=".widgets.StatusWidget"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+
+                <action android:name="cc.winboll.studio.libappbase.widgets.StatusWidget.ACTION_STATUS_UPDATE"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_provider_info_status"/>
+
+        </receiver>
+
+        <receiver
+            android:name=".widgets.StatusWidgetClickListener"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.libappbase.widgets.StatusWidgetClickListener.ACTION_IVAPP"/>
+
+            </intent-filter>
+
+        </receiver>
+
+        <service android:name="cc.winboll.studio.libappbase.sos.SOSCenter"/>
+
+        <receiver
+            android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"/>
+
+            </intent-filter>
+
+        </receiver>
+
+        <activity android:name="cc.winboll.studio.libappbase.activities.YunActivity"/>
+
+        <activity android:name="cc.winboll.studio.libappbase.activities.LogonActivity"/>
+
+        <activity android:name="cc.winboll.studio.winboll.activities.AboutActivity"/>
+
+        <activity android:name="cc.winboll.studio.winboll.activities.SettingsActivity"/>
+
+        <activity android:name="cc.winboll.studio.winboll.unittest.TestWeWorkSpecSDK"/>
+
+        <activity android:name="cc.winboll.studio.winboll.activities.WXPayActivity"/>
+
+        <activity android:name="cc.winboll.studio.winboll.activities.PatternLockActivity"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.winboll.activities.PatternLockActivity.ACTION_OPEN_PATTERN"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <activity android:name="cc.winboll.studio.winboll.unittest.TermuxEnvTestActivity"/>
+
+        <activity
+            android:name=".termux.NfcTermuxBridgeActivity"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.winboll.termux.NfcTermuxBridgeActivity.ACTION_BUILD"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <activity android:name="cc.winboll.studio.winboll.termux.MyTermuxActivity"
+            android:label="@string/my_termux_activity"
+            android:exported="true"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.winboll.action.EXECUTE_TERMUX_BUTTON"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+            </intent-filter>
+
+        </activity>
+
+    </application>
+
+</manifest>

winboll/src/main/java/cc/winboll/studio/winboll/App.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.dailystamp;
+package cc.winboll.studio.winboll;
 
 import android.app.Activity;
 import android.content.ClipData;
@@ -14,7 +14,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.ViewGroup;
@@ -22,8 +21,12 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.GlobalCrashActivity;
 import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -33,9 +36,12 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.LinkedHashMap;
@@ -43,23 +49,60 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 public class App extends GlobalApplication {
 
+	public static final String TAG = "App";
+
+	public static final String COMPONENT_EN1 = "cc.winboll.studio.winboll.MainActivityEN1";
+	public static final String COMPONENT_CN1 = "cc.winboll.studio.winboll.MainActivityCN1";
+	public static final String COMPONENT_CN2 = "cc.winboll.studio.winboll.MainActivityCN2";
+	public static final String ACTION_SWITCHTO_EN1 = "cc.winboll.studio.winboll.App.ACTION_SWITCHTO_EN1";
+	public static final String ACTION_SWITCHTO_CN1 = "cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN1";
+	public static final String ACTION_SWITCHTO_CN2 = "cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN2";
+
     private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
 
     @Override
     public void onCreate() {
-        super.onCreate();
-        
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
-        // 设置 Toast 布局样式
-        //ToastUtils.setView(R.layout.view_toast);
-//        ToastUtils.setStyle(new WhiteToastStyle());
-//        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
-//        
-        //CrashHandler.getInstance().registerGlobal(this);
-        //CrashHandler.getInstance().registerPart(this);
+		try {
+			super.onCreate();
+
+			ToastUtils.init(this);
+
+			WinBoLLActivityManager.init(this);
+			
+			// 初始化 AES 主题工具（注入当前应用命名空间的主题ID列表，按 ThemeType.ordinal() 顺序）
+			ArrayList<Integer> themeStyleList = new ArrayList<Integer>();
+			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);
+
+        } 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,
+                GlobalCrashActivity.class
+            );
+        }
     }
 
+	@Override
+	public void onTerminate() {
+		super.onTerminate();
+		ToastUtils.release();
+	}
+
+
+
     public static void write(InputStream input, OutputStream output) throws IOException {
         byte[] buf = new byte[1024 * 8];
         int len;

winboll/src/main/java/cc/winboll/studio/winboll/AssistantService.java

@@ -0,0 +1,97 @@
+package cc.winboll.studio.winboll;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/03/28 19:12:12
+ * @Describe 应用主要服务组件类守护进程服务组件类
+ */
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import cc.winboll.studio.libaes.models.WinBoLLClientServiceBean;
+import cc.winboll.studio.winboll.WinBoLLClientService;
+import cc.winboll.studio.winboll.utils.ServiceUtils;
+
+public class AssistantService extends Service {
+
+    public final static String TAG = "AssistantService";
+
+    WinBoLLClientServiceBean mWinBoLLServiceBean;
+    MyServiceConnection mMyServiceConnection;
+    volatile boolean mIsServiceRunning;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
+        if (mMyServiceConnection == null) {
+            mMyServiceConnection = new MyServiceConnection();
+        }
+        // 设置运行参数
+        mIsServiceRunning = false;
+        run();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        run();
+        return START_STICKY;
+    }
+
+    @Override
+    public void onDestroy() {
+        mIsServiceRunning = false;
+        super.onDestroy();
+    }
+
+    //
+    // 运行服务内容
+    //
+    void run() {
+        mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
+        if (mWinBoLLServiceBean.isEnable()) {
+            if (mIsServiceRunning == false) {
+                // 设置运行状态
+                mIsServiceRunning = true;
+                // 唤醒和绑定主进程
+                wakeupAndBindMain();
+            }
+        }
+    }
+
+    //
+    // 唤醒和绑定主进程
+    //
+    void wakeupAndBindMain() {
+        if (ServiceUtils.isServiceAlive(getApplicationContext(), WinBoLLClientService.class.getName()) == false) {
+            startForegroundService(new Intent(AssistantService.this, WinBoLLClientService.class));
+        }
+
+        bindService(new Intent(AssistantService.this, WinBoLLClientService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
+    }
+
+    //
+    // 主进程与守护进程连接时需要用到此类
+    //
+    class MyServiceConnection implements ServiceConnection {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(AssistantService.this);
+            if (mWinBoLLServiceBean.isEnable()) {
+                wakeupAndBindMain();
+            }
+        }
+    }
+}

winboll/src/main/java/cc/winboll/studio/winboll/EWUIStatusIconDrawable.java

@@ -0,0 +1,35 @@
+package cc.winboll.studio.winboll;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/03/28 19:11:27
+ * @Describe WinBoLL UI 状态图标枚举
+ */
+import cc.winboll.studio.libaes.R;
+
+public enum EWUIStatusIconDrawable {
+    NORMAL(0),
+    NEWS(1)
+    ;
+
+    static final String TAG = "WUIStatusIconDrawable";
+
+    static String[] _mlistCNName = { "正常", "新的消息" };
+
+    private int value = 0;
+    private EWUIStatusIconDrawable(int value) {    //必须是private的，否则编译错误
+        this.value = value;
+    }
+
+    public static int getIconDrawableId(EWUIStatusIconDrawable drawableId) {
+        int res;
+        switch(drawableId){
+            case NEWS :
+                res = R.drawable.ic_winbollbeta;
+                break;
+            default :
+                res = R.drawable.ic_winboll;
+        }
+        return res;
+    }
+}

winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java

@@ -0,0 +1,222 @@
+package cc.winboll.studio.winboll;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
+import cc.winboll.studio.libaes.models.DrawerMenuBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.winboll.R;
+import cc.winboll.studio.winboll.activities.AboutActivity;
+import cc.winboll.studio.winboll.activities.SettingsActivity;
+import cc.winboll.studio.winboll.termux.MyTermuxActivity;
+import cc.winboll.studio.winboll.fragments.BrowserFragment;
+import cc.winboll.studio.winboll.unittest.TermuxEnvTestActivity;
+import java.util.ArrayList;
+
+public class MainActivity extends DrawerFragmentActivity {
+
+
+    public static final String TAG = "MainActivity";
+
+    BrowserFragment mBrowserFragment;
+
+    // ------------------- 新增：Handler 消息定义（接收URL历史更新消息） -------------------
+    // 消息标识：URL加载历史更新（刷新抽屉菜单的历史列表）
+    public static final int MSG_URLLOADHISTORY_UPDATE = 1002;
+    // 自定义Handler（接收应用内消息，如BrowserFragment发送的历史更新消息）
+    private static Handler _mMainHandler;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
+        super.onCreate(savedInstanceState);
+        initMainHandler();
+        if (mBrowserFragment == null) {
+            String externalUrl = extractExternalUrl(getIntent());
+            if (externalUrl != null) {
+                mBrowserFragment = BrowserFragment.newInstance(externalUrl);
+            } else {
+                mBrowserFragment = BrowserFragment.newInstance();
+            }
+            addFragment(mBrowserFragment);
+        }
+        showFragment(mBrowserFragment);
+    }
+
+//    @Override
+//    protected void onNewIntent(Intent intent) {
+//        super.onNewIntent(intent);
+//        String externalUrl = extractExternalUrl(intent);
+//        if (externalUrl != null && mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
+//            Message msg = Message.obtain();
+//            msg.what = BrowserFragment.MSG_OPEN_URL;
+//            msg.obj = externalUrl;
+//            mBrowserFragment.getBrowserHandler().sendMessage(msg);
+//        }
+//    }
+
+    private String extractExternalUrl(Intent intent) {
+        if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) {
+            Uri uri = intent.getData();
+            if (uri != null) {
+                return uri.toString();
+            }
+        }
+        return null;
+    }
+
+	public static void sendMessage(Message msg) {
+		_mMainHandler.sendMessage(msg);
+	}
+
+    /**
+     * 初始化Handler（接收MSG_URLLOADHISTORY_UPDATE消息，刷新抽屉历史菜单）
+     */
+    private void initMainHandler() {
+		// 清理旧数据
+		if (_mMainHandler != null) {
+            _mMainHandler.removeCallbacksAndMessages(null);
+            _mMainHandler = null;
+        }
+
+        // Java 7 匿名内部类实现Handler（主线程创建，安全更新UI/抽屉菜单）
+        _mMainHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+                switch (msg.what) {
+                    case MSG_URLLOADHISTORY_UPDATE:
+                        // 处理URL历史更新消息：刷新抽屉菜单的历史列表
+                        LogUtils.d(TAG, "收到URL历史更新消息，刷新抽屉菜单");
+                        refreshUrlHistoryDrawerMenu();
+                        break;
+                    default:
+                        break;
+                }
+            }
+        };
+    }
+
+    @Override
+    public void initDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
+        super.initDrawerMenuItemList(listDrawerMenu);
+        //LogUtils.d(TAG, "initDrawerMenuItemList");
+        // 加载URL历史菜单（初始化时加载）
+        refreshUrlHistoryDrawerMenu();
+        notifyDrawerMenuDataChanged();
+    }
+
+    @Override
+    public void reinitDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
+        super.reinitDrawerMenuItemList(listDrawerMenu);
+        //LogUtils.d(TAG, "reinitDrawerMenuItemList");
+        // 重新加载URL历史菜单（菜单重置时加载）
+        refreshUrlHistoryDrawerMenu();
+        notifyDrawerMenuDataChanged();
+    }
+
+	void loadUrlLoadHistotyMenu(ArrayList<DrawerMenuBean> listDrawerMenu) {
+		listDrawerMenu.clear();
+		if (BrowserFragment._mUrlLoadHistory != null) {
+			for (String url : BrowserFragment._mUrlLoadHistory) {
+				listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, url));
+			}
+		}
+	}
+
+    // ------------------- 新增：刷新URL历史抽屉菜单（提取独立方法，复用） -------------------
+    private void refreshUrlHistoryDrawerMenu() {
+        // 获取抽屉菜单列表，重新加载历史数据并刷新
+        ArrayList<DrawerMenuBean> drawerMenuList = super.malDrawerMenuItem; // 假设父类提供获取菜单列表的方法
+        if (drawerMenuList != null) {
+            loadUrlLoadHistotyMenu(drawerMenuList); // 重新加载更新后的历史数据
+            notifyDrawerMenuDataChanged(); // 通知抽屉菜单刷新UI
+        }
+    }
+
+    @Override
+    public DrawerFragmentActivity.ActivityType initActivityType() {
+        return DrawerFragmentActivity.ActivityType.Main;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+		super.onCreateOptionsMenu(menu);
+		if (App.isDebugging()) {
+			getMenuInflater().inflate(R.menu.toolbar_test, menu);
+		}
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+		return true;
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        super.onItemClick(parent, view, position, id);
+		if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
+			Message msg = Message.obtain();
+			msg.what = BrowserFragment.MSG_HISTORY_POSITION;
+			msg.obj = position;
+			mBrowserFragment.getBrowserHandler().sendMessage(msg);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (AESThemeUtil.onWinBoLLThemeItemSelected(this, item)) {
+            recreate();
+        } else {
+            int nItemId = item.getItemId();
+            if (nItemId == R.id.item_home) {
+                if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
+                    Message msg = Message.obtain();
+                    msg.what = BrowserFragment.MSG_HOMEPAGE;
+                    mBrowserFragment.getBrowserHandler().sendMessage(msg);
+                }
+            } else if (nItemId == R.id.item_settings) {
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
+            } else if (nItemId == R.id.item_about) {
+                Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+            } else if (nItemId == R.id.item_mytermux) {
+                Intent intent = new Intent(getApplicationContext(), MyTermuxActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            } 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);
+            }
+        }
+        return true;
+    }
+
+    // ------------------- 新增：对外提供Handler（供其他组件发送消息，如BrowserFragment） -------------------
+    public Handler getMainHandler() {
+        return _mMainHandler;
+    }
+
+    // ------------------- 新增：生命周期管理（防止Handler内存泄漏） -------------------
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        // 清除Handler所有消息和回调，避免内存泄漏
+        if (_mMainHandler != null) {
+            _mMainHandler.removeCallbacksAndMessages(null);
+            _mMainHandler = null;
+        }
+    }
+}
+

winboll/src/main/java/cc/winboll/studio/winboll/MyTileService.java

@@ -0,0 +1,80 @@
+package cc.winboll.studio.winboll;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/02/13 19:30:10
+ */
+import android.content.Context;
+import cc.winboll.studio.winboll.R;
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.TileService;
+import cc.winboll.studio.winboll.models.MainServiceBean;
+import cc.winboll.studio.winboll.services.MainService;
+
+public class MyTileService extends TileService {
+    public static final String TAG = "MyTileService";
+
+    volatile static MyTileService _MyTileService;
+
+    @Override
+    public void onStartListening() {
+        super.onStartListening();
+        _MyTileService = this;
+        Tile tile = getQsTile();
+        MainServiceBean bean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        if (bean != null && bean.isEnable()) {
+            //MainService.startMainService(context);
+            tile.setState(Tile.STATE_ACTIVE);
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(this, R.drawable.ic_cloud));
+        } else {
+            //MainService.stopMainService(context);
+            tile.setState(Tile.STATE_INACTIVE);
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(this, R.drawable.ic_cloud_outline));
+        }
+        tile.updateTile();
+//        Tile tile = getQsTile();
+//        tile.setState(Tile.STATE_INACTIVE);
+//        tile.setLabel(getString(R.string.tileservice_name));
+//        tile.setIcon(android.graphics.drawable.Icon.createWithResource(this, R.drawable.ic_cloud_outline));
+//        tile.updateTile();
+
+    }
+
+    @Override
+    public void onClick() {
+        super.onClick();
+        Tile tile = getQsTile();
+        MainServiceBean bean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        if (bean == null) {
+            bean = new MainServiceBean();
+        }
+
+        if (tile.getState() == Tile.STATE_ACTIVE) {
+            bean.setIsEnable(false);
+            MainServiceBean.saveBean(this, bean);
+            MainService.stopMainService(this);
+        } else if (tile.getState() == Tile.STATE_INACTIVE) {
+            bean.setIsEnable(true);
+            MainServiceBean.saveBean(this, bean);
+            MainService.startMainService(this);
+        }
+        updateServiceIconStatus(this);
+    }
+
+    public static void updateServiceIconStatus(Context context) {
+        if (_MyTileService == null) {
+            return;
+        }
+
+        Tile tile = _MyTileService.getQsTile();
+        MainServiceBean bean = MainServiceBean.loadBean(context, MainServiceBean.class);
+        if (bean != null && bean.isEnable()) {
+            tile.setState(Tile.STATE_ACTIVE);
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(context, R.drawable.ic_cloud));
+        } else {
+            tile.setState(Tile.STATE_INACTIVE);
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(context, R.drawable.ic_cloud_outline));
+        }
+        tile.updateTile();
+    }
+}

winboll/src/main/java/cc/winboll/studio/winboll/WinBoLL.java

@@ -0,0 +1,40 @@
+package cc.winboll.studio.winboll;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/05/10 10:13
+ * @Describe WinBoLL 系列应用通用管理类
+ */
+import android.content.Context;
+import android.content.Intent;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.winboll.models.WinBoLLModel;
+
+public class WinBoLL {
+
+    public static final String TAG = "WinBoLL";
+
+    public static final String ACTION_BIND = WinBoLL.class.getName() + ".ACTION_BIND";
+    public static final String EXTRA_WINBOLLMODEL = "EXTRA_WINBOLLMODEL";
+
+    public static void bindToAPPBase(Context context, String appMainService) {
+        LogUtils.d(TAG, "bindToAPPBase(...)");
+        String toPackage = "cc.winboll.studio.appbase";
+        startBind(context, toPackage, appMainService);
+    }
+
+    public static void bindToAPPBaseBeta(Context context, String appMainService) {
+        LogUtils.d(TAG, "bindToAPPBaseBeta(...)");
+        String toPackage = "cc.winboll.studio.appbase.beta";
+        startBind(context, toPackage, appMainService);
+    }
+
+    static void startBind(Context context, String toPackage, String appMainService) {
+        Intent intent = new Intent(ACTION_BIND);
+        intent.putExtra(EXTRA_WINBOLLMODEL, (new WinBoLLModel(toPackage, appMainService)).toString());
+        intent.setPackage(toPackage);
+        LogUtils.d(TAG, String.format("ACTION_BIND :\nTo Package : %s\nAPP Main Service : %s", toPackage, appMainService));
+        context.sendBroadcast(intent);
+    }
+
+}

winboll/src/main/java/cc/winboll/studio/winboll/WinBoLLClientService.java

@@ -0,0 +1,21 @@
+package cc.winboll.studio.winboll;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/05/03 19:28
+ */
+public class WinBoLLClientService extends Service {
+    
+    public static final String TAG = "WinBoLLClientService";
+    
+    @Override
+    public IBinder onBind(Intent intent) {
+        
+        return null;
+    }
+    
+}

winboll/src/main/java/cc/winboll/studio/winboll/WinBoLLServiceStatusView.java

@@ -0,0 +1,38 @@
+package cc.winboll.studio.winboll;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/05/03 19:14
+ */
+public class WinBoLLServiceStatusView extends LinearLayout {
+    
+    public static final String TAG = "WinBoLLServiceStatusView";
+    
+    public WinBoLLServiceStatusView(Context context) {
+        super(context);
+    }
+
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    
+    
+    void setServerHost(String szWinBoLLServerHost) {
+        
+    }
+    
+    void setAuthInfo(String szDevUserName, String szDevUserPassword) {
+        
+    }
+}

winboll/src/main/java/cc/winboll/studio/winboll/WxPayConfig.java

@@ -0,0 +1,28 @@
+package cc.winboll.studio.winboll;
+
+/**
+ * 微信支付配置类
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/07
+ */
+public class WxPayConfig {
+    // ========== 核心修改点：替换为你的服务端地址 ==========
+    // 服务端IP/域名 + 端口（Docker部署的服务端，需确保安卓端可访问）
+    public static final String BASE_URL = "https://wxpay.winboll.cc";
+
+    // 统一下单接口路径（对应服务端的测试接口）
+    public static final String CREATE_ORDER_URL = BASE_URL + "/pay/createOrder";
+
+    // 订单查询接口路径
+    public static final String QUERY_ORDER_URL = BASE_URL + "/pay/queryOrder";
+
+    // ========== 固定支付配置 ==========
+    public static final String ORDER_BODY = "定额测试支付"; // 商品描述
+    public static final int TOTAL_FEE = 1; // 固定金额：1分（沙箱环境推荐）
+    public static final String TRADE_TYPE = "NATIVE"; // 支付类型：二维码
+
+    // ========== 轮询配置 ==========
+    public static final long POLL_INTERVAL = 10000; // 轮询间隔：10秒
+    public static final long POLL_TIMEOUT = 45000; // 轮询超时：45秒
+}
+