fix: 修复 Android 16 上 libappbase 主题属性缺失导致的布局 inflate 崩溃

- 取消 Material 库依赖注释，修复 AppBarLayout 找不到类异常
- MyAppTheme 添加 themeDebug/toolbarBackgroundColor 等 libappbase 所需主题属性
- 新增 MyDebugActivityTheme，供 view_log.xml 的 android:theme 引用
- 添加 mainWindowBackgroundColor/mainWindowTextColor 等 5 个颜色资源

.gitignore

@@ -98,4 +98,5 @@ lint-results.html
 /winboll.properties
 /local.properties
 /settings.gradle
-/gradle.properties
+/gradle.properties
+

README.md

@@ -9,15 +9,15 @@ WinBoLL 手机源码计划，旨在通过核心项目 WinBoLL 构建手机端与
 #### **仓库类型：功能说明**
 ☆ 基础项目分支 WinBoLL：手机端安卓应用开发基础模板。
 ☆ 应用项目分支 APPBase、AES、PowerBell、Positions**：安卓应用单一管理系列项目。
-☆ 源码汇总管理 OriginMaster**：各类分支源码合并存档，不适宜作为开发库使用。
+☆ 源码汇总管理 Projects_Keeper**：各类分支源码合并存档，不适宜作为开发库使用。
 
 ### 3. 源码合并管理推送路线图
 ⚠️ **注意**：仅仅展示不同应用模块源码的综合管理路线。分支合并操作时，必须具备 Git 管理经验。
 
-★ WinBoLL → APPBase → OriginMaster
-★ WinBoLL → AES → OriginMaster
-★ WinBoLL → PowerBell → OriginMaster
-★ WinBoLL → Positions → OriginMaster
+★ WinBoLL → APPBase → Projects_Keeper
+★ WinBoLL → AES → Projects_Keeper
+★ WinBoLL → PowerBell → Projects_Keeper
+★ WinBoLL → Positions → Projects_Keeper
 
 ## 二、WinBoLL 项目核心信息
 

aes/README.md

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

aes/build.gradle

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

aes/build.properties

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

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

@@ -5,11 +5,10 @@ package cc.winboll.studio.aes;
  * @Date 2024/06/13 19:03:58
  * @Describe AES应用类
  */
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import android.view.Gravity;
 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 {
@@ -19,7 +18,8 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-		AESThemeUtil.init(null);
+		setIsDebugging(BuildConfig.DEBUG);
+		//setIsDebugging(false);
 		WinBoLLActivityManager.init(this);
 
         // 初始化 Toast 框架

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

@@ -84,12 +84,11 @@ 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 true;
+        return super.onCreateOptionsMenu(menu);
     }
 
     @Override

appbase/README.md

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

appbase/build.gradle

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

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 03 06:52:38 HKT 2026
-stageCount=26
+#Sun May 17 16:16:36 HKT 2026
+stageCount=16
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.25
+publishVersion=15.20.15
 buildCount=0
-baseBetaVersion=15.20.26
+baseBetaVersion=15.20.16

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("APPBase");
+        appInfo.setAppGitName("WinBoLL");
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(branchName);
         appInfo.setAppGitAPPSubProjectFolder(branchName);

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

@@ -1,11 +1,8 @@
 package cc.winboll.studio.appbase;
 
-import cc.winboll.studio.libappbase.CrashHandler;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.ToastUtils;
-import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
-import java.io.PrintWriter;
-import java.io.StringWriter;
+import cc.winboll.studio.libappbase.BuildConfig;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>
@@ -24,24 +21,16 @@ public class App extends GlobalApplication {
      */
     @Override
     public void onCreate() {
-		try {
-			super.onCreate();
-			
-			// 初始化 Toast 工具类（传入应用全局上下文，确保 Toast 可在任意地方调用）
-			ToastUtils.init(getApplicationContext());
-		} 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,
-                CrashHandler.CrashActivity.class
-            );
-        }
+        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

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

dailystamp/build.gradle

@@ -18,51 +18,33 @@ def genVersionName(def versionName){
 }
 
 android {
-	// 适配MIUI12
-	compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-	
+    compileSdkVersion 30
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
+        }
+
     defaultConfig {
-        applicationId "cc.winboll.studio.gitsion"
+        applicationId "cc.winboll.studio.dailystamp"
         minSdkVersion 26
-		// 适配MIUI12
         targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.11"
+        versionName "15.20" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
     }
-
-	// 米盟 SDK
-    packagingOptions {
-         doNotStrip "*/*/libmimo_1011.so"
-    }
-	
-    sourceSets {
-        main {
-            jniLibs.srcDirs = ['libs'] // 若SO库放在libs目录下
-        }
-    }
-
-    // 确保 Java 7 兼容性
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
 }
 
 dependencies {
-	api project(':libgitsion')
-    
-    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 解析
@@ -72,51 +54,27 @@ 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'
-	// OkHttp网络请求
-     implementation 'com.squareup.okhttp3:okhttp:3.14.9'
-     // 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'
+    // AndroidX 类库
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.cardview:cardview:1.0.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'
 	
-	
-	// 米盟
-	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
-     //注意：以下5个库必须要引入
+	//注意：以下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'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.20.15'
-    api 'cc.winboll.studio:libappbase:15.20.26'
+	api 'cc.winboll.studio:libaes:15.20.4'
+    api 'cc.winboll.studio:libappbase:15.20.15'
 	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }

dailystamp/build.properties

@@ -0,0 +1,8 @@
+#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

@@ -0,0 +1,21 @@
+# 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

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

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

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

dailystamp/src/main/AndroidManifest.xml

@@ -0,0 +1,37 @@
+<?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/App.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.gitsion;
+package cc.winboll.studio.dailystamp;
 
 import android.app.Activity;
 import android.content.ClipData;
@@ -14,6 +14,7 @@ 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;
@@ -21,12 +22,8 @@ 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.CrashActivity;
 import cc.winboll.studio.libappbase.GlobalApplication;
 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;
@@ -36,8 +33,6 @@ 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;
@@ -52,25 +47,17 @@ public class App extends GlobalApplication {
 
     @Override
     public void onCreate() {
-        try {
-			super.onCreate();
-			ToastUtils.init(this);
-			WinBoLLActivityManager.init(this);
-			AESThemeUtil.init(null);
-			GpsHistoryManager.getInstance().init(this);
-		} catch (Throwable e) {
-			StringWriter sw = new StringWriter();
-			PrintWriter pw = new PrintWriter(sw);
-			e.printStackTrace(pw);
-			pw.close();
-			String stackTraceStr = sw.toString();
-			CrashHandleNotifyUtils.handleUncaughtException(
-				this,
-				getPackageName(),
-				stackTraceStr,
-				CrashActivity.class
-			);
-		}
+        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);
     }
 
     public static void write(InputStream input, OutputStream output) throws IOException {

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

@@ -0,0 +1,31 @@
+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/layout/activity_main.xml

@@ -6,19 +6,30 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
+	<com.google.android.material.appbar.AppBarLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize"
+			app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
 	<LinearLayout
 		android:orientation="vertical"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1.0"
 		android:gravity="center_vertical|center_horizontal">
-
 		<TextView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="Hello, WinBoLL!"
+			android:text="@string/app_name"
 			android:textAppearance="?android:attr/textAppearanceLarge"/>
-
 	</LinearLayout>
 
 	<LinearLayout

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

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

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

@@ -3,12 +3,9 @@
     <color name="colorPrimary">#009688</color>
     <color name="colorPrimaryDark">#00796B</color>
     <color name="colorAccent">#FF9800</color>
-
     <color name="mainWindowBackgroundColor">#FFF5F5F5</color>
     <color name="mainWindowTextColor">#FF000000</color>
-    <color name="mainWindowDarkBackgroundColor">#FFF5F5F5</color>
-    <color name="mainWindowDarkTextColor">#FF000000</color>
     <color name="toolbarBackgroundColor">#FF009688</color>
-    <color name="toolbarTextColor">#FF000000</color>
+    <color name="toolbarTextColor">#FFFFFFFF</color>
     <color name="debugTextColor">#FF808080</color>
 </resources>

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

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <!-- Put flavor specific strings here -->
-
+    <string name="app_name">Daily Stamp</string>
 </resources>

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

@@ -1,31 +1,30 @@
 <resources>
 
-    <!-- Base application theme. -->
     <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/DebugActivityTheme</item>
-
-        <item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
-        <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
-        <item name="mainWindowDarkBackgroundColor">@color/mainWindowDarkBackgroundColor</item>
-        <item name="mainWindowDarkTextColor">@color/mainWindowDarkTextColor</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="debugTextColor">@color/debugTextColor</item>
-        <item name="aboutViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
-        <item name="aboutViewTextColor">?attr/mainWindowTextColor</item>
-        <item name="aboutViewTitleColor">?attr/mainWindowTextColor</item>
-        <item name="aboutViewDividerColor">?attr/mainWindowDarkTextColor</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="DebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="MyDebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
         <item name="colorTittle">?attr/mainWindowTextColor</item>
-        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</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>

gitsion/README.md

@@ -1,239 +0,0 @@
-# Gitsion
-
----
-
-## 中文文档
-
-### 项目介绍
-
-Gitsion 是一款专业的 **GPS 定位中继守护工具**，支持真实系统 GPS 定位监听与模拟 GPS 坐标仿真双模式运行。应用后台常驻前台服务，实时接收系统 GPS 位置数据，内置订阅者步长阈值判断机制，可对多个 GPS 订阅视图进行定点推送管理。
-
-#### 核心功能
-
-- **双模式运行**：支持真实 GPS 工作模式与虚拟仿真模式一键切换
-- **前台常驻服务**：`MainService` 作为前台 Service 持续监听 GPS 定位变化
-- **订阅者管理**：内置 `GpsSubscribeManager` 与 `SubscribeLocationManager`，支持多订阅者步长阈值推送
-- **模拟控制面板**：支持八大方位选择、自定义移动距离，自动计算偏移目标经纬度
-- **实时日志输出**：集成 `LogView` 面板，方便调试定位轨迹与订阅推送状态
-- **崩溃处理**：`App` 类提供全局 CrashHandler 与 CrashActivity 展示崩溃日志
-- **关于页面**：工具栏提供 About 按钮，可查看应用版本与项目信息
-
-#### 技术栈
-
-| 项目 | 版本/说明 |
-|------|-----------|
-| 编程语言 | Java 7（源码） |
-| 编译环境 | Java 11（Gradle 编译） |
-| Gradle 插件 | 7.2.1 |
-| 最低 API | API 26 (Android 8.0) |
-| 目标 API | API 30 (Android 11) |
-| 编译 API | API 30 |
-
-#### 模块结构
-
-本项目采用多模块 Gradle 结构：
-
-| 模块 | 类型 | 说明 |
-|------|------|------|
-| `:gitsion` | application | 主应用模块（MainActivity、MainService、AboutActivity 等） |
-| `:libgitsion` | library | GPS 中继核心类库（GpsSubscribeManager、SubscribeLocationManager 等） |
-
-#### 核心依赖库
-
-**网络相关**
-- OkHttp 4.4.1 / 3.14.9 — HTTP 客户端
-- Gson 2.10.1 — JSON 解析
-
-**终端模拟**
-- Termux: terminal-emulator 0.118.0
-- Termux: terminal-view 0.118.0
-- Termux: termux-shared 0.118.0
-
-**功能组件**
-- ZXing 3.4.1 — 二维码生成与扫描
-- JSch 0.1.55 — SSH/SFTP 客户端
-- Jsoup 1.13.1 — HTML 解析
-- FastJSON 1.2.76 — JSON 处理
-
-**UI 组件**
-- Material Design 1.4.0
-- AndroidX 组件库
-- PullRefreshLayout 1.2.0 — 下拉刷新
-
-#### 编译说明
-
-**调试版编译**
-```bash
-./gradlew assembleBetaDebug
-```
-
-**阶段版编译（发布）**
-```bash
-bash .winboll/bashPublishAPKAddTag.sh gitsion
-```
-
-**版本管理**
-版本信息由 `gitsion/build.properties` 管理：
-- `baseVersion` — 基础版本号
-- `stageCount` — 阶段构建次数
-- `publishVersion` — 发布版本号
-- `buildCount` — 构建次数
-
-#### 权限说明
-
-应用需要以下权限：
-- `ACCESS_FINE_LOCATION` — 精确定位
-- `ACCESS_COARSE_LOCATION` — 大致定位
-- `ACCESS_BACKGROUND_LOCATION` — 后台定位
-- `FOREGROUND_SERVICE` — 前台服务
-
-#### 项目结构
-
-```
-gitsion/
-├── src/main/
-│   ├── java/cc/winboll/studio/gitsion/
-│   │   ├── App.java              # Application 类，初始化与崩溃处理
-│   │   ├── MainActivity.java     # 主控制页面（GPS服务开关、模拟面板、订阅视图）
-│   │   ├── MainService.java      # GPS 定位核心前台服务
-│   │   ├── AboutActivity.java    # 关于页面
-│   │   └── GpsReceiverChildService[1-3].java  # GPS 接收子服务
-│   ├── res/
-│   │   ├── layout/               # 布局文件
-│   │   ├── menu/                 # 菜单文件
-│   │   └── values/               # 资源值文件
-│   ├── libs/                     # 本地库文件
-│   └── AndroidManifest.xml       # 应用清单
-├── build.gradle                  # 模块构建配置
-└── build.properties              # 版本配置文件
-```
-
-#### 参与贡献
-
-1. Fork 本仓库
-2. 新建功能分支 (`git checkout -b feat_xxx`)
-3. 提交代码（作者: ZhanGSKen <ZhanGSKen@QQ.COM>）
-4. 新建 Pull Request
-
-#### 许可证
-
-[待添加许可证信息]
-
----
-
-## English Documentation
-
-### Project Introduction
-
-gitsion is a professional **GPS relay and guardian tool**, supporting dual modes of real system GPS location monitoring and simulated GPS coordinate simulation. It runs as a foreground persistent background service, receives real-time system GPS location data, and builds-in subscriber step threshold judgment mechanism to manage fixed-point push for multiple GPS subscription views.
-
-#### Core Features
-
-- **Dual Mode Operation**: One-click switch between real GPS working mode and virtual simulation mode
-- **Foreground Persistent Service**: `MainService` as a foreground Service continuously monitors GPS location changes
-- **Subscriber Management**: Built-in `GpsSubscribeManager` and `SubscribeLocationManager`, supporting multi-subscriber step threshold push
-- **Simulation Control Panel**: Supports eight direction selections, custom moving distance, and automatic offset target coordinate calculation
-- **Real-time Log Output**: Integrated `LogView` panel for debugging location tracks and subscription push status
-- **Crash Handling**: `App` class provides global CrashHandler and CrashActivity for crash log display
-- **About Page**: Toolbar provides an About button to view app version and project information
-
-#### Tech Stack
-
-| Item | Version/Description |
-|------|---------------------|
-| Programming Language | Java 7 (source code) |
-| Build Environment | Java 11 (Gradle compilation) |
-| Gradle Plugin | 7.2.1 |
-| Minimum API | API 26 (Android 8.0) |
-| Target API | API 30 (Android 11) |
-| Compile API | API 30 |
-
-#### Module Structure
-
-This project uses a multi-module Gradle structure:
-
-| Module | Type | Description |
-|--------|------|-------------|
-| `:gitsion` | application | Main application module (MainActivity, MainService, AboutActivity, etc.) |
-| `:libgitsion` | library | GPS relay core library (GpsSubscribeManager, SubscribeLocationManager, etc.) |
-
-#### Core Dependencies
-
-**Networking**
-- OkHttp 4.4.1 / 3.14.9 — HTTP client
-- Gson 2.10.1 — JSON parsing
-
-**Terminal Emulation**
-- Termux: terminal-emulator 0.118.0
-- Termux: terminal-view 0.118.0
-- Termux: termux-shared 0.118.0
-
-**Functional Components**
-- ZXing 3.4.1 — QR code generation and scanning
-- JSch 0.1.55 — SSH/SFTP client
-- Jsoup 1.13.1 — HTML parsing
-- FastJSON 1.2.76 — JSON processing
-
-**UI Components**
-- Material Design 1.4.0
-- AndroidX libraries
-- PullRefreshLayout 1.2.0 — Pull-to-refresh
-
-#### Build Instructions
-
-**Debug Build**
-```bash
-./gradlew assembleBetaDebug
-```
-
-**Stage Build (Release)**
-```bash
-bash .winboll/bashPublishAPKAddTag.sh gitsion
-```
-
-**Version Management**
-Version info is managed by `gitsion/build.properties`:
-- `baseVersion` — Base version number
-- `stageCount` — Stage build count
-- `publishVersion` — Release version number
-- `buildCount` — Build count
-
-#### Permissions
-
-The app requires the following permissions:
-- `ACCESS_FINE_LOCATION` — Precise location
-- `ACCESS_COARSE_LOCATION` — Approximate location
-- `ACCESS_BACKGROUND_LOCATION` — Background location
-- `FOREGROUND_SERVICE` — Foreground service
-
-#### Project Structure
-
-```
-gitsion/
-├── src/main/
-│   ├── java/cc/winboll/studio/gitsion/
-│   │   ├── App.java              # Application class, initialization and crash handling
-│   │   ├── MainActivity.java     # Main control page (GPS service switch, simulation panel, subscription views)
-│   │   ├── MainService.java      # GPS location core foreground service
-│   │   ├── AboutActivity.java    # About page
-│   │   └── GpsReceiverChildService[1-3].java  # GPS receiver child services
-│   ├── res/
-│   │   ├── layout/               # Layout files
-│   │   ├── menu/                 # Menu files
-│   │   └── values/               # Resource value files
-│   ├── libs/                     # Local library files
-│   └── AndroidManifest.xml       # App manifest
-├── build.gradle                  # Module build configuration
-└── build.properties              # Version configuration file
-```
-
-#### Contributing
-
-1. Fork this repository
-2. Create a feature branch (`git checkout -b feat_xxx`)
-3. Commit your changes (Author: ZhanGSKen <ZhanGSKen@QQ.COM>)
-4. Create a Pull Request
-
-#### License
-
-[License information to be added]

gitsion/build.properties

@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Thu Jun 04 19:50:05 HKT 2026
-stageCount=27
-libraryProject=
-baseVersion=15.11
-publishVersion=15.11.26
-buildCount=53
-baseBetaVersion=15.11.27

gitsion/proguard-rules.pro

@@ -1,137 +0,0 @@
-# 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
-

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">Gitsion★</string>
-	<string name="app_description">一款支持真实/模拟定位的GPS中继工具，可后台常驻，实现位置数据转发、调试与仿真，适配开发测试使用。</string>
-
-</resources>

gitsion/src/main/AndroidManifest.xml

@@ -1,63 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.gitsion">
-
-    <!-- 只能在前台获取精确的位置信息 -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-
-    <!-- 只有在前台运行时才能获取大致位置信息 -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-
-    <!-- 在后台使用位置信息 -->
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
-
-    <!-- 运行前台服务 -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-
-    <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"/>
-
-        <service
-            android:name=".MainService"
-            android:enabled="true"
-            android:exported="false"/>
-
-        <service android:name=".GpsReceiverChildService1"/>
-
-        <service android:name=".GpsReceiverChildService2"/>
-
-        <service android:name=".GpsReceiverChildService3"/>
-
-        <activity android:name=".AboutActivity"/>
-        <activity android:name=".GpsHistoryActivity"/>
-
-    </application>
-
-</manifest>

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

@@ -1,58 +0,0 @@
-package cc.winboll.studio.gitsion;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 15:39
- */
-import android.os.Bundle;
-import android.view.View;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.models.APPInfo;
-import cc.winboll.studio.libappbase.views.AboutView;
-
-public class AboutActivity extends AppCompatActivity {
-
-    public static final String TAG = "AboutActivity";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_about);
-
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					finish();
-				}
-			});
-
-        AboutView aboutView = findViewById(R.id.aboutview);
-        aboutView.setAPPInfo(genDefaultAppInfo());
-    }
-
-    private APPInfo genDefaultAppInfo() {
-        LogUtils.d(TAG, "genDefaultAppInfo() 调用");
-        String branchName = "gpsrelaysentinel";
-        APPInfo appInfo = new APPInfo();
-        appInfo.setAppName("GPSRelaySentinel");
-        appInfo.setAppIcon(R.drawable.ic_winboll);
-        appInfo.setAppDescription(getString(R.string.app_description));
-        appInfo.setAppGitName("WinBoLL");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(branchName);
-        appInfo.setAppGitAPPSubProjectFolder(branchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=GPSRelaySentinel");
-        appInfo.setAppAPKName("GPSRelaySentinel");
-        appInfo.setAppAPKFolderName("GPSRelaySentinel");
-        LogUtils.d(TAG, "genDefaultAppInfo: 应用信息已生成");
-        return appInfo;
-    }
-}

gitsion/src/main/java/cc/winboll/studio/gitsion/GpsHistoryActivity.java

@@ -1,151 +0,0 @@
-package cc.winboll.studio.gitsion;
-
-import android.app.Activity;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
-import cc.winboll.studio.gitsion.db.GpsHistoryDatabaseHelper;
-import cc.winboll.studio.gitsion.model.GpsHistoryRecord;
-
-public class GpsHistoryActivity extends Activity {
-
-    private ListView mListView;
-    private TextView mEmptyHint;
-    private TextView mTvSystemCount;
-    private TextView mTvSimCount;
-    private GpsHistoryAdapter mAdapter;
-    private final Runnable mRefreshRunnable = new Runnable() {
-        @Override
-        public void run() {
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    refreshData();
-                }
-            });
-        }
-    };
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_gps_history);
-
-        mListView = findViewById(R.id.lv_gps_history);
-        mEmptyHint = findViewById(R.id.tv_empty_hint);
-        mTvSystemCount = findViewById(R.id.tv_system_count);
-        mTvSimCount = findViewById(R.id.tv_sim_count);
-
-        List<GpsHistoryRecord> records = GpsHistoryManager.getInstance().getRecords();
-        mAdapter = new GpsHistoryAdapter(records);
-        mListView.setAdapter(mAdapter);
-
-        updateEmptyHint(records.isEmpty());
-        updateCounts();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        GpsHistoryManager.getInstance().addListener(mRefreshRunnable);
-        refreshData();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        GpsHistoryManager.getInstance().removeListener(mRefreshRunnable);
-    }
-
-    private void refreshData() {
-        List<GpsHistoryRecord> records = GpsHistoryManager.getInstance().getRecords();
-        mAdapter.setData(records);
-        mAdapter.notifyDataSetChanged();
-        updateEmptyHint(records.isEmpty());
-        updateCounts();
-    }
-
-    private void updateCounts() {
-        mTvSystemCount.setText(String.valueOf(GpsHistoryManager.getInstance().getSystemCount()));
-        mTvSimCount.setText(String.valueOf(GpsHistoryManager.getInstance().getSimCount()));
-    }
-
-    private void updateEmptyHint(boolean empty) {
-        mEmptyHint.setVisibility(empty ? View.VISIBLE : View.GONE);
-        mListView.setVisibility(empty ? View.GONE : View.VISIBLE);
-    }
-
-    private static class GpsHistoryAdapter extends BaseAdapter {
-
-        private List<GpsHistoryRecord> mData;
-        private final SimpleDateFormat mTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
-
-        GpsHistoryAdapter(List<GpsHistoryRecord> data) {
-            mData = data;
-        }
-
-        void setData(List<GpsHistoryRecord> data) {
-            mData = data;
-        }
-
-        @Override
-        public int getCount() {
-            return mData.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mData.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            if (convertView == null) {
-                convertView = View.inflate(parent.getContext(), R.layout.list_item_gps_history, null);
-            }
-
-            GpsHistoryRecord item = mData.get(position);
-
-            LinearLayout root = (LinearLayout) convertView.findViewById(R.id.layout_record_root);
-            TextView tvType = (TextView) convertView.findViewById(R.id.tv_record_type);
-            TextView tvTime = (TextView) convertView.findViewById(R.id.tv_record_time);
-            TextView tvCoord = (TextView) convertView.findViewById(R.id.tv_record_coord);
-
-            String timeStr = mTimeFormat.format(new Date(item.getLocationTime()));
-            String coordStr = String.format(Locale.getDefault(),
-                "纬度: %.6f  经度: %.6f  SID: %s",
-                item.getLatitude(), item.getLongitude(), item.getSid());
-
-            tvTime.setText(timeStr);
-            tvCoord.setText(coordStr);
-
-            if (item.isSim()) {
-                root.setBackgroundColor(Color.parseColor("#2a3a2a"));
-                tvType.setText("[模拟数据]");
-                tvType.setTextColor(Color.parseColor("#ffb74d"));
-            } else {
-                root.setBackgroundColor(Color.parseColor("#1c1c1c"));
-                tvType.setText("[系统数据]");
-                tvType.setTextColor(Color.parseColor("#4fc3f7"));
-            }
-
-            return convertView;
-        }
-    }
-}

gitsion/src/main/java/cc/winboll/studio/gitsion/GpsHistoryManager.java

@@ -1,150 +0,0 @@
-package cc.winboll.studio.gitsion;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cc.winboll.studio.gitsion.db.GpsHistoryDatabaseHelper;
-import cc.winboll.studio.gitsion.model.GpsHistoryRecord;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeResult;
-
-public final class GpsHistoryManager {
-
-    private static final int MAX_RECORDS = 2000;
-    private static final int TRIM_COUNT = 1000;
-    private static final GpsHistoryManager sInstance = new GpsHistoryManager();
-    private final List<Runnable> mListeners = new ArrayList<Runnable>();
-    private GpsHistoryDatabaseHelper mDbHelper;
-
-    private GpsHistoryManager() {}
-
-    public static GpsHistoryManager getInstance() {
-        return sInstance;
-    }
-
-    public void init(Context context) {
-        mDbHelper = new GpsHistoryDatabaseHelper(context.getApplicationContext());
-    }
-
-    public void addRecord(GpsSubscribeResult result, int type) {
-        if (mDbHelper == null) return;
-        SQLiteDatabase db = mDbHelper.getWritableDatabase();
-        ContentValues cv = new ContentValues();
-        cv.put(GpsHistoryDatabaseHelper.COL_LATITUDE, result.getLatitude());
-        cv.put(GpsHistoryDatabaseHelper.COL_LONGITUDE, result.getLongitude());
-        cv.put(GpsHistoryDatabaseHelper.COL_LOCATION_TIME, result.getLocationTime());
-        cv.put(GpsHistoryDatabaseHelper.COL_RECORD_TIME, System.currentTimeMillis());
-        cv.put(GpsHistoryDatabaseHelper.COL_TYPE, type);
-        cv.put(GpsHistoryDatabaseHelper.COL_SID, result.getSubscribeUniqueId());
-        cv.put(GpsHistoryDatabaseHelper.COL_DESC, result.getResultDesc());
-        db.insert(GpsHistoryDatabaseHelper.TABLE_NAME, null, cv);
-
-        trimIfNeeded(db);
-        notifyListeners();
-    }
-
-    public void addSystemRecord(GpsSubscribeResult result) {
-        addRecord(result, GpsHistoryDatabaseHelper.TYPE_SYSTEM);
-    }
-
-    public void addSimRecord(GpsSubscribeResult result) {
-        addRecord(result, GpsHistoryDatabaseHelper.TYPE_SIM);
-    }
-
-    public List<GpsHistoryRecord> getRecords() {
-        List<GpsHistoryRecord> list = new ArrayList<GpsHistoryRecord>();
-        if (mDbHelper == null) return list;
-        SQLiteDatabase db = mDbHelper.getReadableDatabase();
-        Cursor c = db.query(GpsHistoryDatabaseHelper.TABLE_NAME, null, null, null,
-            null, null, GpsHistoryDatabaseHelper.COL_ID + " DESC", null);
-        while (c.moveToNext()) {
-            list.add(parseCursor(c));
-        }
-        c.close();
-        return list;
-    }
-
-    public int getSystemCount() {
-        return countByType(GpsHistoryDatabaseHelper.TYPE_SYSTEM);
-    }
-
-    public int getSimCount() {
-        return countByType(GpsHistoryDatabaseHelper.TYPE_SIM);
-    }
-
-    public void clear() {
-        if (mDbHelper == null) return;
-        mDbHelper.getWritableDatabase().delete(GpsHistoryDatabaseHelper.TABLE_NAME, null, null);
-        notifyListeners();
-    }
-
-    public void addListener(Runnable listener) {
-        synchronized (mListeners) {
-            mListeners.add(listener);
-        }
-    }
-
-    public void removeListener(Runnable listener) {
-        synchronized (mListeners) {
-            mListeners.remove(listener);
-        }
-    }
-
-    private void notifyListeners() {
-        synchronized (mListeners) {
-            for (Runnable r : mListeners) {
-                r.run();
-            }
-        }
-    }
-
-    private int countByType(int type) {
-        if (mDbHelper == null) return 0;
-        SQLiteDatabase db = mDbHelper.getReadableDatabase();
-        Cursor c = db.rawQuery(
-            "SELECT COUNT(*) FROM " + GpsHistoryDatabaseHelper.TABLE_NAME
-            + " WHERE " + GpsHistoryDatabaseHelper.COL_TYPE + "=?",
-            new String[]{String.valueOf(type)});
-        int count = 0;
-        if (c.moveToFirst()) {
-            count = c.getInt(0);
-        }
-        c.close();
-        return count;
-    }
-
-    private void trimIfNeeded(SQLiteDatabase db) {
-        Cursor c = db.rawQuery(
-            "SELECT COUNT(*) FROM " + GpsHistoryDatabaseHelper.TABLE_NAME, null);
-        int total = 0;
-        if (c.moveToFirst()) {
-            total = c.getInt(0);
-        }
-        c.close();
-        if (total > MAX_RECORDS) {
-            db.execSQL("DELETE FROM " + GpsHistoryDatabaseHelper.TABLE_NAME
-                + " WHERE " + GpsHistoryDatabaseHelper.COL_ID + " IN ("
-                + " SELECT " + GpsHistoryDatabaseHelper.COL_ID
-                + " FROM " + GpsHistoryDatabaseHelper.TABLE_NAME
-                + " ORDER BY " + GpsHistoryDatabaseHelper.COL_ID + " ASC"
-                + " LIMIT " + TRIM_COUNT + ")");
-        }
-    }
-
-    private static GpsHistoryRecord parseCursor(Cursor c) {
-        return new GpsHistoryRecord(
-            c.getLong(c.getColumnIndexOrThrow(GpsHistoryDatabaseHelper.COL_ID)),
-            c.getDouble(c.getColumnIndexOrThrow(GpsHistoryDatabaseHelper.COL_LATITUDE)),
-            c.getDouble(c.getColumnIndexOrThrow(GpsHistoryDatabaseHelper.COL_LONGITUDE)),
-            c.getLong(c.getColumnIndexOrThrow(GpsHistoryDatabaseHelper.COL_LOCATION_TIME)),
-            c.getLong(c.getColumnIndexOrThrow(GpsHistoryDatabaseHelper.COL_RECORD_TIME)),
-            c.getInt(c.getColumnIndexOrThrow(GpsHistoryDatabaseHelper.COL_TYPE)),
-            c.getString(c.getColumnIndexOrThrow(GpsHistoryDatabaseHelper.COL_SID)),
-            c.getString(c.getColumnIndexOrThrow(GpsHistoryDatabaseHelper.COL_DESC))
-        );
-    }
-}

gitsion/src/main/java/cc/winboll/studio/gitsion/GpsReceiverChildService1.java

@@ -1,28 +0,0 @@
-package cc.winboll.studio.gitsion;
-
-import android.content.Intent;
-
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgitsion.model.LocationPoint;
-import cc.winboll.studio.libgitsion.service.GpsSubscribeReceiverService;
-
-public final class GpsReceiverChildService1 extends GpsSubscribeReceiverService {
-
-    public static final String TAG = "GpsReceiverChildService1";
-
-    @Override
-    public void onReceiveGpsData(LocationPoint point, GpsSubscribeMsg config) {
-        super.onReceiveGpsData(point, config);
-        //当前独立接收日志
-        LogUtils.d(TAG,"独立接收服务1 成功收到GPS消息");
-        LogUtils.d(TAG,"纬度:"+point.getLatitude()+" 经度:"+point.getLongitude());
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        super.onStartCommand(intent, flags, startId);
-        return START_NOT_STICKY;
-    }
-}
-

gitsion/src/main/java/cc/winboll/studio/gitsion/GpsReceiverChildService2.java

@@ -1,27 +0,0 @@
-package cc.winboll.studio.gitsion;
-
-import android.content.Intent;
-
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgitsion.model.LocationPoint;
-import cc.winboll.studio.libgitsion.service.GpsSubscribeReceiverService;
-
-public final class GpsReceiverChildService2 extends GpsSubscribeReceiverService {
-
-    public static final String TAG = "GpsReceiverChildService2";
-
-    @Override
-    public void onReceiveGpsData(LocationPoint point, GpsSubscribeMsg config) {
-        super.onReceiveGpsData(point, config);
-        LogUtils.d(TAG,"独立接收服务2 成功收到GPS消息");
-        LogUtils.d(TAG,"纬度:"+point.getLatitude()+" 经度:"+point.getLongitude());
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        super.onStartCommand(intent, flags, startId);
-        return START_NOT_STICKY;
-    }
-}
-

gitsion/src/main/java/cc/winboll/studio/gitsion/GpsReceiverChildService3.java

@@ -1,27 +0,0 @@
-package cc.winboll.studio.gitsion;
-
-import android.content.Intent;
-
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgitsion.model.LocationPoint;
-import cc.winboll.studio.libgitsion.service.GpsSubscribeReceiverService;
-
-public final class GpsReceiverChildService3 extends GpsSubscribeReceiverService {
-
-    public static final String TAG = "GpsReceiverChildService3";
-
-    @Override
-    public void onReceiveGpsData(LocationPoint point, GpsSubscribeMsg config) {
-        super.onReceiveGpsData(point, config);
-        LogUtils.d(TAG,"独立接收服务3 成功收到GPS消息");
-        LogUtils.d(TAG,"纬度:"+point.getLatitude()+" 经度:"+point.getLongitude());
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        super.onStartCommand(intent, flags, startId);
-        return START_NOT_STICKY;
-    }
-}
-

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

@@ -1,395 +0,0 @@
-package cc.winboll.studio.gitsion;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.EditText;
-import android.widget.Spinner;
-import android.widget.Switch;
-import android.widget.TextView;
-import android.view.Menu;
-import android.view.MenuItem;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.gitsion.R;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogActivity;
-import cc.winboll.studio.libappbase.LogUtils;
-
-import cc.winboll.studio.libappbase.ToastUtils;
-
-/**
- * WinBoLL Studio
- * GPSRelaySentinel 主控制页面
- * Java7 | API26~30
- * 新增：模拟模式勾选控制 + 按钮互斥可用状态
- */
-public final class MainActivity extends AppCompatActivity {
-
-    //原有控件
-    private Toolbar mToolbar;
-
-    private Switch mSwitchService;
-
-    //新增
-    private CheckBox mCheckBoxSimMode;
-    private Button btnSendLastGps;
-    private Spinner spinDirection;
-    private EditText etSimDistance;
-    private TextView tvTargetPreview;
-    private Button btnSimSend;
-
-    //全局模式标识 供给MainService判断
-    public static boolean IS_GPS_SIM_MODE = false;
-
-    //最后真实GPS坐标
-    public static double lastLat = 30.5928;
-    public static double lastLng = 114.3055;
-
-    //全局模拟坐标 供给MainService使用
-    public static double simLat = 30.5928;
-    public static double simLng = 114.3055;
-
-    //方位对应角度(正北0° 顺时针)
-    private double currentAngle = 0.0D;
-
-    //权限请求常量
-    private static final int REQUEST_LOCATION_PERMISSION = 1;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        initView();
-        initToolbar();
-        initSwitchEvent();
-        initSimPanelEvent();
-        initSimModeCheck();
-
-        ToastUtils.show("onCreate");
-    }
-
-    /**
-     * 全部控件绑定
-     */
-    private void initView() {
-        //原有
-        mToolbar = findViewById(R.id.toolbar);
-
-        mSwitchService = findViewById(R.id.switch_service);
-
-        //新增
-        mCheckBoxSimMode = findViewById(R.id.checkbox_sim_mode);
-        btnSendLastGps = findViewById(R.id.btn_send_last_gps);
-        spinDirection = findViewById(R.id.spin_direction);
-        etSimDistance = findViewById(R.id.et_sim_distance);
-        tvTargetPreview = findViewById(R.id.tv_target_point_preview);
-        btnSimSend = findViewById(R.id.btn_sim_send_gps);
-
-		//方位下拉 全局灰色文字
-		ArrayAdapter<CharSequence> dirAdapter = ArrayAdapter.createFromResource(
-			this,
-			R.array.direction_list,
-			R.layout.spinner_item_gray
-		);
-		dirAdapter.setDropDownViewResource(R.layout.spinner_item_gray);
-		spinDirection.setAdapter(dirAdapter);
-
-        //初始化开关状态
-        mSwitchService.setChecked(hasLocationPermission());
-        refreshButtonEnableStatus();
-        refreshTargetPreview();
-    }
-
-    //模拟勾选框监听
-    private void initSimModeCheck() {
-        mCheckBoxSimMode.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-				@Override
-				public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-					IS_GPS_SIM_MODE = isChecked;
-					refreshButtonEnableStatus();
-					if (isChecked) {
-						ToastUtils.show("已进入GPS模拟模式");
-					} else {
-						ToastUtils.show("退出模拟模式，使用真实GPS");
-					}
-				}
-			});
-    }
-
-    //刷新按钮互斥可用状态
-    private void refreshButtonEnableStatus() {
-        if (IS_GPS_SIM_MODE) {
-            //模拟模式：真实按钮禁用、模拟按钮可用
-            btnSendLastGps.setEnabled(false);
-            btnSimSend.setEnabled(true);
-        } else {
-            //正常模式：真实可用、模拟禁用
-            btnSendLastGps.setEnabled(true);
-            btnSimSend.setEnabled(false);
-        }
-    }
-
-    /**
-     * 初始化标题栏
-     */
-    private void initToolbar() {
-        setSupportActionBar(mToolbar);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_main, menu);
-        if (GlobalApplication.isDebugging()) {
-            menu.setGroupVisible(R.id.group_debug, true);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.action_about) {
-            startActivity(new Intent(this, AboutActivity.class));
-            return true;
-        }
-        if (item.getItemId() == R.id.action_gps_history) {
-            startActivity(new Intent(this, GpsHistoryActivity.class));
-            return true;
-        }
-        if (item.getItemId() == R.id.action_app_log) {
-            LogActivity.startLogActivity(this, false);
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    /**
-     * GPS服务开关监听
-     */
-    private void initSwitchEvent() {
-        mSwitchService.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-				@Override
-				public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-					if (isChecked) {
-						if (hasLocationPermission()) {
-							startGpsService();
-						} else {
-							requestLocationPermission();
-							mSwitchService.setChecked(false);
-						}
-					} else {
-						stopGpsService();
-					}
-				}
-			});
-    }
-
-    /**
-     * 模拟发送面板 全部事件初始化
-     */
-    private void initSimPanelEvent() {
-        //1.原按钮：发送最后一条真实GPS
-        btnSendLastGps.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					sendLastRealGpsBroadcast();
-				}
-			});
-
-        //2.方位下拉选择 -> 切换角度并刷新预览
-        spinDirection.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-				@Override
-				public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-					currentAngle = getDirectionAngle(position);
-					refreshTargetPreview();
-				}
-
-				@Override
-				public void onNothingSelected(AdapterView<?> parent) {}
-			});
-
-        //3.距离输入变化自动预览
-        etSimDistance.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-				@Override
-				public void onFocusChange(View v, boolean hasFocus) {
-					if (!hasFocus) {
-						refreshTargetPreview();
-					}
-				}
-			});
-
-        //4.模拟发送按钮：计算偏移并赋值全局模拟坐标
-        btnSimSend.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					saveSimGpsData();
-					GpsHistoryManager.getInstance().addSimRecord(new cc.winboll.studio.libgitsion.model.GpsSubscribeResult(
-							"SIM",
-							cc.winboll.studio.libgitsion.model.GpsSubscribeConst.RESULT_SUCCESS,
-							"模拟GPS定位",
-							cc.winboll.studio.libgitsion.model.GpsSubscribeConst.GPS_STATE_LOCATED,
-							0,
-							System.currentTimeMillis(),
-							simLat,
-							simLng,
-							System.currentTimeMillis()
-						));
-					ToastUtils.show("已设置当前模拟GPS坐标");
-				}
-			});
-    }
-
-    /**
-     * 保存模拟坐标到全局静态变量 供给MainService使用
-     */
-    private void saveSimGpsData() {
-        String disText = etSimDistance.getText().toString().trim();
-        double distance = 10D;
-        try {
-            distance = Double.parseDouble(disText);
-        } catch (Exception e) {
-            ToastUtils.show("请输入合法距离");
-            return;
-        }
-        double[] target = calculateOffsetLatLng(lastLat, lastLng, distance, currentAngle);
-        simLat = target[0];
-        simLng = target[1];
-        refreshTargetPreview();
-    }
-
-    /**
-     * 根据下拉position获取对应方位角度
-     */
-    private double getDirectionAngle(int pos) {
-        switch (pos) {
-            case 0: return 0.0D;    //正北
-            case 1: return 180.0D;  //正南
-            case 2: return 90.0D;   //正东
-            case 3: return 270.0D;  //正西
-            case 4: return 45.0D;   //东北
-            case 5: return 315.0D;  //西北
-            case 6: return 135.0D;  //东南
-            case 7: return 225.0D;  //西南
-            default:return 0.0D;
-        }
-    }
-
-    /**
-     * 根据基准坐标+距离+角度 计算偏移经纬度
-     */
-    private double[] calculateOffsetLatLng(double lat, double lng, double distanceMeter, double angle) {
-        double radAngle = Math.toRadians(angle);
-        double radLat = Math.toRadians(lat);
-
-        double meterPerLat = 111320D;
-        double meterPerLng = Math.cos(radLat) * 111320D;
-
-        double offsetLat = (distanceMeter * Math.cos(radAngle)) / meterPerLat;
-        double offsetLng = (distanceMeter * Math.sin(radAngle)) / meterPerLng;
-
-        return new double[]{lat + offsetLat , lng + offsetLng};
-    }
-
-    /**
-     * 刷新目标坐标预览
-     */
-    private void refreshTargetPreview() {
-        String disText = etSimDistance.getText().toString().trim();
-        double distance = 10D;
-        try {
-            distance = Double.parseDouble(disText);
-        } catch (Exception e) {}
-
-        double[] target = calculateOffsetLatLng(lastLat, lastLng, distance, currentAngle);
-        String info = "目标模拟坐标："
-			+ String.format("%.6f", target[0])
-			+ " , "
-			+ String.format("%.6f", target[1]);
-        tvTargetPreview.setText(info);
-    }
-
-    /**
-     * 发送【最后真实GPS】广播
-     */
-    private void sendLastRealGpsBroadcast() {
-        Intent broadcast = new Intent("GPS_DATA_BROADCAST");
-        broadcast.putExtra("isSim", false);
-        broadcast.putExtra("lat", lastLat);
-        broadcast.putExtra("lng", lastLng);
-        sendBroadcast(broadcast);
-        LogUtils.d("GPS_SEND", "发送真实GPS -> lat:" + lastLat + " lng:" + lastLng);
-    }
-
-    //—————— 原有权限 & 服务启停 完全原样保留 ——————
-
-    private boolean hasLocationPermission() {
-        boolean basicPermission = checkSelfPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
-			|| checkSelfPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED;
-
-        if (basicPermission && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
-            return checkSelfPermission(android.Manifest.permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED;
-        }
-        return basicPermission;
-    }
-
-    private void requestLocationPermission() {
-        String[] permissionArray;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
-            permissionArray = new String[]{
-				android.Manifest.permission.ACCESS_FINE_LOCATION,
-				android.Manifest.permission.ACCESS_COARSE_LOCATION,
-				android.Manifest.permission.ACCESS_BACKGROUND_LOCATION
-            };
-        } else {
-            permissionArray = new String[]{
-				android.Manifest.permission.ACCESS_FINE_LOCATION,
-				android.Manifest.permission.ACCESS_COARSE_LOCATION
-            };
-        }
-        requestPermissions(permissionArray, REQUEST_LOCATION_PERMISSION);
-    }
-
-    private void startGpsService() {
-        Intent serviceIntent = new Intent(MainActivity.this, MainService.class);
-        startForegroundService(serviceIntent);
-        ToastUtils.show("GPS Service started");
-        LogUtils.d(MainService.TAG, "GPS Service started from MainActivity");
-    }
-
-    private void stopGpsService() {
-        getSharedPreferences(MainService.PREF_NAME, Context.MODE_PRIVATE)
-			.edit()
-			.putBoolean(MainService.KEY_SERVICE_ENABLED, false)
-			.apply();
-
-        Intent serviceIntent = new Intent(MainActivity.this, MainService.class);
-        stopService(serviceIntent);
-        ToastUtils.show("GPS Service stopped");
-        LogUtils.d(MainService.TAG, "GPS Service stopped from MainActivity");
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == REQUEST_LOCATION_PERMISSION) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                mSwitchService.setChecked(true);
-                startGpsService();
-            } else {
-                ToastUtils.show("需要位置权限才能使用GPS服务");
-                mSwitchService.setChecked(false);
-            }
-        }
-    }
-
-
-}
-

gitsion/src/main/java/cc/winboll/studio/gitsion/MainService.java

@@ -1,304 +0,0 @@
-package cc.winboll.studio.gitsion;
-
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.IBinder;
-
-import androidx.core.app.NotificationCompat;
-
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libgitsion.manager.GpsSubscribeManager;
-import cc.winboll.studio.libgitsion.manager.SubscribeLocationManager;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeConst;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeResult;
-
-import java.util.Map;
-
-/**
- * WinBoLL Studio
- * GPS定位核心前台服务
- * 负责GPS持续监听、订阅者步长判断、基准坐标刷新、前台常驻通知
- * Java7 | API26~30
- * 新增：实时同步最新GPS到MainActivity静态坐标
- */
-public final class MainService extends Service {
-
-    //日志标签
-    public static final String TAG = "MainService";
-
-    //前台通知常量
-    private static final String CHANNEL_ID = "gps_relay_channel";
-    private static final int NOTIFICATION_ID = 1;
-
-    //SP配置常量
-    static final String PREF_NAME = "gps_relay_service_prefs";
-    static final String KEY_SERVICE_ENABLED = "service_enabled";
-
-    //系统定位 & 通知控件
-    private LocationManager mLocationManager;
-    private LocationListener mLocationListener;
-    private NotificationManager mNotificationManager;
-    private NotificationCompat.Builder mNotificationBuilder;
-
-    //运行状态 & 计数
-    private boolean mIsRunning = false;
-    private int mGpsLocationCount = 0;
-
-    //订阅管理器
-    private GpsSubscribeManager mSubscribeManager;
-    private SubscribeLocationManager mLocationRuleManager;
-
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        LogUtils.d(TAG, "Service onCreate");
-
-        initManager();
-        initNotificationConfig();
-
-        //上次开启状态则自动重启GPS监听
-        if (checkServiceEnableStatus()) {
-            LogUtils.d(TAG, "历史服务已启用，自动启动GPS监听");
-            startGpsLocationListen();
-        }
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        LogUtils.d(TAG, "Service onStartCommand");
-        saveServiceEnableStatus(true);
-        startGpsLocationListen();
-        return START_STICKY;
-    }
-
-    /**
-     * 初始化订阅规则管理器
-     */
-    private void initManager() {
-        mSubscribeManager = GpsSubscribeManager.getInstance();
-        mSubscribeManager.initContext(this);
-        mLocationRuleManager = SubscribeLocationManager.getInstance();
-    }
-
-    /**
-     * 初始化通知渠道与管理类
-     */
-    private void initNotificationConfig() {
-        mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        createSystemNotificationChannel();
-    }
-
-    /**
-     * 读取服务启用状态
-     */
-    private boolean checkServiceEnableStatus() {
-        return getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE)
-			.getBoolean(KEY_SERVICE_ENABLED, false);
-    }
-
-    /**
-     * 保存服务启用状态
-     */
-    private void saveServiceEnableStatus(boolean enabled) {
-        getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE)
-			.edit()
-			.putBoolean(KEY_SERVICE_ENABLED, enabled)
-			.apply();
-        LogUtils.d(TAG, "服务启用状态已设置：" + enabled);
-    }
-
-    /**
-     * 启动GPS定位监听核心逻辑
-     */
-    private void startGpsLocationListen() {
-        if (mIsRunning) {
-            LogUtils.d(TAG, "GPS监听已正在运行，无需重复启动");
-            return;
-        }
-
-        mLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
-        initLocationListener();
-
-        try {
-            if (mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
-                //定位间隔：1000毫秒 / 最小位移1米
-                mLocationManager.requestLocationUpdates(
-					LocationManager.GPS_PROVIDER,
-					1000,
-					1,
-					mLocationListener
-                );
-                mIsRunning = true;
-                startServiceForegroundNotification();
-                LogUtils.d(TAG, "GPS定位监听已成功注册");
-            }
-        } catch (SecurityException e) {
-            LogUtils.e(TAG, "定位权限缺失，监听启动失败：" + e.getMessage());
-        }
-    }
-
-    /**
-     * 初始化定位监听回调
-     */
-    private void initLocationListener() {
-        mLocationListener = new LocationListener() {
-            @Override
-            public void onLocationChanged(Location location) {
-                handleLocationUpdate(location);
-            }
-
-            @Override
-            public void onStatusChanged(String provider, int status, Bundle extras) {
-                LogUtils.d(TAG, "GPS状态变更 -> 提供者：" + provider + " 状态：" + status);
-            }
-
-            @Override
-            public void onProviderEnabled(String provider) {
-                LogUtils.d(TAG, "GPS提供者已启用：" + provider);
-            }
-
-            @Override
-            public void onProviderDisabled(String provider) {
-                LogUtils.d(TAG, "GPS提供者已禁用：" + provider);
-            }
-        };
-    }
-
-    /**
-     * 处理每次定位刷新｜核心：步长判断 + 基准坐标更新
-     * 新增：同步最新坐标到MainActivity静态变量
-     */
-    private void handleLocationUpdate(Location location) {
-        mGpsLocationCount ++;
-        String locationInfo = "纬度：" + location.getLatitude() + " , 经度：" + location.getLongitude();
-        LogUtils.d(TAG, "定位刷新 -> " + locationInfo);
-
-        //========== 新增关键代码：实时同步最新真实GPS坐标 ==========
-        MainActivity.lastLat = location.getLatitude();
-        MainActivity.lastLng = location.getLongitude();
-        //==========================================================
-
-        //更新前台通知文案
-        updateForegroundNotification(locationInfo);
-
-        double currentLat = location.getLatitude();
-        double currentLng = location.getLongitude();
-        long currentTime = location.getTime();
-
-        //保存每一次系统原始定位数据到历史记录
-        GpsSubscribeResult rawRecord = new GpsSubscribeResult(
-            "",
-            GpsSubscribeConst.RESULT_SUCCESS,
-            "系统GPS定位",
-            GpsSubscribeConst.GPS_STATE_LOCATED,
-            0,
-            System.currentTimeMillis(),
-            currentLat,
-            currentLng,
-            currentTime
-        );
-        GpsHistoryManager.getInstance().addSystemRecord(rawRecord);
-
-        //遍历全部订阅者进行推送规则判断
-        Map<String, GpsSubscribeMsg> subscribeAllMap = mSubscribeManager.getSubscribeMap();
-        for (Map.Entry<String, GpsSubscribeMsg> entry : subscribeAllMap.entrySet()) {
-            final String subscribeSid = entry.getKey();
-            final GpsSubscribeMsg subscribeConfig = entry.getValue();
-
-            //判断是否满足推送条件(全订阅/步长阈值)
-            boolean allowPush = mLocationRuleManager.isNeedPush(subscribeSid, currentLat, currentLng);
-            if (allowPush) {
-                //推送成功后刷新该订阅者基准定点坐标
-                mLocationRuleManager.updateSubscriberPoint(subscribeSid, currentLat, currentLng);
-                mLocationRuleManager.addPushCount(subscribeSid);
-
-                //发送结果广播给订阅者
-                GpsSubscribeResult result = new GpsSubscribeResult(
-                    subscribeSid,
-                    GpsSubscribeConst.RESULT_SUCCESS,
-                    "GPS定位推送",
-                    GpsSubscribeConst.GPS_STATE_LOCATED,
-                    0,
-                    System.currentTimeMillis(),
-                    currentLat,
-                    currentLng,
-                    currentTime
-                );
-                mSubscribeManager.sendSubscribeResult(result);
-                GpsHistoryManager.getInstance().addSystemRecord(result);
-                LogUtils.d(TAG, "推送GPS数据至订阅者 SID：" + subscribeSid);
-            }
-        }
-    }
-
-    /**
-     * 创建系统通知渠道
-     */
-    private void createSystemNotificationChannel() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel notificationChannel = new NotificationChannel(
-				CHANNEL_ID,
-				"GPS Relay Service",
-				NotificationManager.IMPORTANCE_LOW
-            );
-            notificationChannel.setDescription("GPSRelaySentinel 后台常驻服务通知");
-            mNotificationManager.createNotificationChannel(notificationChannel);
-        }
-    }
-
-    /**
-     * 开启前台常驻通知
-     */
-    private void startServiceForegroundNotification() {
-        mNotificationBuilder = new NotificationCompat.Builder(this, CHANNEL_ID)
-			.setContentTitle("GPS 中继服务")
-			.setContentText("等待GPS定位数据...")
-			.setSmallIcon(android.R.drawable.ic_menu_mylocation)
-			.setOngoing(true);
-
-        Notification notification = mNotificationBuilder.build();
-        startForeground(NOTIFICATION_ID, notification);
-    }
-
-    /**
-     * 动态更新通知内容
-     */
-    private void updateForegroundNotification(String locationText) {
-        if (mNotificationBuilder != null) {
-            mNotificationBuilder.setContentText(locationText + " | 定位次数：" + mGpsLocationCount);
-            mNotificationManager.notify(NOTIFICATION_ID, mNotificationBuilder.build());
-        }
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        //注销定位监听
-        if (mLocationManager != null && mLocationListener != null) {
-            try {
-                mLocationManager.removeUpdates(mLocationListener);
-            } catch (SecurityException e) {
-                LogUtils.e(TAG, "移除定位监听权限异常：" + e.getMessage());
-            }
-        }
-        mIsRunning = false;
-        LogUtils.d(TAG, "MainService 已销毁，GPS监听已停止");
-    }
-}
-

gitsion/src/main/java/cc/winboll/studio/gitsion/db/GpsHistoryDatabaseHelper.java

@@ -1,51 +0,0 @@
-package cc.winboll.studio.gitsion.db;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-
-public final class GpsHistoryDatabaseHelper extends SQLiteOpenHelper {
-
-    private static final String DB_NAME = "gps_history.db";
-    private static final int DB_VERSION = 1;
-
-    public static final String TABLE_NAME = "gps_history";
-    public static final String COL_ID = "_id";
-    public static final String COL_LATITUDE = "latitude";
-    public static final String COL_LONGITUDE = "longitude";
-    public static final String COL_LOCATION_TIME = "location_time";
-    public static final String COL_RECORD_TIME = "record_time";
-    public static final String COL_TYPE = "type";
-    public static final String COL_SID = "sid";
-    public static final String COL_DESC = "description";
-
-    public static final int TYPE_SYSTEM = 0;
-    public static final int TYPE_SIM = 1;
-
-    private static final String CREATE_TABLE =
-        "CREATE TABLE " + TABLE_NAME + " ("
-        + COL_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
-        + COL_LATITUDE + " REAL NOT NULL, "
-        + COL_LONGITUDE + " REAL NOT NULL, "
-        + COL_LOCATION_TIME + " INTEGER NOT NULL, "
-        + COL_RECORD_TIME + " INTEGER NOT NULL, "
-        + COL_TYPE + " INTEGER NOT NULL DEFAULT " + TYPE_SYSTEM + ", "
-        + COL_SID + " TEXT, "
-        + COL_DESC + " TEXT"
-        + ")";
-
-    public GpsHistoryDatabaseHelper(Context context) {
-        super(context, DB_NAME, null, DB_VERSION);
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        db.execSQL(CREATE_TABLE);
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
-        onCreate(db);
-    }
-}

gitsion/src/main/java/cc/winboll/studio/gitsion/model/GpsHistoryRecord.java

@@ -1,64 +0,0 @@
-package cc.winboll.studio.gitsion.model;
-
-import cc.winboll.studio.gitsion.db.GpsHistoryDatabaseHelper;
-
-public final class GpsHistoryRecord {
-
-    private final long id;
-    private final double latitude;
-    private final double longitude;
-    private final long locationTime;
-    private final long recordTime;
-    private final int type;
-    private final String sid;
-    private final String description;
-
-    public GpsHistoryRecord(long id, double latitude, double longitude,
-                            long locationTime, long recordTime,
-                            int type, String sid, String description) {
-        this.id = id;
-        this.latitude = latitude;
-        this.longitude = longitude;
-        this.locationTime = locationTime;
-        this.recordTime = recordTime;
-        this.type = type;
-        this.sid = sid;
-        this.description = description;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public double getLatitude() {
-        return latitude;
-    }
-
-    public double getLongitude() {
-        return longitude;
-    }
-
-    public long getLocationTime() {
-        return locationTime;
-    }
-
-    public long getRecordTime() {
-        return recordTime;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public boolean isSim() {
-        return type == GpsHistoryDatabaseHelper.TYPE_SIM;
-    }
-
-    public String getSid() {
-        return sid;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-}

gitsion/src/main/res/drawable/border_gray.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    android:shape="rectangle">
-    <!-- 灰色边框 -->
-    <stroke
-        android:width="1dp"
-        android:color="#555555"/>
-    <!-- 内部深色背景 -->
-    <solid android:color="#222222"/>
-    <!-- 轻微圆角 -->
-    <corners android:radius="4dp"/>
-</shape>
-

gitsion/src/main/res/layout/activity_about.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <cc.winboll.studio.libappbase.views.AboutView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/aboutview"/>
-
-    </LinearLayout>
-
-</FrameLayout>

gitsion/src/main/res/layout/activity_gps_history.xml

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="#1c1c1c">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:padding="8dp"
-        android:background="@drawable/border_gray"
-        android:layout_margin="4dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="系统GPS："
-            android:textColor="#aaaaaa"
-            android:textSize="13sp"/>
-
-        <TextView
-            android:id="@+id/tv_system_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="0"
-            android:textColor="#4fc3f7"
-            android:textSize="13sp"
-            android:layout_marginRight="16dp"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="模拟GPS："
-            android:textColor="#aaaaaa"
-            android:textSize="13sp"/>
-
-        <TextView
-            android:id="@+id/tv_sim_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="0"
-            android:textColor="#ffb74d"
-            android:textSize="13sp"/>
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/tv_empty_hint"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="暂无GPS历史数据"
-        android:textColor="#666666"
-        android:gravity="center"
-        android:padding="24dp"
-        android:visibility="gone"/>
-
-    <ListView
-        android:id="@+id/lv_gps_history"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</LinearLayout>

gitsion/src/main/res/layout/activity_main.xml

@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical"
-	android:background="#1c1c1c">
-
-	<com.google.android.material.appbar.AppBarLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-		<androidx.appcompat.widget.Toolbar
-			android:id="@+id/toolbar"
-			android:layout_width="match_parent"
-			android:layout_height="?attr/actionBarSize"
-			app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
-	</com.google.android.material.appbar.AppBarLayout>
-
-	<!-- 数据面板容器 -->
-	<LinearLayout
-		android:id="@+id/container_data_panel"
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:gravity="center_horizontal">
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="GPSRelaySentinel"
-			android:textColor="#888888"
-			android:padding="6dp"
-			android:background="@drawable/border_gray"
-			android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-		<LinearLayout
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal"
-			android:gravity="center_vertical"
-			android:layout_marginTop="8dp"
-			android:spacing="12dp">
-
-			<CheckBox
-				android:id="@+id/checkbox_sim_mode"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="模拟模式"
-				android:textColor="#999999"
-				android:padding="4dp"
-				android:background="@drawable/border_gray"
-				android:textSize="11sp"/>
-
-			<Switch
-				android:id="@+id/switch_service"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="GPS Service"
-				android:textColor="#999999"
-				android:padding="4dp"
-				android:background="@drawable/border_gray"
-				android:checked="false"/>
-
-			<Button
-				android:id="@+id/btn_send_last_gps"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="发送最后GPS"
-				android:textColor="#bbbbbb"
-				android:background="@drawable/border_gray"
-				android:textSize="12sp"/>
-
-		</LinearLayout>
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:layout_marginTop="16dp"
-			android:padding="12dp"
-			android:background="@drawable/border_gray">
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="模拟移动GPS发送面板"
-				android:textColor="#999999"
-				android:textSize="12sp"/>
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:layout_marginTop="8dp"
-				android:spacing="8dp">
-
-				<Spinner
-					android:id="@+id/spin_direction"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_weight="1"
-					android:background="@drawable/border_gray"/>
-
-				<EditText
-					android:id="@+id/et_sim_distance"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_weight="1"
-					android:hint="移动距离(米)"
-					android:inputType="numberDecimal"
-					android:text="10"
-					android:background="@drawable/border_gray"
-					android:textColor="#aaaaaa"
-					android:textColorHint="#666666"/>
-
-			</LinearLayout>
-
-			<TextView
-				android:id="@+id/tv_target_point_preview"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="目标坐标：等待计算..."
-				android:textColor="#999999"
-				android:background="@drawable/border_gray"
-				android:padding="6dp"
-				android:textSize="11sp"
-				android:layout_marginTop="8dp"/>
-
-			<Button
-				android:id="@+id/btn_sim_send_gps"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="发送模拟移动GPS"
-				android:textColor="#bbbbbb"
-				android:background="@drawable/border_gray"
-				android:layout_marginTop="10dp"/>
-
-		</LinearLayout>
-		
-	</LinearLayout>
-
-
-	<ScrollView
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0">
-
-		<!-- 订阅面板容器 -->
-		<LinearLayout
-			android:id="@+id/container_subscribe_panel"
-			android:orientation="vertical"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:padding="12dp">
-
-			<cc.winboll.studio.libgitsion.view.GpsSubscribeControlView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="10dp"
-				android:background="@drawable/border_gray"/>
-
-			<cc.winboll.studio.libgitsion.view.GpsSubscribeControlView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="10dp"
-				android:background="@drawable/border_gray"/>
-
-			<cc.winboll.studio.libgitsion.view.GpsSubscribeControlView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="10dp"
-				android:background="@drawable/border_gray"/>
-
-		</LinearLayout>
-
-	</ScrollView>
-
-</LinearLayout>
-

gitsion/src/main/res/layout/list_item_gps_history.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout_record_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="8dp"
-    android:background="@drawable/border_gray"
-    android:layout_margin="4dp">
-
-    <TextView
-        android:id="@+id/tv_record_type"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="10sp"
-        android:padding="2dp"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
-        android:layout_marginBottom="2dp"/>
-
-    <TextView
-        android:id="@+id/tv_record_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="#aaaaaa"
-        android:textSize="11sp"/>
-
-    <TextView
-        android:id="@+id/tv_record_coord"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="#888888"
-        android:textSize="12sp"
-        android:layout_marginTop="2dp"/>
-
-</LinearLayout>

gitsion/src/main/res/layout/spinner_item_gray.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="8dp"
-    android:textColor="#999999"
-    android:gravity="center_vertical"/>
-

gitsion/src/main/res/menu/menu_main.xml

@@ -1,20 +0,0 @@
-<?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/action_about"
-        android:title="About"
-        android:icon="@android:drawable/ic_menu_info_details"
-        app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/action_gps_history"
-        android:title="GPS历史"
-        android:icon="@android:drawable/ic_menu_myplaces"
-        app:showAsAction="ifRoom"/>
-    <group android:id="@+id/group_debug">
-        <item
-            android:id="@+id/action_app_log"
-            android:title="应用日志"
-            android:visible="false"/>
-    </group>
-</menu>

gitsion/src/main/res/values/arrays.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="direction_list">
-        <item>正北</item>
-        <item>正南</item>
-        <item>正东</item>
-        <item>正西</item>
-        <item>东北</item>
-        <item>西北</item>
-        <item>东南</item>
-        <item>西南</item>
-    </string-array>
-</resources>
-

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	
-    <string name="app_name">Gitsion</string>
-    <string name="app_description">A GPS relay tool supporting real and simulated positioning, running in background for location forwarding, debugging and simulation.</string>
-
-</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.22'
+    api 'cc.winboll.studio:libappbase:15.20.9'
 	// 备用库 jitpack.io 地址
-	api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.22'
+	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'
 	
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

libaes/build.properties

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

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

@@ -15,7 +15,6 @@ 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;
@@ -23,10 +22,8 @@ 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;
@@ -37,8 +34,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 {
 
@@ -47,6 +44,7 @@ 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;
@@ -61,14 +59,13 @@ 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();
@@ -81,32 +78,53 @@ 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);
@@ -117,6 +135,26 @@ 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);
@@ -124,6 +162,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
 
     @Override
     public Context getApplicationContext() {
+        // TODO: Implement this method
         return super.getApplicationContext();
     }
 
@@ -134,27 +173,25 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        // 替换为 DrawerFragmentActivity 专属点击处理方法
-        if (AESThemeUtil.onWinBoLLThemeItemSelected(this, item)) {
+        if (AESThemeUtil.onAppThemeItemSelected(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() {
@@ -176,13 +213,14 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         mPullRefreshLayout = findViewById(R.id.activitydrawerfragmentPullRefreshLayout1);
 
         mPullRefreshLayout.setOnRefreshListener(new PullRefreshLayout.OnRefreshListener() {
-				@Override
-				public void onRefresh() {
-					reinitDrawerMenuItemList(malDrawerMenuItem);
-					mDrawerMenuDataAdapter.notifyDataSetChanged();
-					mPullRefreshLayout.setRefreshing(false);
-				}
-			});
+                @Override
+                public void onRefresh() {
+                    //LogUtils.d(TAG, "onRefresh");
+                    reinitDrawerMenuItemList(malDrawerMenuItem);
+                    mDrawerMenuDataAdapter.notifyDataSetChanged();
+                    mPullRefreshLayout.setRefreshing(false);
+                }
+            });
 
         malDrawerMenuItem = new ArrayList<DrawerMenuBean>();
 
@@ -198,51 +236,68 @@ 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);
     }
@@ -250,11 +305,12 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     void initSecondaryRootView() {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					finish();
-				}
-			});
+                @Override
+                public void onClick(View v) {
+                    //LogUtils.d(TAG, "onClick " + Integer.toString(v.getId()));
+                    finish();
+                }
+            });
     }
 
     public <T extends Fragment> int removeFragment(T fragment) {
@@ -319,13 +375,13 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         if (mActivityType == ActivityType.Main) {
-            // 替换为兼容版菜单加载方法
-            AESThemeUtil.inflateCompatThemeMenu(this, menu);
-            // 调试工具菜单
-            if (GlobalApplication.isDebugging()) {
-                DevelopUtils.inflateMenu(this, menu);
-            }
-            // 应用信息菜单
+			// 主题菜单
+            AESThemeUtil.inflateMenu(this, menu);
+			// 调试工具菜单
+			if (GlobalApplication.isDebugging()) {
+				DevelopUtils.inflateMenu(this, menu);
+			}
+			// 应用信息菜单
             getMenuInflater().inflate(R.menu.toolbar_drawerbase, menu);
         }
         return super.onCreateOptionsMenu(menu);
@@ -336,4 +392,3 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         super.onActivityResult(who, targetFragment, requestCode);
     }
 }
-

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

@@ -8,9 +8,8 @@ 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.models.libs1520000.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
-import java.util.ArrayList;
 
 public class AESThemeBean extends BaseBean {
 
@@ -42,28 +41,13 @@ 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;
     }
@@ -75,7 +59,7 @@ public class AESThemeBean extends BaseBean {
     public int getCurrentThemeTypeID() {
         return this.currentThemeStyleID;
     }
-
+    
     @Override
     public String getName() {
         return AESThemeBean.class.getName();
@@ -90,7 +74,8 @@ 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 {
@@ -105,7 +90,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.models.libs1520000.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
 public class WinBoLLClientServiceBean extends BaseBean {

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

@@ -12,6 +12,7 @@ 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  {
@@ -27,12 +28,11 @@ public class TestASupportToolbarActivity extends AppCompatActivity implements IW
     public String getTag() {
         return TAG;
     }
-
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         LogUtils.d(TAG, "onCreate() start");
-        // 替换此处：原 applyAppTheme -> 新方法 applyAppCompatTheme
-        AESThemeUtil.applyAppCompatTheme(this);
+        AESThemeUtil.applyAppTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_testasupporttoolbar);
         LogUtils.d(TAG, "setContentView() done");
@@ -45,4 +45,3 @@ public class TestASupportToolbarActivity extends AppCompatActivity implements IW
         LogUtils.d(TAG, "onCreate() end");
     }
 }
-

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

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

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

@@ -9,165 +9,203 @@ 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";
 
-    // 私有静态集合，外部不可直接修改
-    private static ArrayList<Integer> themeStyleIDList = new ArrayList<>();
+    static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
+    static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
 
-    // 移除无用实例成员 mThemeType，工具类不保留实例字段
+    protected volatile AESThemeBean.ThemeType mThemeType;
 
-    /**
-     * 初始化主题样式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);
-    }
-
-    /**
-     * 获取当前主题样式ID
-     */
-    public static int getThemeTypeID(Context context) {
+    public static <T extends Context> int getThemeTypeID(T context) {
         AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
-        return bean == null ? getThemeStyleID(AESThemeBean.ThemeType.AES) : bean.getCurrentThemeTypeID();
+        return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES): bean.getCurrentThemeTypeID();
     }
 
-    /**
-     * 保存主题样式ID
-     */
-    public static void saveThemeStyleID(Context context, int themeTypeID) {
-        AESThemeBean bean = new AESThemeBean(themeTypeID);
+    public static <T extends Context> void saveThemeStyleID(T context, int nThemeTypeID) {
+        AESThemeBean bean = new AESThemeBean(nThemeTypeID);
         AESThemeBean.saveBean(context, bean);
     }
 
-    // ====================== 应用主题 - 规范重载 ======================
-    /**
-     * 应用当前持久化主题（通用 Activity）
-     */
-    public static void applyTheme(Activity activity) {
+    public static <T extends Activity> void applyAppTheme(T activity) {
         activity.setTheme(getThemeTypeID(activity));
     }
 
-    /**
-     * 应用指定主题（通用 Activity）
-     */
-    public static void applyTheme(Activity activity, AESThemeBean.ThemeType themeType) {
-        activity.setTheme(getThemeStyleID(themeType));
-    }
-
-    /**
-     * 应用当前持久化主题（AppCompat 兼容 Activity）
-     */
-    public static void applyAppCompatTheme(AppCompatActivity activity) {
+    public static <T extends AppCompatActivity> void applyAppCompatTheme(T activity) {
         activity.setTheme(getThemeTypeID(activity));
     }
 
-    /**
-     * 应用指定主题（AppCompat 兼容 Activity）
-     */
-    public static void applyAppCompatTheme(AppCompatActivity activity, AESThemeBean.ThemeType themeType) {
-        activity.setTheme(getThemeStyleID(themeType));
+    /*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));
     }
 
-    // ====================== 加载菜单 ======================
-    /**
-     * 加载主题菜单（通用 Activity）
-     */
-    public static void inflateThemeMenu(Activity activity, Menu menu) {
+    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.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
     }
 
-    /**
-     * 加载主题菜单（AppCompat Activity）
-     */
-    public static void inflateCompatThemeMenu(AppCompatActivity activity, Menu menu) {
+    public static <T extends AppCompatActivity> void inflateCompatMenu(T activity, Menu menu) {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
     }
 
-    // ====================== 菜单点击统一核心逻辑（消除重复代码） ======================
-    /**
-     * 主题菜单项点击统一处理
-     * @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;
+    /*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;
         }
-        saveThemeStyleID(context, themeStyleId);
-        return true;
+
+        return false;
     }
 
-    // 对外暴露不同 Activity 类型的入口，内部调用统一核心方法
-    public static boolean onThemeItemSelected(Activity activity, MenuItem item) {
-        return handleThemeMenuClick(activity, item);
-    }
-
-    public static boolean onAppCompatThemeItemSelected(AppCompatActivity activity, MenuItem item) {
-        return handleThemeMenuClick(activity, item);
-    }
-
-    public static boolean onWinBoLLThemeItemSelected(AppCompatActivity activity, MenuItem item) {
-        // 使用 Application 上下文保存，避免 Activity 泄漏
-        return handleThemeMenuClick(activity.getApplicationContext(), item);
-    }
-
-    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];
-            }
+    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 AESThemeBean.ThemeType.values()[0];
+
+        return false;
+    }
+
+    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 <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;
+        }
+
+        return false;
     }
 }
-

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">#FF3DDC84</color>
-    <color name="colorAccent">#FF027C39</color>
+    <color name="colorPrimaryDark">#FF027C39</color>
+    <color name="colorAccent">#FF3DDC84</color>
     <color name="colorText">#FFFFFB8D</color>
-    <color name="colorToastFrame">#FF555555</color>
+    <color name="colorToastFrame">#FFA9A9A9</color>
     <color name="colorToastShadow">#FF000000</color>
-    <color name="colorToastBackgroung">#FF3A3A3A</color>
-    <color name="colorAToolbarStartColor">#FF5A3A1A</color>
-    <color name="colorAToolbarCenterColor">#FFA05A2A</color>
-    <color name="colorAToolbarEndColor">#FFD4A07A</color>
+    <color name="colorToastBackgroung">#FFFFFFFF</color>
+    <color name="colorAToolbarStartColor">#FF7D3F12</color>
+    <color name="colorAToolbarCenterColor">#FFCC6E2B</color>
+    <color name="colorAToolbarEndColor">#FFF4B98F</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">#FF3DDC84</color>
+    <color name="toolbarBackgroundColor">#FF03AB4E</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,9 +2,6 @@
 <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>
@@ -43,52 +40,52 @@
 
     <style name="AESAToolbar">
         <item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+        <item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrAToolbarEndColor">@color/colorAccent</item>
     </style>
 
     <style name="AESASupportToolbar">
         <item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+        <item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">@color/colorAccent</item>
     </style>
 
     <style name="DepthAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FF0065EC</item>
-        <item name="colorPrimaryDark">#FF4A97FF</item>
-        <item name="colorAccent">#FF004DB4</item>
+        <item name="colorPrimaryDark">#FF004DB4</item>
+        <item name="colorAccent">#FF4A97FF</item>
     </style>
 
     <style name="SkyAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FF00A6FF</item>
-        <item name="colorPrimaryDark">#FF84D4FF</item>
-        <item name="colorAccent">#FF007ABB</item>
+        <item name="colorPrimaryDark">#FF007ABB</item>
+        <item name="colorAccent">#FF84D4FF</item>
     </style>
 
     <style name="GoldenAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FFF0CA11</item>
-        <item name="colorPrimaryDark">#FFFFE35C</item>
-        <item name="colorAccent">#FFD3AF00</item>
+        <item name="colorPrimaryDark">#FFD3AF00</item>
+        <item name="colorAccent">#FFFFE35C</item>
     </style>
 
     <style name="BearingAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FF840FFF</item>
-        <item name="colorPrimaryDark">#FFBA78FF</item>
-        <item name="colorAccent">#FF6900D7</item>
+        <item name="colorPrimaryDark">#FF6900D7</item>
+        <item name="colorAccent">#FFBA78FF</item>
     </style>
 
     <style name="MemorAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FFFF00F5</item>
-        <item name="colorPrimaryDark">#FFFF76FA</item>
-        <item name="colorAccent">#FFE500DC</item>
+        <item name="colorPrimaryDark">#FFE500DC</item>
+        <item name="colorAccent">#FFFF76FA</item>
     </style>
 
     <style name="TaoAESTheme" parent="AESTheme">
-        <item name="colorPrimary">#FF7E7E7E</item>
-        <item name="colorPrimaryDark">#FFE2E2E2</item>
-        <item name="colorAccent">#FF000000</item>
+        <item name="colorPrimary">#FFACACAC</item>
+        <item name="colorPrimaryDark">#FF898989</item>
+        <item name="colorAccent">#FFD8D8D8</item>
     </style>
 
     <style name="NormalDialogStyle" parent="Theme.AppCompat.Dialog">

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

@@ -2,9 +2,6 @@
 <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>
@@ -43,16 +40,16 @@
 
     <style name="AESAToolbar">
         <item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+        <item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrAToolbarEndColor">@color/colorAccent</item>
     </style>
 
     <style name="AESASupportToolbar">
         <item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+        <item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">@color/colorAccent</item>
     </style>
 
     <style name="DepthAESTheme" parent="AESTheme">
@@ -86,9 +83,9 @@
     </style>
 
     <style name="TaoAESTheme" parent="AESTheme">
-        <item name="colorPrimary">#FF7E7E7E</item>
-        <item name="colorPrimaryDark">#FF000000</item>
-        <item name="colorAccent">#FFE2E2E2</item>
+        <item name="colorPrimary">#FFACACAC</item>
+        <item name="colorPrimaryDark">#FF898989</item>
+        <item name="colorAccent">#FFD8D8D8</item>
     </style>
 
     <style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog">
@@ -112,4 +109,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
-#Wed Jun 03 06:52:38 HKT 2026
-stageCount=26
+#Sun May 17 16:16:36 HKT 2026
+stageCount=16
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.25
+publishVersion=15.20.15
 buildCount=0
-baseBetaVersion=15.20.26
+baseBetaVersion=15.20.16

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

@@ -2,7 +2,6 @@ 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/CrashHandler.java

@@ -263,7 +263,7 @@ public final class CrashHandler {
             setContentView(contentView);
 
             getActionBar().setTitle(TITTLE);
-            getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()) + " Error");
+            getActionBar().setSubtitle(GlobalApplication.class.getSimpleName() + " Error");
         }
 
         @Override

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

@@ -6,10 +6,6 @@ import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.util.Log;
-import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 
 /**
  * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
@@ -129,32 +125,18 @@ public class GlobalApplication extends Application {
      */
     @Override
     public void onCreate() {
-        try {
-            super.onCreate();
-			
-            // 初始化单例实例（确保在所有初始化操作前完成）
-            sInstance = this;
+        super.onCreate();
+        // 初始化单例实例（确保在所有初始化操作前完成）
+        sInstance = this;
 
-            restoreDebugStatus();
-            // 初始化基础组件（日志、崩溃处理、Toast）
-            initCoreComponents();
-            // 初始化服务器地址（从 SP 读取到内存，提高后续访问效率）
-            initWinbollHost();
+        // 初始化基础组件（日志、崩溃处理、Toast）
+        initCoreComponents();
+        // 恢复/初始化调试模式状态（从本地文件读取，无文件则默认关闭调试）
+        restoreDebugStatus();
+        // 新增：初始化服务器地址（从 SP 读取到内存，提高后续访问效率）
+        initWinbollHost();
 
-            LogUtils.d(TAG, "GlobalApplication 初始化完成，单例实例已创建");
-        } 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,
-                CrashHandler.CrashActivity.class
-            );
-        }
+        LogUtils.d(TAG, "GlobalApplication 初始化完成，单例实例已创建");
     }
 
     /**
@@ -162,11 +144,7 @@ public class GlobalApplication extends Application {
      */
     private void initCoreComponents() {
         // 初始化日志工具（传入 Application 上下文）
-		
-		// 调试状态下初始化日志工具
-		if (GlobalApplication.isDebugging()) {
-			LogUtils.init(this);
-		}
+        LogUtils.init(this);
         // 初始化全局异常处理器（捕获应用崩溃信息，用于调试或上报）
         CrashHandler.init(this);
         // 初始化 Toast 工具（统一 Toast 样式、避免内存泄漏等）
@@ -209,7 +187,7 @@ public class GlobalApplication extends Application {
      */
     public static String getAppName(Context context) {
         if (context == null) {
-            Log.w(TAG, "getAppName: 上下文为空，返回 null");
+            LogUtils.w(TAG, "getAppName: 上下文为空，返回 null");
             return null;
         }
         PackageManager packageManager = context.getPackageManager();
@@ -225,7 +203,8 @@ public class GlobalApplication extends Application {
             return appName;
         } catch (NameNotFoundException e) {
             // 包名不存在（理论上不会发生，捕获异常避免崩溃）
-            Log.e(TAG, "获取应用名称失败：包名不存在", e);
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            //LogUtils.e(TAG, "获取应用名称失败：包名不存在", e);
             e.printStackTrace();
         }
         return null;

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

@@ -27,11 +27,6 @@ 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,29 +67,45 @@ 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) {
-		if (!GlobalApplication.isDebugging()) {
-			return;
-		}
-		Log.d(TAG, "init 执行日志工具初始化");
-		_mContext = context;
+        Log.d(TAG, "init 执行日志工具初始化");
+        _mContext = context;
 
-		initLogUtilsDir();
+        if (GlobalApplication.isDebugging()) {
+            initDebugDir();
+        } else {
+            initReleaseDir();
+        }
 
-		initLogConfigBean();
-		addClassTAGList();
-		loadTAGBeanSettings();
-		checkAndTrimLogFileSize();
+        initLogConfigBean();
+        addClassTAGList();
+        loadTAGBeanSettings();
+        checkAndTrimLogFileSize();
 
-		_IsInited = true;
-		Log.d(TAG, "init 执行日志工具初始化完成");
+        _IsInited = true;
+        Log.d(TAG, "init 日志工具初始化完成");
     }
 
     // ====================== 目录初始化 ======================
-    private static void initLogUtilsDir() {
+    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() {
         final Context appContext = _mContext.getApplicationContext();
         _mfLogCacheDir = new File(appContext.getCacheDir(), TAG);
         if (!_mfLogCacheDir.exists()) {
@@ -97,7 +113,7 @@ public class LogUtils {
         }
         _mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
 
-        _mfLogDataDir = appContext.getExternalFilesDir(TAG);
+        _mfLogDataDir = new File(appContext.getFilesDir(), TAG);
         if (!_mfLogDataDir.exists()) {
             _mfLogDataDir.mkdirs();
         }
@@ -120,7 +136,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) {
@@ -250,9 +266,6 @@ 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();
@@ -266,9 +279,6 @@ 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);
         }
@@ -278,22 +288,15 @@ 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 == null ?LOG_LEVEL.Off: _mLogUtilsBean.getLogLevel();
+        return _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,7 +2,6 @@ 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,7 +2,6 @@ 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,7 +1,6 @@
 package cc.winboll.studio.libappbase;
 
 import android.os.FileObserver;
-import java.io.File;
 import java.lang.ref.WeakReference;
 
 /**
@@ -52,38 +51,30 @@ public class LogViewThread extends Thread {
      */
     @Override
     public void run() {
-		// 调试状态进行日志输出任务
-		if (GlobalApplication.isDebugging()) {
-			// 获取日志缓存目录路径（从 LogUtils 统一获取，确保路径一致性）
-			File logDir = LogUtils.getLogCacheDir();
-			if (logDir == null) {
-				LogUtils.d(TAG, "日志缓存目录未初始化，线程退出");
-				return;
-			}
-			String logDirPath = logDir.getPath();
-			LogUtils.d(TAG, "启动日志文件监听，监听目录：" + logDirPath);
+        // 获取日志缓存目录路径（从 LogUtils 统一获取，确保路径一致性）
+        String logDirPath = LogUtils.getLogCacheDir().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

@@ -1,415 +0,0 @@
-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,8 +1,6 @@
 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;
@@ -14,7 +12,6 @@ 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;
@@ -77,12 +74,12 @@ public class AboutView extends LinearLayout {
     private EditText metDevUserPassword;
 
     // ===================================== 页面视图控件 =====================================
-    private DebugSwitchInfoImageView ivAppIcon;
+    private DebugSwitchImageView ivAppIcon;
     private TextView tvAppNameVersion;
     private TextView tvAppDesc;
     private LinearLayout llFunctionContainer;
 	private ImageButton ibSebugStepOver;
-    private ImageButton ibDebugUnlock;
+    private ImageButton ibSigngetDialog;
     private ImageButton ibWinBoLLHostDialog;
 
     // ===================================== 构造方法（按参数从少到多排序） =====================================
@@ -196,12 +193,12 @@ public class AboutView extends LinearLayout {
 		llFunctionContainer = findViewById(R.id.ll_function_container);
 		// 功能按钮绑定
 		ibSebugStepOver = findViewById(R.id.ib_debug_step_over);
-		ibDebugUnlock = findViewById(R.id.ib_debug_unlock);
+		ibSigngetDialog = findViewById(R.id.ib_signgetdialog);
 		ibWinBoLLHostDialog = findViewById(R.id.ib_winbollhostdialog);
 
 		// 调试按钮统一只在调试模式显示
 		ibWinBoLLHostDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
-		//ibDebugUnlock.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
+		//ibSigngetDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
 		ibSebugStepOver.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
 
 		// 绑定按钮点击事件
@@ -313,47 +310,6 @@ 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();
-    }
-
     // ===================================== 内部工具/事件方法 =====================================
     /**
      * 绑定功能按钮点击事件，处理正版校验、调试地址配置弹窗唤起
@@ -379,15 +335,6 @@ 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

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

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

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

libgitsion/.gitignore

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

libgitsion/build.gradle

@@ -1,35 +0,0 @@
-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
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-}
-
-dependencies {
-	
-	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.20.15'
-    api 'cc.winboll.studio:libappbase:15.20.26'
-	
-    api fileTree(dir: 'libs', include: ['*.jar'])
-}

libgitsion/build.properties

@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Fri May 01 17:09:11 HKT 2026
-stageCount=57
-libraryProject=libdebugtemp
-baseVersion=15.0
-publishVersion=15.0.56
-buildCount=0
-baseBetaVersion=15.0.57

libgitsion/proguard-rules.pro

@@ -1,17 +0,0 @@
-# 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 *;
-#}

libgitsion/src/main/AndroidManifest.xml

@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.libgitsion">
-
-    <application>
-		<service
-			android:name=".service.GpsSubscribeReceiverService"
-			android:exported="true"
-			android:enabled="true">
-			<intent-filter>
-				<action android:name="cc.winboll.studio.libgitsion.action.RECEIVE" />
-			</intent-filter>
-		</service>
-		
-        <receiver android:name=".receiver.GpsSubscribeObserverReceiver">
-
-            <intent-filter>
-
-                <action android:name="cc.winboll.studio.GPS_SUBSCRIBE_CALLBACK"/>
-
-            </intent-filter>
-
-        </receiver>
-    </application>
-
-</manifest>