<appbase>APK 15.20.0 release Publish.

配置统一应用资源配置版本基础产品线型号
添加应用共享用户ID配置
2026-05-10 13:24:08 +08:00 · 2026-05-10 13:20:21 +08:00 · 2026-05-10 13:13:26 +08:00 · 2026-05-10 07:22:06 +08:00 · 2026-05-10 05:28:06 +08:00 · 2026-05-10 05:20:54 +08:00
116 changed files with 1519 additions and 3708 deletions
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -24,13 +24,13 @@ android {
 	
    defaultConfig {
        applicationId "cc.winboll.studio.appbase"
-        minSdkVersion 21
+        minSdkVersion 26
        targetSdkVersion 30
        versionCode 1
        // versionName 更新后需要手动设置 
        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.15"
+        versionName "15.20"
        if(true) {
            versionName = genVersionName("${versionName}")
        }
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 28 17:08:30 HKT 2026
-stageCount=22
+#Sun May 10 13:24:08 HKT 2026
+stageCount=1
 libraryProject=libappbase
-baseVersion=15.15
-publishVersion=15.15.21
+baseVersion=15.20
+publishVersion=15.20.0
 buildCount=0
-baseBetaVersion=15.15.22
+baseBetaVersion=15.20.1
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -9,7 +9,9 @@
        android:label="@string/app_name"
        android:theme="@style/MyAPPBaseTheme"
        android:resizeableActivity="true"
-        android:process=":App">
+        android:process=":App"
+        android:sharedUserId="cc.winboll.studio"
+        android:sharedUserLabel="@string/shared_user_label">

        <activity
            android:name=".MainActivity"
@@ -19,28 +21,16 @@
            android:launchMode="singleTop"
            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">

-        </activity>
-
-        <activity
-            android:name=".MainActivityAlias"
-            android:label="@string/app_name"
-            android:exported="true"
-            android:resizeableActivity="true"
-            android:launchMode="singleTop"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
-
            <intent-filter>
-
                <action android:name="android.intent.action.MAIN"/>
-
                <category android:name="android.intent.category.LAUNCHER"/>
-
                <category android:name="android.intent.category.DEFAULT"/>
-
            </intent-filter>

        </activity>

+
+
        <activity
            android:name=".Main2Activity"
            android:label="@string/app_name"
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -162,25 +162,7 @@ public class MainActivity extends Activity {
        startActivity(aboutIntent);
    }

-	public void onSplitScreenMode(View view) {
-        LogUtils.d(TAG, "onSplitScreenMode() 分屏测试按钮已点击");
-        ToastUtils.show("分屏测试：已启动新窗口");
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-            android.graphics.Rect bounds = new android.graphics.Rect();
-            getWindow().getDecorView().getDisplay().getRectSize(bounds);
-            int height = bounds.height();
-            int width = bounds.width();
-            bounds.set(0, 0, width, height / 2);
-            LogUtils.d(TAG, "onSplitScreenMode() 分屏窗口范围: " + bounds);
-            android.content.Intent intent = new android.content.Intent(this, MainActivityAlias.class);
-            intent.setFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
-            LogUtils.d(TAG, "onSplitScreenMode() 准备启动MainActivityAlias");
-            android.app.ActivityOptions options = android.app.ActivityOptions.makeBasic();
-            options.setLaunchBounds(bounds);
-            startActivity(intent, options.toBundle());
-            LogUtils.d(TAG, "onSplitScreenMode() MainActivityAlias已启动");
-        }
-    }
+

 	public void onMultiInstance(View view) {
        LogUtils.d(TAG, "onMultiInstance() 多开窗口按钮已点击");
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivityAlias.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivityAlias.java
@@ -1,17 +0,0 @@
-package cc.winboll.studio.appbase;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Toolbar;
-import cc.winboll.studio.appbase.R;
-
-public class MainActivityAlias extends MainActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setActionBar(toolbar);
-    }
-}
--- a/appbase/src/main/res/layout-night/activity_about.xml
+++ b/appbase/src/main/res/layout-night/activity_about.xml
@@ -0,0 +1,22 @@
+<?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:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">
+
+	<android.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
+		android:id="@+id/toolbar"/>
+
+	<cc.winboll.studio.libappbase.views.AboutView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:id="@+id/aboutview"/>
+
+</LinearLayout>
--- a/appbase/src/main/res/layout-night/activity_main.xml
+++ b/appbase/src/main/res/layout-night/activity_main.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:padding="0dp"
+	android:background="?attr/activityBackgroundColor">
+
+	<android.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
+		android:id="@+id/toolbar"/>
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:gravity="center_vertical"
+			android:spacing="12dp">
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="关于应用"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/buttonBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onAboutActivity"
+				android:layout_margin="10dp"/>
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="应用崩溃测试"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/buttonBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onCrashTest"
+				android:layout_margin="10dp"/>
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="应用日志测试"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/buttonBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onLogTest"
+				android:layout_margin="10dp"/>
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="应用日志测试（新窗口）"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/buttonBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onLogTestNewTask"
+				android:layout_margin="10dp"/>
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="应用吐司测试"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/buttonBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onToastUtilsTest"
+				android:layout_margin="10dp"/>
+
+
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="多开窗口"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/buttonBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onMultiInstance"
+				android:layout_margin="10dp"/>
+
+		</LinearLayout>
+
+	</ScrollView>
+
+</LinearLayout>
--- a/appbase/src/main/res/layout-night/activity_main2.xml
+++ b/appbase/src/main/res/layout-night/activity_main2.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:gravity="center"
+	android:background="@android:color/white">
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="Main2Activity"
+		android:textSize="24sp"
+		android:textColor="@color/gray_900"/>
+
+</LinearLayout>
--- a/appbase/src/main/res/layout/activity_about.xml
+++ b/appbase/src/main/res/layout/activity_about.xml
@@ -4,11 +4,13 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">

 	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
 		android:id="@+id/toolbar"/>

 	<cc.winboll.studio.libappbase.views.AboutView
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -4,11 +4,13 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:padding="16dp">
+	android:padding="0dp"
+	android:background="?attr/activityBackgroundColor">

 	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
 		android:id="@+id/toolbar"/>

 	<ScrollView
@@ -28,8 +30,8 @@
 				android:layout_height="wrap_content"
 				android:text="关于应用"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/buttonBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onAboutActivity"
@@ -40,8 +42,8 @@
 				android:layout_height="wrap_content"
 				android:text="应用崩溃测试"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/buttonBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onCrashTest"
@@ -52,8 +54,8 @@
 				android:layout_height="wrap_content"
 				android:text="应用日志测试"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/buttonBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onLogTest"
@@ -64,8 +66,8 @@
 				android:layout_height="wrap_content"
 				android:text="应用日志测试（新窗口）"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/buttonBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onLogTestNewTask"
@@ -76,32 +78,22 @@
 				android:layout_height="wrap_content"
 				android:text="应用吐司测试"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/buttonBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onToastUtilsTest"
 				android:layout_margin="10dp"/>

-			<Button
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="分屏测试"
-				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
-				android:paddingVertical="12dp"
-				android:layout_marginHorizontal="24dp"
-				android:onClick="onSplitScreenMode"
-				android:layout_margin="10dp"/>
+

 			<Button
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="多开窗口"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/buttonBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onMultiInstance"
--- a/appbase/src/main/res/layout/activity_main2.xml
+++ b/appbase/src/main/res/layout/activity_main2.xml
@@ -5,13 +5,13 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:gravity="center"
-	android:background="@android:color/white">
+	android:background="?attr/activityBackgroundColor">

 	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:text="Main2Activity"
 		android:textSize="24sp"
-		android:textColor="@color/gray_900"/>
+		android:textColor="?attr/activityTextColor"/>

 </LinearLayout>
--- a/appbase/src/main/res/values-night/colors.xml
+++ b/appbase/src/main/res/values-night/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#FF1B8B29</color>
+    <color name="colorPrimaryDark">#FF0A5520</color>
+    <color name="colorAccent">#FF6EE87C</color>
+    <color name="colorText">#FFB8FF7D</color>
+</resources>
--- a/appbase/src/main/res/values-night/styles.xml
+++ b/appbase/src/main/res/values-night/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="MyAPPBaseTheme" parent="APPBaseTheme">
+        <item name="themeGlobalCrashActivity">@style/MyGlobalCrashActivityTheme</item>
+    </style>
+
+    <style name="MyGlobalCrashActivityTheme" parent="GlobalCrashActivityTheme">
+        <item name="colorTittle">#FFFFFFFF</item>
+        <item name="colorTittleBackgound">#FF00A4B3</item>
+        <item name="colorText">#FFFFFFFF</item>
+        <item name="colorTextBackgound">#FFFFFFFF</item>
+	</style>
+</resources>
--- a/appbase/src/main/res/values/attrs.xml
+++ b/appbase/src/main/res/values/attrs.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<declare-styleable name="AboutView">
-        <attr name="app_name" format="string" />
-        <attr name="app_apkfoldername" format="string" />
-        <attr name="app_apkname" format="string" />
-        <attr name="app_gitname" format="string" />
-        <attr name="app_gitowner" format="string" />
-        <attr name="app_gitappbranch" format="string" />
-        <attr name="app_gitappsubprojectfolder" format="string" />
-        <attr name="appdescription" format="string" />
-        <attr name="appicon" format="reference" />
-        <attr name="is_adddebugtools" format="boolean" />
-    </declare-styleable>
-</resources>
--- a/appbase/src/main/res/values/strings.xml
+++ b/appbase/src/main/res/values/strings.xml
@@ -6,4 +6,5 @@
    <string name="app_debug">Click here is switch to APP DEBUG</string>
 	<string name="gitea_home">GITEA HOME</string>
    <string name="app_update">APP UPDATE</string>
+    <string name="shared_user_label">studio@winboll.cc</string>
 </resources>
--- a/build.gradle
+++ b/build.gradle
@@ -98,7 +98,6 @@ allprojects {
            options.compilerArgs << "-parameters"
            sourceCompatibility = JavaVersion.VERSION_11
            targetCompatibility = JavaVersion.VERSION_11
-            // 可选：确保编码一致
            options.encoding = "UTF-8"
        }
 	}
--- a/gpsrelaysentinel/README.md
+++ b/gpsrelaysentinel/README.md
@@ -1,117 +0,0 @@
-# GPSRelaySentinel
-
-## 介绍
-
-GPSRelaySentinel 是一款基于安卓平台的综合工具应用，集成 Termux 终端模拟器、二维码扫描、网络请求等功能。
-
-## 技术栈
-
- **编程语言**: Java 7（源码）
- **编译环境**: Java 11（Gradle 编译）
- **Gradle 插件**: 7.2.1
- **安卓 API**:
-  - 最低支持: API 26 (Android 8.0)
-  - 目标版本: API 30 (Android 11)
-  - 编译版本: API 30
-
-## 软件架构
-
-适配以下安卓开发环境的 Gradle 编译结构：
- AIDE Pro
- AndroidIDE
-
-## 模块说明
-
-本项目采用多模块结构：
- `gpsrelaysentinel` - 主应用模块
- `libappbase` - 基础库模块（提供 OkHttp、Gson、JSch 等基础能力）
- `libaes` - AES 加密库模块（提供权限请求、二维码、拼音搜索等扩展功能）
-
-## 核心依赖库
-
-### 网络相关
- 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 - 下拉刷新
-
-## Gradle 编译说明
-
-### 调试版编译
-```bash
-gradle assembleDebug
-```
-
-### 阶段版编译（发布）
-```bash
-bash .winboll/bashPublishAPKAddTag.sh gpsrelaysentinel
-```
-
-### 版本管理
-版本信息由 `gpsrelaysentinel/build.properties` 管理：
- `baseVersion` - 基础版本号
- `stageCount` - 阶段构建次数
- `publishVersion` - 发布版本号
- `buildCount` - 构建次数
-
-## 使用说明
-
-### Termux 应用配置
-
-1. 安装 Termux 应用（包名: `com.termux`）
-2. 配置允许外部应用访问：
-   ```bash
-   echo "allow-external-apps = true" > ~/.termux/termux.properties
-   ```
-
-### 权限说明
-
-应用需要以下权限：
- 网络访问权限
- 存储读写权限
- 相机权限（二维码扫描）
- 位置权限（GPS 相关功能）
-
-## 项目结构
-
-```
-gpsrelaysentinel/
-├── src/main/
-│   ├── java/          # Java 源码（Java 7 语法）
-│   ├── res/           # 资源文件
-│   ├── libs/          # 本地库文件（含 JNI 库）
-│   └── AndroidManifest.xml
-├── build.gradle       # 模块构建配置
-└── build.properties   # 版本配置文件
-```
-
-## 参与贡献
-
-1. Fork 本仓库
-2. 新建功能分支 (`git checkout -b feat_xxx`)
-3. 提交代码（作者: ZhanGSKen <zhangsken@188.com>）
-4. 新建 Pull Request
-
-## 许可证
-
-[待添加许可证信息]
-
-## 参考文档
-
- [Android Developer Documentation](https://developer.android.com/)
- [Termux Wiki](https://wiki.termux.com/)
- [Gradle User Manual](https://docs.gradle.org/)
--- a/gpsrelaysentinel/app_update_description.txt
+++ b/gpsrelaysentinel/app_update_description.txt
@@ -1 +0,0 @@
-
--- a/gpsrelaysentinel/build.gradle
+++ b/gpsrelaysentinel/build.gradle
@@ -1,126 +0,0 @@
-apply plugin: 'com.android.application'
-apply from: '../.winboll/winboll_app_build.gradle'
-apply from: '../.winboll/winboll_lint_build.gradle'
-
-def genVersionName(def versionName){
-    // 检查编译标志位配置
-    assert (winbollBuildProps['stageCount'] != null)
-    assert (winbollBuildProps['baseVersion'] != null)
-    // 保存基础版本号
-    winbollBuildProps.setProperty("baseVersion", "${versionName}");
-    //保存编译标志配置
-    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
-    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
-    fos.close();
-    
-    // 返回编译版本号
-    return "${versionName}." + winbollBuildProps['stageCount']
-}
-
-android {
-	// 适配MIUI12
-	compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-	
-    defaultConfig {
-        applicationId "cc.winboll.studio.gpsrelaysentinel"
-        minSdkVersion 26
-		// 适配MIUI12
-        targetSdkVersion 30
-        versionCode 1
-        // versionName 更新后需要手动设置 
-        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
-        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.11"
-        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(':libgpsrelaysentinel')
-    
-    api 'com.google.code.gson:gson:2.10.1'
-	
-	// 下拉控件
-    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
-    
-    // SSH
-    api 'com.jcraft:jsch:0.1.55'
-    // Html 解析
-    api 'org.jsoup:jsoup:1.13.1'
-    // 二维码类库
-    api 'com.google.zxing:core:3.4.1'
-    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'
-    //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 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
-     //注意：以下5个库必须要引入
-    //implementation 'androidx.appcompat:appcompat:1.4.1'
-    api 'androidx.recyclerview:recyclerview:1.0.0'
-    api 'com.google.code.gson:gson:2.8.5'
-    api 'com.github.bumptech.glide:glide:4.9.0'
-    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
-
-	implementation "androidx.annotation:annotation:1.3.0"
-    implementation "androidx.core:core:1.6.0"
-    implementation "androidx.drawerlayout:drawerlayout:1.1.1"
-    implementation "androidx.preference:preference:1.1.1"
-    implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "com.google.android.material:material:1.4.0"
-    implementation "com.google.guava:guava:24.1-jre"
-    /*
-	implementation "io.noties.markwon:core:$markwonVersion"
-    implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
-    implementation "io.noties.markwon:linkify:$markwonVersion"
-    implementation "io.noties.markwon:recycler:$markwonVersion"
-	*/
-	implementation 'com.termux:terminal-emulator:0.118.0'
-	implementation 'com.termux:terminal-view:0.118.0'
-	implementation 'com.termux:termux-shared:0.118.0'
-	
-	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.15.9'
-    api 'cc.winboll.studio:libappbase:15.15.21'
-	
-	// WinBoLL备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:AES:aes-v15.15.7'
-	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.4'
-	
-	api fileTree(dir: 'libs', include: ['*.jar'])
-}
--- a/gpsrelaysentinel/proguard-rules.pro
+++ b/gpsrelaysentinel/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
-
--- a/gpsrelaysentinel/src/beta/AndroidManifest.xml
+++ b/gpsrelaysentinel/src/beta/AndroidManifest.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
-
-    <application>
-
-        <!-- Put flavor specific code here -->
-
-    </application>
-
-</manifest>
-
--- a/gpsrelaysentinel/src/beta/res/values/strings.xml
+++ b/gpsrelaysentinel/src/beta/res/values/strings.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">GPSRelaySentinel★</string>
-
-</resources>
--- a/gpsrelaysentinel/src/main/AndroidManifest.xml
+++ b/gpsrelaysentinel/src/main/AndroidManifest.xml
@@ -1,60 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.gpsrelaysentinel">
-
-    <!-- 只能在前台获取精确的位置信息 -->
-    <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"/>
-
-    </application>
-
-</manifest>
--- a/gpsrelaysentinel/src/main/java/cc/winboll/studio/gpsrelaysentinel/App.java
+++ b/gpsrelaysentinel/src/main/java/cc/winboll/studio/gpsrelaysentinel/App.java
@@ -1,340 +0,0 @@
-package cc.winboll.studio.gpsrelaysentinel;
-
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.os.Bundle;
-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;
-import android.widget.HorizontalScrollView;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.ToastUtils;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class App extends GlobalApplication {
-
-    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
-		
-        //CrashHandler.getInstance().registerGlobal(this);
-        //CrashHandler.getInstance().registerPart(this);
-    }
-
-    public static void write(InputStream input, OutputStream output) throws IOException {
-        byte[] buf = new byte[1024 * 8];
-        int len;
-        while ((len = input.read(buf)) != -1) {
-            output.write(buf, 0, len);
-        }
-    }
-
-    public static void write(File file, byte[] data) throws IOException {
-        File parent = file.getParentFile();
-        if (parent != null && !parent.exists()) parent.mkdirs();
-
-        ByteArrayInputStream input = new ByteArrayInputStream(data);
-        FileOutputStream output = new FileOutputStream(file);
-        try {
-            write(input, output);
-        } finally {
-            closeIO(input, output);
-        }
-    }
-
-    public static String toString(InputStream input) throws IOException {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        write(input, output);
-        try {
-            return output.toString("UTF-8");
-        } finally {
-            closeIO(input, output);
-        }
-    }
-
-    public static void closeIO(Closeable... closeables) {
-        for (Closeable closeable : closeables) {
-            try {
-                if (closeable != null) closeable.close();
-            } catch (IOException ignored) {}
-        }
-    }
-
-    public static class CrashHandler {
-
-        public static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER = Thread.getDefaultUncaughtExceptionHandler();
-
-        private static CrashHandler sInstance;
-
-        private PartCrashHandler mPartCrashHandler;
-
-        public static CrashHandler getInstance() {
-            if (sInstance == null) {
-                sInstance = new CrashHandler();
-            }
-            return sInstance;
-        }
-
-        public void registerGlobal(Context context) {
-            registerGlobal(context, null);
-        }
-
-        public void registerGlobal(Context context, String crashDir) {
-            Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandlerImpl(context.getApplicationContext(), crashDir));
-        }
-
-        public void unregister() {
-            Thread.setDefaultUncaughtExceptionHandler(DEFAULT_UNCAUGHT_EXCEPTION_HANDLER);
-        }
-
-        public void registerPart(Context context) {
-            unregisterPart(context);
-            mPartCrashHandler = new PartCrashHandler(context.getApplicationContext());
-            MAIN_HANDLER.postAtFrontOfQueue(mPartCrashHandler);
-        }
-
-        public void unregisterPart(Context context) {
-            if (mPartCrashHandler != null) {
-                mPartCrashHandler.isRunning.set(false);
-                mPartCrashHandler = null;
-            }
-        }
-
-        private static class PartCrashHandler implements Runnable {
-
-            private final Context mContext;
-
-            public AtomicBoolean isRunning = new AtomicBoolean(true);
-
-            public PartCrashHandler(Context context) {
-                this.mContext = context;
-            }
-
-            @Override
-            public void run() {
-                while (isRunning.get()) {
-                    try {
-                        Looper.loop();
-                    } catch (final Throwable e) {
-                        e.printStackTrace();
-                        if (isRunning.get()) {
-                            MAIN_HANDLER.post(new Runnable(){
-
-                                    @Override
-                                    public void run() {
-                                        Toast.makeText(mContext, e.toString(), Toast.LENGTH_LONG).show();
-                                    }
-                                });
-                        } else {
-                            if (e instanceof RuntimeException) {
-                                throw (RuntimeException)e;
-                            } else {
-                                throw new RuntimeException(e);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private static class UncaughtExceptionHandlerImpl implements UncaughtExceptionHandler {
-
-            private static DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss");
-
-            private final Context mContext;
-
-            private final File mCrashDir;
-
-            public UncaughtExceptionHandlerImpl(Context context, String crashDir) {
-                this.mContext = context;
-                this.mCrashDir = TextUtils.isEmpty(crashDir) ? new File(mContext.getExternalCacheDir(), "crash") : new File(crashDir);
-            }
-
-            @Override
-            public void uncaughtException(Thread thread, Throwable throwable) {
-                try {
-
-                    String log = buildLog(throwable);
-                    writeLog(log);
-
-                    try {
-                        Intent intent = new Intent(mContext, CrashActivity.class);
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        intent.putExtra(Intent.EXTRA_TEXT, log);
-                        mContext.startActivity(intent);
-                    } catch (Throwable e) {
-                        e.printStackTrace();
-                        writeLog(e.toString());
-                    }
-
-                    throwable.printStackTrace();
-                    android.os.Process.killProcess(android.os.Process.myPid());
-                    System.exit(0);
-
-                } catch (Throwable e) {
-                    if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
-                }
-            }
-
-            private String buildLog(Throwable throwable) {
-                String time = DATE_FORMAT.format(new Date());
-
-                String versionName = "unknown";
-                long versionCode = 0;
-                try {
-                    PackageInfo packageInfo = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0);
-                    versionName = packageInfo.versionName;
-                    versionCode = Build.VERSION.SDK_INT >= 28 ? packageInfo.getLongVersionCode() : packageInfo.versionCode;
-                } catch (Throwable ignored) {}
-
-                LinkedHashMap<String, String> head = new LinkedHashMap<String, String>();
-                head.put("Time Of Crash", time);
-                head.put("Device", String.format("%s, %s", Build.MANUFACTURER, Build.MODEL));
-                head.put("Android Version", String.format("%s (%d)", Build.VERSION.RELEASE, Build.VERSION.SDK_INT));
-                head.put("App Version", String.format("%s (%d)", versionName, versionCode));
-                head.put("Kernel", getKernel());
-                head.put("Support Abis", Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_ABIS != null ? Arrays.toString(Build.SUPPORTED_ABIS): "unknown");
-                head.put("Fingerprint", Build.FINGERPRINT);
-
-                StringBuilder builder = new StringBuilder();
-
-                for (String key : head.keySet()) {
-                    if (builder.length() != 0) builder.append("\n");
-                    builder.append(key);
-                    builder.append(" :    ");
-                    builder.append(head.get(key));
-                }
-
-                builder.append("\n\n");
-                builder.append(Log.getStackTraceString(throwable));
-
-                return builder.toString(); 
-            }
-
-            private void writeLog(String log) {
-                String time = DATE_FORMAT.format(new Date());
-                File file = new File(mCrashDir, "crash_" + time + ".txt");
-                try {
-                    write(file, log.getBytes("UTF-8"));
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                } 
-            }
-
-            private static String getKernel() {
-                try {
-                    return App.toString(new FileInputStream("/proc/version")).trim();
-                } catch (Throwable e) {
-                    return e.getMessage();
-                }
-            }
-        }
-    }
-
-    public static final class CrashActivity extends Activity {
-
-        private String mLog;
-
-        @Override
-        protected void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            setTheme(android.R.style.Theme_DeviceDefault);
-            setTitle("App Crash");
-
-            mLog = getIntent().getStringExtra(Intent.EXTRA_TEXT);
-
-            ScrollView contentView = new ScrollView(this);
-            contentView.setFillViewport(true);
-
-            HorizontalScrollView horizontalScrollView = new HorizontalScrollView(this);
-
-            TextView textView = new TextView(this);
-            int padding = dp2px(16);
-            textView.setPadding(padding, padding, padding, padding);
-            textView.setText(mLog);
-            textView.setTextIsSelectable(true);
-            textView.setTypeface(Typeface.DEFAULT);
-            textView.setLinksClickable(true);
-
-            horizontalScrollView.addView(textView);
-            contentView.addView(horizontalScrollView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-
-            setContentView(contentView);
-        }
-
-        private void restart() {
-            Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
-            if (intent != null) {
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                startActivity(intent);
-            }
-            finish();
-            android.os.Process.killProcess(android.os.Process.myPid());
-            System.exit(0);
-        }
-
-        private static int dp2px(float dpValue) {
-            final float scale = Resources.getSystem().getDisplayMetrics().density;
-            return (int) (dpValue * scale + 0.5f);
-        }
-
-        @Override
-        public boolean onCreateOptionsMenu(Menu menu) {
-            menu.add(0, android.R.id.copy, 0, android.R.string.copy)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            return super.onCreateOptionsMenu(menu);
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            switch (item.getItemId()) {
-                case android.R.id.copy:
-                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
-                    return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
-
-        @Override
-        public void onBackPressed() {
-            restart();
-        }
-    }
-}
--- a/gpsrelaysentinel/src/main/java/cc/winboll/studio/gpsrelaysentinel/GpsReceiverChildService1.java
+++ b/gpsrelaysentinel/src/main/java/cc/winboll/studio/gpsrelaysentinel/GpsReceiverChildService1.java
@@ -1,27 +0,0 @@
-package cc.winboll.studio.gpsrelaysentinel;
-
-import android.content.Intent;
-
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgpsrelaysentinel.model.LocationPoint;
-import cc.winboll.studio.libgpsrelaysentinel.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) {
-        return START_NOT_STICKY;
-    }
-}
-
--- a/gpsrelaysentinel/src/main/java/cc/winboll/studio/gpsrelaysentinel/GpsReceiverChildService2.java
+++ b/gpsrelaysentinel/src/main/java/cc/winboll/studio/gpsrelaysentinel/GpsReceiverChildService2.java
@@ -1,26 +0,0 @@
-package cc.winboll.studio.gpsrelaysentinel;
-
-import android.content.Intent;
-
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgpsrelaysentinel.model.LocationPoint;
-import cc.winboll.studio.libgpsrelaysentinel.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) {
-        return START_NOT_STICKY;
-    }
-}
-
--- a/gpsrelaysentinel/src/main/java/cc/winboll/studio/gpsrelaysentinel/GpsReceiverChildService3.java
+++ b/gpsrelaysentinel/src/main/java/cc/winboll/studio/gpsrelaysentinel/GpsReceiverChildService3.java
@@ -1,26 +0,0 @@
-package cc.winboll.studio.gpsrelaysentinel;
-
-import android.content.Intent;
-
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgpsrelaysentinel.model.LocationPoint;
-import cc.winboll.studio.libgpsrelaysentinel.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) {
-        return START_NOT_STICKY;
-    }
-}
-
--- a/gpsrelaysentinel/src/main/java/cc/winboll/studio/gpsrelaysentinel/MainActivity.java
+++ b/gpsrelaysentinel/src/main/java/cc/winboll/studio/gpsrelaysentinel/MainActivity.java
@@ -1,358 +0,0 @@
-package cc.winboll.studio.gpsrelaysentinel;
-
-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 androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.gpsrelaysentinel.R;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.ToastUtils;
-
-/**
- * WinBoLL Studio
- * GPSRelaySentinel 主控制页面
- * Java7 | API26~30
- * 新增：模拟模式勾选控制 + 按钮互斥可用状态
- */
-public final class MainActivity extends AppCompatActivity {
-
-    //原有控件
-    private Toolbar mToolbar;
-    private LogView mLogView;
-    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);
-        mLogView = findViewById(R.id.logview);
-        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);
-    }
-
-    /**
-     * 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();
-					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);
-            }
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-}
-
--- a/gpsrelaysentinel/src/main/java/cc/winboll/studio/gpsrelaysentinel/MainService.java
+++ b/gpsrelaysentinel/src/main/java/cc/winboll/studio/gpsrelaysentinel/MainService.java
@@ -1,269 +0,0 @@
-package cc.winboll.studio.gpsrelaysentinel;
-
-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.libgpsrelaysentinel.manager.GpsSubscribeManager;
-import cc.winboll.studio.libgpsrelaysentinel.manager.SubscribeLocationManager;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeMsg;
-
-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();
-        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);
-
-        //遍历全部订阅者进行推送规则判断
-        Map<String, GpsSubscribeMsg> subscribeAllMap = mSubscribeManager.getSubscribeMap();
-        for (Map.Entry<String, GpsSubscribeMsg> entry : subscribeAllMap.entrySet()) {
-            final String subscribeSid = entry.getKey();
-            final GpsSubscribeMsg subscribeConfig = entry.getValue();
-
-            double currentLat = location.getLatitude();
-            double currentLng = location.getLongitude();
-
-            //判断是否满足推送条件(全订阅/步长阈值)
-            boolean allowPush = mLocationRuleManager.isNeedPush(subscribeSid, currentLat, currentLng);
-            if (allowPush) {
-                //推送成功后刷新该订阅者基准定点坐标
-                mLocationRuleManager.updateSubscriberPoint(subscribeSid, currentLat, currentLng);
-            }
-        }
-    }
-
-    /**
-     * 创建系统通知渠道
-     */
-    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监听已停止");
-    }
-}
-
--- a/gpsrelaysentinel/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/gpsrelaysentinel/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>
--- a/gpsrelaysentinel/src/main/res/drawable/border_gray.xml
+++ b/gpsrelaysentinel/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>
-
--- a/gpsrelaysentinel/src/main/res/drawable/ic_launcher_background.xml
+++ b/gpsrelaysentinel/src/main/res/drawable/ic_launcher_background.xml
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillColor="#26A69A"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-</vector>
--- a/gpsrelaysentinel/src/main/res/layout/activity_main.xml
+++ b/gpsrelaysentinel/src/main/res/layout/activity_main.xml
@@ -1,198 +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.libgpsrelaysentinel.view.GpsSubscribeControlView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="10dp"
-				android:background="@drawable/border_gray"/>
-
-			<cc.winboll.studio.libgpsrelaysentinel.view.GpsSubscribeControlView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="10dp"
-				android:background="@drawable/border_gray"/>
-
-			<cc.winboll.studio.libgpsrelaysentinel.view.GpsSubscribeControlView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="10dp"
-				android:background="@drawable/border_gray"/>
-
-		</LinearLayout>
-
-	</ScrollView>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="200dp"
-		android:orientation="vertical"
-		android:id="@+id/container_log_show"
-		android:background="@drawable/border_gray">
-
-		<cc.winboll.studio.libappbase.LogView
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:id="@+id/logview"/>
-
-	</LinearLayout>
-
-</LinearLayout>
-
--- a/gpsrelaysentinel/src/main/res/layout/spinner_item_gray.xml
+++ b/gpsrelaysentinel/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"/>
-
--- a/gpsrelaysentinel/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/gpsrelaysentinel/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
--- a/gpsrelaysentinel/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/gpsrelaysentinel/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
--- a/gpsrelaysentinel/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/gpsrelaysentinel/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/gpsrelaysentinel/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/gpsrelaysentinel/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/gpsrelaysentinel/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/gpsrelaysentinel/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/gpsrelaysentinel/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/gpsrelaysentinel/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/gpsrelaysentinel/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/gpsrelaysentinel/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/gpsrelaysentinel/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/gpsrelaysentinel/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/gpsrelaysentinel/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/gpsrelaysentinel/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/gpsrelaysentinel/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/gpsrelaysentinel/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/gpsrelaysentinel/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/gpsrelaysentinel/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/gpsrelaysentinel/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/gpsrelaysentinel/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/gpsrelaysentinel/src/main/res/values/arrays.xml
+++ b/gpsrelaysentinel/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>
-
--- a/gpsrelaysentinel/src/main/res/values/colors.xml
+++ b/gpsrelaysentinel/src/main/res/values/colors.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#009688</color>
-    <color name="colorPrimaryDark">#00796B</color>
-    <color name="colorAccent">#FF9800</color>
-</resources>
--- a/gpsrelaysentinel/src/main/res/values/strings.xml
+++ b/gpsrelaysentinel/src/main/res/values/strings.xml
@@ -1,4 +0,0 @@
-<resources>
-    <string name="app_name">GPSRelaySentinel</string>
-    
-</resources>
--- a/gpsrelaysentinel/src/main/res/values/styles.xml
+++ b/gpsrelaysentinel/src/main/res/values/styles.xml
@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>
--- a/gpsrelaysentinel/src/stage/res/values/strings.xml
+++ b/gpsrelaysentinel/src/stage/res/values/strings.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Put flavor specific strings here -->
-
-</resources>
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -9,7 +9,7 @@ android {
    buildToolsVersion "30.0.3"

    defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
        targetSdkVersion 30
    }
    buildTypes {
@@ -18,6 +18,10 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
+     compileOptions {
+         sourceCompatibility JavaVersion.VERSION_1_7
+         targetCompatibility JavaVersion.VERSION_1_7
+     }
 }

 dependencies {
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 28 17:08:04 HKT 2026
-stageCount=22
+#Sun May 10 13:24:08 HKT 2026
+stageCount=1
 libraryProject=libappbase
-baseVersion=15.15
-publishVersion=15.15.21
+baseVersion=15.20
+publishVersion=15.20.0
 buildCount=0
-baseBetaVersion=15.15.22
+baseBetaVersion=15.20.1
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java
@@ -440,6 +440,9 @@ public final class CrashHandler {
 			// 设置系统默认主题（避免自定义主题冲突）
 			setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);

+			// 判断是否为深色模式
+			boolean isNightMode = (getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
+
 			// 动态创建布局（避免 XML 布局加载异常）
 			setContentView: {
 				// 垂直滚动视图（处理日志过长）
@@ -448,7 +451,7 @@ public final class CrashHandler {

 				// 水平滚动视图（处理日志行过长）
 				HorizontalScrollView hw = new HorizontalScrollView(this);
-				hw.setBackgroundColor(Color.GRAY); // 背景色设为灰色
+				hw.setBackgroundColor(isNightMode ? 0xFF0D1B2A : 0xFFF5F5F5); // 深色模式灰色背景

 				// 日志显示文本框
 				TextView message = new TextView(this);
@@ -456,7 +459,7 @@ public final class CrashHandler {
 					int padding = dp2px(16); // 内边距 16dp（适配不同屏幕）
 					message.setPadding(padding, padding, padding, padding);
 					message.setText(mLog); // 设置崩溃日志
-					message.setTextColor(Color.BLACK); // 文字黑色
+					message.setTextColor(isNightMode ? 0xFFE0E0E0 : 0xFF000000); // 深色模式灰色文字，普通模式黑色文字
 					message.setTextIsSelectable(true); // 支持文本选择（便于手动复制）
 				}

--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
@@ -9,6 +9,7 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.Toast;
 import cc.winboll.studio.libappbase.R;

--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
@@ -175,8 +175,8 @@ public class GlobalCrashReportView extends LinearLayout {
 	 * 初始化默认配置（无自定义属性时使用）
 	 */
 	private void initDefaultConfig() {
-		// 设置默认配色
-		mTitleColor = Color.WHITE;
+		// 设置默认配色（普通模式黑色文字）
+		mTitleColor = Color.BLACK;
 		mTitleBackgroundColor = Color.BLACK;
 		mTextColor = Color.BLACK;
 		mTextBackgroundColor = Color.WHITE;
@@ -202,7 +202,7 @@ public class GlobalCrashReportView extends LinearLayout {
 		// 读取自定义属性值（无设置时使用默认值）
 		mTitleColor = typedArray.getColor(
 			R.styleable.GlobalCrashActivity_colorTittle,
-			Color.WHITE
+			Color.BLACK
 		);
 		mTitleBackgroundColor = typedArray.getColor(
 			R.styleable.GlobalCrashActivity_colorTittleBackgound, // 注：原拼写错误（Backgound→Background），保持与 attrs.xml 一致
@@ -241,12 +241,8 @@ public class GlobalCrashReportView extends LinearLayout {
 	 * 初始化控件样式（设置配色和基础属性）
 	 */
 	private void initWidgetStyle() {
-		// 设置主布局背景颜色
-		setBackgroundColor(mTextBackgroundColor);
-
 		// 配置工具栏样式
 		if (mToolbar != null) {
-			mToolbar.setBackgroundColor(mTitleBackgroundColor);
 			mToolbar.setTitleTextColor(mTitleColor);
 			mToolbar.setSubtitleTextColor(mTitleColor);
 		}
@@ -254,8 +250,6 @@ public class GlobalCrashReportView extends LinearLayout {
 		// 配置日志文本控件样式
 		if (mTvReport != null) {
 			mTvReport.setTextColor(mTextColor);
-			mTvReport.setBackgroundColor(mTextBackgroundColor);
-			// 可选：设置日志文本换行方式（默认已换行，此处增强可读性）
 			mTvReport.setSingleLine(false);
 			mTvReport.setHorizontallyScrolling(false);
 		}
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/BackupUtils.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/BackupUtils.java
@@ -62,11 +62,11 @@ public class BackupUtils {

        // 核心修改：入参Map非空且非空集合时，使用入参初始化；否则内部new HashMap()
        this.mDataDirFileMap = (dataDirFileMap != null && !dataDirFileMap.isEmpty()) 
-			? new HashMap<>(dataDirFileMap) // 新建Map避免外部篡改内部数据
-			: new HashMap<>();
+			? new HashMap<String, String>(dataDirFileMap)
+			: new HashMap<String, String>();
        this.mSdcardFileMap = (sdcardFileMap != null && !sdcardFileMap.isEmpty())
-			? new HashMap<>(sdcardFileMap) // 深拷贝，隔离外部引用
-			: new HashMap<>();
+			? new HashMap<String, String>(sdcardFileMap)
+			: new HashMap<String, String>();

        LogUtils.d(TAG, "BackupUtils初始化完成 → SFTP服务器：" + ftpAuthModel.getFtpServer() + ":" + ftpAuthModel.getFtpPort() + " | 上传目录：" + mFtpTargetDir);
        LogUtils.d(TAG, "SDCard Map基础根目录：" + (mAppExternalFilesDir == null ? "获取失败" : mAppExternalFilesDir.getAbsolutePath()));
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java
@@ -421,9 +421,10 @@ public class AboutView extends LinearLayout {
         */
        private android.graphics.drawable.Drawable create_item_background() {
            android.graphics.drawable.GradientDrawable drawable = new android.graphics.drawable.GradientDrawable();
-            drawable.setStroke(1, mItemContext.getResources().getColor(R.color.gray_200));
+            drawable.setStroke(1, mItemContext.getResources().getColor(R.color.gray_300));
            drawable.setCornerRadius(4);
-            drawable.setColor(mItemContext.getResources().getColor(android.R.color.white));
+            boolean isNightMode = (mItemContext.getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
+            drawable.setColor(isNightMode ? mItemContext.getResources().getColor(R.color.gray_800) : mItemContext.getResources().getColor(android.R.color.white));
            return drawable;
        }

@@ -449,7 +450,8 @@ public class AboutView extends LinearLayout {
            TextView tvTitle = new TextView(mItemContext);
            tvTitle.setText(mTitle);
            tvTitle.setTextSize(16);
-            tvTitle.setTextColor(mItemContext.getResources().getColor(R.color.gray_900));
+            boolean isNightMode = (mItemContext.getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
+            tvTitle.setTextColor(isNightMode ? mItemContext.getResources().getColor(R.color.gray_500) : mItemContext.getResources().getColor(R.color.gray_900));
            llText.addView(tvTitle);
            // 内容
            TextView tvContent = new TextView(mItemContext);
--- a/libappbase/src/main/res/layout-night/activity_about.xml
+++ b/libappbase/src/main/res/layout-night/activity_about.xml
@@ -0,0 +1,22 @@
+<?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:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">
+
+	<android.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
+		android:id="@+id/toolbar"/>
+
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:id="@+id/aboutviewroot_ll"/>
+</LinearLayout>
--- a/libappbase/src/main/res/layout-night/activity_globalcrash.xml
+++ b/libappbase/src/main/res/layout-night/activity_globalcrash.xml
@@ -0,0 +1,16 @@
+<?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:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">>
+
+	<cc.winboll.studio.libappbase.GlobalCrashReportView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:id="@+id/activityglobalcrashGlobalCrashReportView1"/>
+
+</LinearLayout>
+
--- a/libappbase/src/main/res/layout-night/activity_log.xml
+++ b/libappbase/src/main/res/layout-night/activity_log.xml
@@ -0,0 +1,15 @@
+<?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:background="?attr/activityBackgroundColor">
+
+	<cc.winboll.studio.libappbase.LogView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:id="@+id/logview"/>
+
+</LinearLayout>
+
--- a/libappbase/src/main/res/layout-night/activity_nfc_rsa_operate.xml
+++ b/libappbase/src/main/res/layout-night/activity_nfc_rsa_operate.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="24dp"
+    android:gravity="center_horizontal"
+    android:background="?attr/activityBackgroundColor">
+
+    <!-- NFC状态提示文本 -->
+    <TextView
+        android:id="@+id/tv_nfc_state"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="正在监听NFC卡片，请贴近设备检测密钥..."
+        android:textSize="17sp"
+        android:textColor="?attr/activityTextColor"
+        android:gravity="center"
+        android:padding="12dp"
+        android:layout_marginBottom="30dp"/>
+
+    <!-- 私钥显示区域 -->
+    <TextView
+        android:id="@+id/tv_private_key"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="私钥内容：无"
+        android:textSize="14sp"
+        android:textColor="?attr/activityTextColor"
+        android:layout_marginBottom="12dp"
+        android:maxLines="5"
+        android:ellipsize="end"/>
+
+    <!-- 公钥显示区域 -->
+    <TextView
+        android:id="@+id/tv_public_key"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="公钥内容：无"
+        android:textSize="14sp"
+        android:textColor="?attr/activityTextColor"
+        android:layout_marginBottom="40dp"
+        android:maxLines="5"
+        android:ellipsize="end"/>
+
+    <!-- 核心功能按钮（复用：保存本地/初始化密钥） -->
+    <Button
+        android:id="@+id/btn_create_write_key"
+        android:layout_width="300dp"
+        android:layout_height="wrap_content"
+        android:text="功能按钮待激活"
+        android:textSize="16sp"
+        android:textColor="?attr/buttonTextColor"
+        android:backgroundTint="?attr/buttonBackgroundColor"
+        android:padding="14dp"
+        android:enabled="false"/>
+
+</LinearLayout>
--- a/libappbase/src/main/res/layout-night/dialog_sign_get.xml
+++ b/libappbase/src/main/res/layout-night/dialog_sign_get.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:padding="16dp"
+	android:gravity="center"
+	android:background="?attr/dialogBackgroundColor">
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="应用指纹校验"
+		android:textSize="16sp"
+		android:textColor="?attr/dialogTextColor"
+		android:textStyle="bold"
+		android:layout_marginBottom="12dp"/>
+
+	<ScrollView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content">
+
+		<EditText
+			android:id="@+id/et_sign_fingerprint"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:background="@android:drawable/edit_text"
+			android:textSize="12sp"
+			android:gravity="top"
+			android:hint="签名获取中..."
+			android:singleLine="false"
+			android:scrollHorizontally="false"
+			android:scrollbars="vertical"
+			android:overScrollMode="always"
+			android:typeface="monospace"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"/>
+
+	</ScrollView>
+
+	<TextView
+		android:id="@+id/tv_auth_result"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="12dp"
+		android:textSize="11sp"
+		android:gravity="center"
+		android:textColor="?attr/dialogTextColor"/>/>
+
+</LinearLayout>
+
--- a/libappbase/src/main/res/layout-night/dialog_winboll_host.xml
+++ b/libappbase/src/main/res/layout-night/dialog_winboll_host.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp"
+    android:background="?attr/dialogBackgroundColor">
+
+    <!-- 标题 -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="设置服务器地址"
+        android:textSize="16sp"
+        android:textColor="?attr/dialogTextColor"
+        android:textStyle="bold"
+        android:layout_marginBottom="16dp"/>
+
+    <!-- 地址输入框 -->
+    <EditText
+        android:id="@+id/et_host_input"
+        android:layout_width="300dp"
+        android:layout_height="wrap_content"
+        android:hint="请输入服务器地址（如http://localhost:8080）"
+        android:textSize="14sp"
+        android:textColor="?attr/dialogTextColor"
+        android:inputType="textUri"
+        android:padding="8dp"
+        android:background="@android:drawable/edit_text"
+        android:layout_marginBottom="16dp"/>
+
+    <!-- 按钮容器 -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="end">
+
+        <!-- 取消按钮 -->
+        <Button
+            android:id="@+id/btn_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="取消"
+            android:textSize="14sp"
+            android:textColor="?attr/dialogTextColor"
+            android:layout_marginRight="8dp"/>
+
+        <!-- 确认按钮 -->
+        <Button
+            android:id="@+id/btn_confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="确认"
+            android:textSize="14sp"
+            android:backgroundTint="?attr/buttonBackgroundColor"
+            android:textColor="?attr/buttonTextColor"/>
+
+    </LinearLayout>
+
+</LinearLayout>
+
--- a/libappbase/src/main/res/layout-night/item_logtag.xml
+++ b/libappbase/src/main/res/layout-night/item_logtag.xml
@@ -0,0 +1,24 @@
+<?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:orientation="horizontal"
+	android:layout_width="wrap_content"
+	android:layout_height="match_parent"
+	android:background="@drawable/bg_border_round">
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="@dimen/log_button_height"
+		android:textSize="@dimen/log_text_size"
+		android:layout_marginLeft="5dp"
+		android:id="@+id/viewlogtagTextView1"/>
+
+	<CheckBox
+		android:layout_width="wrap_content"
+		android:layout_height="@dimen/log_button_height"
+		android:textSize="@dimen/log_text_size"
+		android:id="@+id/viewlogtagCheckBox1"/>
+
+</LinearLayout>
+
--- a/libappbase/src/main/res/layout-night/layout_about_view.xml
+++ b/libappbase/src/main/res/layout-night/layout_about_view.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/aboutViewBackgroundColor">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:gravity="center_horizontal"
+		android:paddingLeft="16dp"
+		android:paddingTop="16dp"
+		android:paddingRight="16dp"
+		android:paddingBottom="16dp">
+
+		<cc.winboll.studio.libappbase.views.DebugSwitchImageView
+			android:id="@+id/iv_app_icon"
+			android:layout_width="48dp"
+			android:layout_height="48dp"
+			android:layout_marginBottom="8dp"
+			android:scaleType="centerCrop"/>
+
+		<TextView
+			android:id="@+id/tv_app_name_version"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:textColor="?attr/aboutViewTitleColor"/>
+
+		<TextView
+			android:id="@+id/tv_app_desc"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="4dp"
+			android:layout_marginBottom="8dp"
+			android:textSize="14sp"
+			android:textColor="?attr/aboutViewTextColor"/>
+
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="1px"
+			android:layout_marginTop="4dp"
+			android:layout_marginBottom="8dp"
+			android:background="?attr/aboutViewDividerColor"/>
+
+		<LinearLayout
+			android:id="@+id/ll_function_container"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"/>
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:layout_marginTop="8dp"
+			android:spacing="20dp">
+
+			<ImageButton
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:src="@drawable/ic_debug_step_over"
+				android:id="@+id/ib_debug_step_over"
+				android:scaleType="fitCenter"
+				android:adjustViewBounds="true"
+				android:background="@null"/>
+
+			<ImageButton
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:src="@drawable/ic_winboll"
+				android:id="@+id/ib_winbollhostdialog"
+				android:scaleType="fitCenter"
+				android:adjustViewBounds="true"
+				android:background="@null"/>
+
+			<ImageButton
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:src="@drawable/ic_key"
+				android:id="@+id/ib_signgetdialog"
+				android:scaleType="fitCenter"
+				android:adjustViewBounds="true"
+				android:background="@null"/>
+
+		</LinearLayout>
+
+	</LinearLayout>
+</ScrollView>
+
--- a/libappbase/src/main/res/layout-night/view_globalcrashreport.xml
+++ b/libappbase/src/main/res/layout-night/view_globalcrashreport.xml
@@ -0,0 +1,39 @@
+<?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:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor"
+	android:id="@+id/viewglobalcrashreportLinearLayout1">
+
+    <android.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
+		android:id="@+id/viewglobalcrashreportToolbar1"/>
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:fillViewport="true">
+
+		<HorizontalScrollView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:padding="16dp"
+				android:textColor="?attr/activityTextColor"
+				android:id="@+id/viewglobalcrashreportTextView1"/>
+
+		</HorizontalScrollView>
+
+	</ScrollView>
+
+</LinearLayout>
+
--- a/libappbase/src/main/res/layout-night/view_log.xml
+++ b/libappbase/src/main/res/layout-night/view_log.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">
+
+	<RelativeLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="34dp"
+		android:layout_alignParentTop="true"
+		android:background="?attr/toolbarBackgroundColor"
+		android:id="@+id/viewlogRelativeLayoutToolbar">
+
+		<Button
+			android:layout_width="@dimen/log_button_width"
+			android:layout_height="@dimen/log_button_height"
+			android:textSize="@dimen/log_text_size"
+			android:text="Clean"
+			android:textColor="?attr/buttonTextColor"
+			android:backgroundTint="?attr/buttonBackgroundColor"
+			android:layout_centerVertical="true"
+			android:id="@+id/viewlogButtonClean"
+			android:layout_marginLeft="5dp"/>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="20dp"
+			android:textSize="@dimen/log_text_size"
+			android:padding="@dimen/log_text_padding"
+			android:text="LV:"
+			android:layout_toRightOf="@+id/viewlogButtonClean"
+			android:layout_centerVertical="true"
+			android:id="@+id/viewlogTextView1"
+			android:background="?attr/buttonBackgroundColor"
+			android:textColor="?attr/buttonTextColor"/>
+
+		<cc.winboll.studio.libappbase.widget.LogTagSpinner
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@+id/viewlogTextView1"
+			android:layout_centerVertical="true"
+			android:id="@+id/viewlogSpinner1"
+			android:padding="@dimen/log_spinner_text_padding"/>
+
+		<CheckBox
+			android:layout_width="@dimen/log_checkbox_width"
+			android:layout_height="@dimen/log_checkbox_height"
+			android:textSize="@dimen/log_text_size"
+			android:layout_toLeftOf="@+id/viewlogButtonCopy"
+			android:layout_centerVertical="true"
+			android:text="Selectable"
+			android:background="?attr/buttonBackgroundColor"
+			android:id="@+id/viewlogCheckBoxSelectable"
+			android:padding="@dimen/log_text_padding"
+			android:textColor="?attr/buttonTextColor"/>
+
+		<Button
+			android:layout_width="@dimen/log_button_width"
+			android:layout_height="@dimen/log_button_height"
+			android:textSize="@dimen/log_text_size"
+			android:textColor="?attr/buttonTextColor"
+			android:backgroundTint="?attr/buttonBackgroundColor"
+			android:text="Copy"
+			android:layout_alignParentRight="true"
+			android:layout_centerVertical="true"
+			android:id="@+id/viewlogButtonCopy"
+			android:layout_marginRight="5dp"/>
+
+	</RelativeLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/log_button_height"
+		android:layout_below="@+id/viewlogRelativeLayoutToolbar"
+		android:id="@+id/viewlogLinearLayout1"
+		android:gravity="center_vertical"
+		android:background="?attr/toolbarBackgroundColor">
+
+		<CheckBox
+			android:layout_width="wrap_content"
+			android:layout_height="@dimen/log_button_height"
+			android:textSize="@dimen/log_text_size"
+			android:text="ALL"
+			android:padding="2dp"
+			android:id="@+id/viewlogCheckBox1"
+			android:background="?attr/buttonBackgroundColor"
+			android:textColor="?attr/buttonTextColor"
+			android:layout_marginLeft="5dp"
+			android:layout_marginRight="5dp"/>
+
+		<EditText
+			android:layout_width="50dp"
+			android:ems="10"
+			android:layout_height="@dimen/log_button_height"
+			android:textSize="@dimen/log_text_size"
+			android:textColor="?attr/activityTextColor"
+			android:background="?attr/buttonBackgroundColor"
+			android:singleLine="true"
+			android:id="@+id/tagsearch_et"/>
+
+		<HorizontalScrollView
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:background="?attr/buttonBackgroundColor"
+			android:scrollbars="none"
+			android:padding="2dp"
+			android:layout_weight="1.0"
+			android:id="@+id/viewlogHorizontalScrollView1">
+
+			<cc.winboll.studio.libappbase.views.HorizontalListView
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/tags_listview"/>
+
+		</HorizontalScrollView>
+
+	</LinearLayout>
+
+	<RelativeLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1.0"
+		android:layout_alignParentBottom="true"
+		android:layout_below="@+id/viewlogLinearLayout1">
+
+		<ScrollView
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:background="?attr/activityBackgroundColor"
+			android:id="@+id/viewlogScrollViewLog">
+
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:textSize="@dimen/log_text_size"
+				android:text="Text"
+				android:textColor="#FF00FF00"
+				android:textIsSelectable="true"
+				android:id="@+id/viewlogTextViewLog"/>
+
+		</ScrollView>
+
+	</RelativeLayout>
+
+</RelativeLayout>
--- a/libappbase/src/main/res/layout/activity_about.xml
+++ b/libappbase/src/main/res/layout/activity_about.xml
@@ -4,11 +4,13 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">

 	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
 		android:id="@+id/toolbar"/>

 	<LinearLayout
--- a/libappbase/src/main/res/layout/activity_globalcrash.xml
+++ b/libappbase/src/main/res/layout/activity_globalcrash.xml
@@ -4,7 +4,8 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
    android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">>

 	<cc.winboll.studio.libappbase.GlobalCrashReportView
 		android:layout_width="match_parent"
--- a/libappbase/src/main/res/layout/activity_log.xml
+++ b/libappbase/src/main/res/layout/activity_log.xml
@@ -3,7 +3,8 @@
 	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:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">

 	<cc.winboll.studio.libappbase.LogView
 		android:layout_width="match_parent"
--- a/libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml
+++ b/libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml
@@ -5,7 +5,7 @@
    android:orientation="vertical"
    android:padding="24dp"
    android:gravity="center_horizontal"
-    android:background="@android:color/white">
+    android:background="?attr/activityBackgroundColor">

    <!-- NFC状态提示文本 -->
    <TextView
@@ -14,7 +14,7 @@
        android:layout_height="wrap_content"
        android:text="正在监听NFC卡片，请贴近设备检测密钥..."
        android:textSize="17sp"
-        android:textColor="@android:color/black"
+        android:textColor="?attr/activityTextColor"
        android:gravity="center"
        android:padding="12dp"
        android:layout_marginBottom="30dp"/>
@@ -26,7 +26,7 @@
        android:layout_height="wrap_content"
        android:text="私钥内容：无"
        android:textSize="14sp"
-        android:textColor="@android:color/darker_gray"
+        android:textColor="?attr/activityTextColor"
        android:layout_marginBottom="12dp"
        android:maxLines="5"
        android:ellipsize="end"/>
@@ -38,7 +38,7 @@
        android:layout_height="wrap_content"
        android:text="公钥内容：无"
        android:textSize="14sp"
-        android:textColor="@android:color/darker_gray"
+        android:textColor="?attr/activityTextColor"
        android:layout_marginBottom="40dp"
        android:maxLines="5"
        android:ellipsize="end"/>
@@ -50,10 +50,9 @@
        android:layout_height="wrap_content"
        android:text="功能按钮待激活"
        android:textSize="16sp"
-        android:textColor="@android:color/white"
-        android:backgroundTint="@android:color/holo_blue_light"
+        android:textColor="?attr/buttonTextColor"
+        android:backgroundTint="?attr/buttonBackgroundColor"
        android:padding="14dp"
        android:enabled="false"/>

-</LinearLayout>
-
+</LinearLayout>
--- a/libappbase/src/main/res/layout/dialog_sign_get.xml
+++ b/libappbase/src/main/res/layout/dialog_sign_get.xml
@@ -6,14 +6,14 @@
 	android:orientation="vertical"
 	android:padding="16dp"
 	android:gravity="center"
-	android:background="#FFDCDCDC">
+	android:background="?attr/dialogBackgroundColor">

 	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:text="应用指纹校验"
 		android:textSize="16sp"
-		android:textColor="@color/gray_900"
+		android:textColor="?attr/dialogTextColor"
 		android:textStyle="bold"
 		android:layout_marginBottom="12dp"/>

@@ -46,7 +46,7 @@
 		android:layout_marginTop="12dp"
 		android:textSize="11sp"
 		android:gravity="center"
-		android:textColor="@color/gray_900"/>
+		android:textColor="?attr/dialogTextColor"/>/>

 </LinearLayout>

--- a/libappbase/src/main/res/layout/dialog_winboll_host.xml
+++ b/libappbase/src/main/res/layout/dialog_winboll_host.xml
@@ -4,7 +4,7 @@
    android:layout_height="wrap_content"
    android:orientation="vertical"
    android:padding="16dp"
-    android:background="#FFFFFF">
+    android:background="?attr/dialogBackgroundColor">

    <!-- 标题 -->
    <TextView
@@ -12,7 +12,7 @@
        android:layout_height="wrap_content"
        android:text="设置服务器地址"
        android:textSize="16sp"
-        android:textColor="#212121"
+        android:textColor="?attr/dialogTextColor"
        android:textStyle="bold"
        android:layout_marginBottom="16dp"/>

@@ -23,6 +23,7 @@
        android:layout_height="wrap_content"
        android:hint="请输入服务器地址（如http://localhost:8080）"
        android:textSize="14sp"
+        android:textColor="?attr/dialogTextColor"
        android:inputType="textUri"
        android:padding="8dp"
        android:background="@android:drawable/edit_text"
@@ -42,6 +43,7 @@
            android:layout_height="wrap_content"
            android:text="取消"
            android:textSize="14sp"
+            android:textColor="?attr/dialogTextColor"
            android:layout_marginRight="8dp"/>

        <!-- 确认按钮 -->
@@ -51,8 +53,8 @@
            android:layout_height="wrap_content"
            android:text="确认"
            android:textSize="14sp"
-            android:backgroundTint="#2196F3"
-            android:textColor="#FFFFFF"/>
+            android:backgroundTint="?attr/buttonBackgroundColor"
+            android:textColor="?attr/buttonTextColor"/>

    </LinearLayout>

--- a/libappbase/src/main/res/layout/layout_about_view.xml
+++ b/libappbase/src/main/res/layout/layout_about_view.xml
@@ -2,7 +2,8 @@
 <ScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/aboutViewBackgroundColor">

 	<LinearLayout
 		android:layout_width="match_parent"
@@ -26,7 +27,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textSize="18sp"
-			android:textColor="@color/gray_900"/>
+			android:textColor="?attr/aboutViewTitleColor"/>

 		<TextView
 			android:id="@+id/tv_app_desc"
@@ -35,14 +36,14 @@
 			android:layout_marginTop="4dp"
 			android:layout_marginBottom="8dp"
 			android:textSize="14sp"
-			android:textColor="@color/gray_500"/>
+			android:textColor="?attr/aboutViewTextColor"/>

 		<View
 			android:layout_width="match_parent"
 			android:layout_height="1px"
 			android:layout_marginTop="4dp"
 			android:layout_marginBottom="8dp"
-			android:background="@color/gray_200"/>
+			android:background="?attr/aboutViewDividerColor"/>

 		<LinearLayout
 			android:id="@+id/ll_function_container"
--- a/libappbase/src/main/res/layout/view_globalcrashreport.xml
+++ b/libappbase/src/main/res/layout/view_globalcrashreport.xml
@@ -5,26 +5,30 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor"
 	android:id="@+id/viewglobalcrashreportLinearLayout1">

    <android.widget.Toolbar
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
 		android:id="@+id/viewglobalcrashreportToolbar1"/>

 	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0">
+		android:layout_weight="1.0"
+		android:fillViewport="true">

 		<HorizontalScrollView
 			android:layout_width="match_parent"
-			android:layout_height="match_parent">
+			android:layout_height="wrap_content">

 			<TextView
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:background="#FFFFFFFF"
+				android:padding="16dp"
+				android:textColor="?attr/activityTextColor"
 				android:id="@+id/viewglobalcrashreportTextView1"/>

 		</HorizontalScrollView>
--- a/libappbase/src/main/res/layout/view_log.xml
+++ b/libappbase/src/main/res/layout/view_log.xml
@@ -4,14 +4,14 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="#FF000000">
+	android:background="?attr/activityBackgroundColor">

 	<RelativeLayout
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
 		android:layout_height="34dp"
 		android:layout_alignParentTop="true"
-		android:background="@drawable/bg_toolbar_log"
+		android:background="?attr/toolbarBackgroundColor"
 		android:id="@+id/viewlogRelativeLayoutToolbar">

 		<Button
@@ -19,8 +19,8 @@
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
 			android:text="Clean"
-			android:textColor="@color/white"
-			android:backgroundTint="@drawable/btn_gray_bg"
+			android:textColor="?attr/buttonTextColor"
+			android:backgroundTint="?attr/buttonBackgroundColor"
 			android:layout_centerVertical="true"
 			android:id="@+id/viewlogButtonClean"
 			android:layout_marginLeft="5dp"/>
@@ -34,8 +34,8 @@
 			android:layout_toRightOf="@+id/viewlogButtonClean"
 			android:layout_centerVertical="true"
 			android:id="@+id/viewlogTextView1"
-			android:background="@color/btn_gray_normal"
-			android:textColor="@color/black"/>
+			android:background="?attr/buttonBackgroundColor"
+			android:textColor="?attr/buttonTextColor"/>

 		<cc.winboll.studio.libappbase.widget.LogTagSpinner
 			android:layout_width="wrap_content"
@@ -52,17 +52,17 @@
 			android:layout_toLeftOf="@+id/viewlogButtonCopy"
 			android:layout_centerVertical="true"
 			android:text="Selectable"
-			android:background="@color/btn_gray_normal"
+			android:background="?attr/buttonBackgroundColor"
 			android:id="@+id/viewlogCheckBoxSelectable"
 			android:padding="@dimen/log_text_padding"
-			android:textColor="@color/white"/>
+			android:textColor="?attr/buttonTextColor"/>

 		<Button
 			android:layout_width="@dimen/log_button_width"
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
-			android:textColor="@color/white"
-			android:backgroundTint="@drawable/btn_gray_bg"
+			android:textColor="?attr/buttonTextColor"
+			android:backgroundTint="?attr/buttonBackgroundColor"
 			android:text="Copy"
 			android:layout_alignParentRight="true"
 			android:layout_centerVertical="true"
@@ -78,7 +78,7 @@
 		android:layout_below="@+id/viewlogRelativeLayoutToolbar"
 		android:id="@+id/viewlogLinearLayout1"
 		android:gravity="center_vertical"
-		android:background="@drawable/bg_toolbar_log">
+		android:background="?attr/toolbarBackgroundColor">

 		<CheckBox
 			android:layout_width="wrap_content"
@@ -87,7 +87,8 @@
 			android:text="ALL"
 			android:padding="2dp"
 			android:id="@+id/viewlogCheckBox1"
-			android:background="@drawable/bg_border_round"
+			android:background="?attr/buttonBackgroundColor"
+			android:textColor="?attr/buttonTextColor"
 			android:layout_marginLeft="5dp"
 			android:layout_marginRight="5dp"/>

@@ -96,13 +97,15 @@
 			android:ems="10"
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
+			android:textColor="?attr/activityTextColor"
+			android:background="?attr/buttonBackgroundColor"
 			android:singleLine="true"
 			android:id="@+id/tagsearch_et"/>

 		<HorizontalScrollView
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:background="@drawable/bg_border"
+			android:background="?attr/buttonBackgroundColor"
 			android:scrollbars="none"
 			android:padding="2dp"
 			android:layout_weight="1.0"
@@ -128,7 +131,7 @@
 		<ScrollView
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:background="#FF000000"
+			android:background="?attr/activityBackgroundColor"
 			android:id="@+id/viewlogScrollViewLog">

 			<TextView
@@ -144,5 +147,4 @@

 	</RelativeLayout>

-</RelativeLayout>
-
+</RelativeLayout>
--- a/libappbase/src/main/res/values-night/attrs.xml
+++ b/libappbase/src/main/res/values-night/attrs.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- 全局主题属性 -->
+    <attr name="themeGlobalCrashActivity" format="reference"/>
+
+    <!-- GlobalCrashActivity 样式属性 -->
+    <declare-styleable name="GlobalCrashActivity">
+        <attr name="colorTittle" format="color" />
+        <attr name="colorTittleBackgound" format="color" />
+        <attr name="colorText" format="color" />
+        <attr name="colorTextBackgound" format="color" />
+    </declare-styleable>
+
+    <!-- AboutView 样式属性 -->
+    <declare-styleable name="AboutViewStyle">
+        <attr name="aboutViewBackgroundColor" format="color" />
+        <attr name="aboutViewTextColor" format="color" />
+        <attr name="aboutViewTitleColor" format="color" />
+        <attr name="aboutViewDividerColor" format="color" />
+    </declare-styleable>
+
+    <!-- ButtonStyle 样式属性 -->
+    <declare-styleable name="ButtonStyle">
+        <attr name="buttonBackgroundColor" format="color" />
+        <attr name="buttonTextColor" format="color" />
+    </declare-styleable>
+
+    <!-- DialogStyle 样式属性 -->
+    <declare-styleable name="DialogStyle">
+        <attr name="dialogBackgroundColor" format="color" />
+        <attr name="dialogTextColor" format="color" />
+    </declare-styleable>
+
+    <!-- 窗体/控件通用背景色属性 -->
+    <attr name="toolbarBackgroundColor" format="color"/>
+    <attr name="textViewBackgroundColor" format="color"/>
+    <attr name="editTextBackgroundColor" format="color"/>
+    <attr name="scrollViewBackgroundColor" format="color"/>
+
+    <!-- 窗体/控件通用文字色属性 -->
+    <attr name="toolbarTextColor" format="color"/>
+    <attr name="textViewTextColor" format="color"/>
+    <attr name="editTextTextColor" format="color"/>
+
+    <!-- ActivityStyle 样式属性 -->
+    <attr name="activityBackgroundColor" format="color"/>
+    <attr name="activityTextColor" format="color"/>
+
+</resources>
--- a/libappbase/src/main/res/values-night/colors.xml
+++ b/libappbase/src/main/res/values-night/colors.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#FF1E3A5F</color>
+    <color name="colorPrimaryDark">#FF15253D</color>
+    <color name="colorAccent">#FF4DA6FF</color>
+    <color name="colorText">#FFE0E0E0</color>
+	<color name="colorTextBackgound">#FF0D1B2A</color>
+
+	<!-- ============== 基础黑白（必含，适配文字/背景） ============== -->
+	<color name="white">#FFFFFF</color>
+	<color name="black">#000000</color>
+
+	<!-- ============== 基础色系（按钮/强调色常用） ============== -->
+	<color name="blue_light">#4A90E2</color>
+	<color name="blue_normal">#2196F3</color>
+	<color name="blue_dark">#1976D2</color>
+	<color name="green_light">#66BB6A</color>
+	<color name="green_normal">#4CAF50</color>
+	<color name="green_dark">#388E3C</color>
+	<color name="red_light">#EF5350</color>
+	<color name="red_normal">#F44336</color>
+	<color name="red_dark">#D32F2F</color>
+	<color name="yellow_light">#FFF59D</color>
+	<color name="yellow_normal">#FFC107</color>
+	<color name="yellow_dark">#FFA000</color>
+	<color name="orange_normal">#FF9800</color>
+	<color name="purple_normal">#9C27B0</color>
+
+	<!-- ============== 透明色（遮罩/背景叠加） ============== -->
+	<color name="transparent">#00000000</color>
+	<color name="black_transparent_50">#80000000</color>
+
+	<!-- ============== 不透明灰色（常用深浅梯度） ============== -->
+	<color name="gray_100">#1A1A1A</color>
+	<color name="gray_200">#262626</color>
+	<color name="gray_300">#333333</color>
+	<color name="gray_400">#4D4D4D</color>
+	<color name="gray_500">#666666</color>
+	<color name="gray_600">#808080</color>
+	<color name="gray_700">#999999</color>
+	<color name="gray_800">#B3B3B3</color>
+	<color name="gray_900">#CCCCCC</color>
+
+	<!-- ============== 半透明灰色 ============== -->
+	<color name="gray_transparent_30">#4D333333</color>
+	<color name="gray_transparent_50">#80333333</color>
+	<color name="gray_transparent_70">#B3333333</color>
+
+	<color name="gray_light">#333333</color>
+	<color name="gray_mid">#666666</color>
+	<color name="gray_dark">#999999</color>
+	<color name="gray_black">#CCCCCC</color>
+
+	<!-- ============== 遮罩/蒙层 ============== -->
+	<color name="mask_gray">#804D4D4D</color>
+	<color name="bg_overlay_gray">#4D1A1A1A</color>
+
+	<!-- ============== 按钮灰色 ============== -->
+	<color name="btn_gray_normal">#666666</color>
+	<color name="btn_gray_pressed">#4D4D4D</color>
+	<color name="btn_gray_disabled">#333333</color>
+
+</resources>
--- a/libappbase/src/main/res/values-night/styles.xml
+++ b/libappbase/src/main/res/values-night/styles.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- APPBaseTheme 深色模式主题 -->
+    <style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
+        <item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item>
+        <item name="aboutViewBackgroundColor">#FF0D1B2A</item>
+        <item name="aboutViewTextColor">#FFE0E0E0</item>
+        <item name="aboutViewTitleColor">#FFE0E0E0</item>
+        <item name="aboutViewDividerColor">#FF333333</item>
+        <item name="buttonBackgroundColor">#FF1E3A5F</item>
+        <item name="buttonTextColor">#FFE0E0E0</item>
+        <item name="dialogBackgroundColor">#FF0D1B2A</item>
+        <item name="dialogTextColor">#FFE0E0E0</item>
+        <item name="toolbarBackgroundColor">#FF1E3A5F</item>
+        <item name="toolbarTextColor">#FFE0E0E0</item>
+        <item name="textViewBackgroundColor">#FF0D1B2A</item>
+        <item name="textViewTextColor">#FFE0E0E0</item>
+        <item name="editTextBackgroundColor">#FF1E3A5F</item>
+        <item name="editTextTextColor">#FFE0E0E0</item>
+        <item name="scrollViewBackgroundColor">#FF0D1B2A</item>
+        <item name="activityBackgroundColor">#FF0D1B2A</item>
+        <item name="activityTextColor">#FFE0E0E0</item>
+    </style>
+
+    <!-- GlobalCrashActivityTheme 深色模式样式 -->
+	<style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
+        <item name="android:statusBarColor">#FF0D1B2A</item>
+        <item name="colorTittle">#FFE0E0E0</item>
+        <item name="colorTittleBackgound">#FF1E3A5F</item>
+        <item name="colorText">#FFE0E0E0</item>
+        <item name="colorTextBackgound">#FF0D1B2A</item>
+	</style>
+
+    <!-- DialogStyle 对话框样式 -->
+	<style name="DialogStyle" parent="@android:style/Theme.Dialog">
+		<item name="android:windowBackground">@android:color/transparent</item>
+		<item name="android:windowNoTitle">true</item>
+	</style>
+
+</resources>
--- a/libappbase/src/main/res/values/attrs.xml
+++ b/libappbase/src/main/res/values/attrs.xml
@@ -1,13 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>

+    <!-- 全局主题属性 -->
    <attr name="themeGlobalCrashActivity" format="reference"/>

-    <declare-styleable name="GlobalCrashActivity">
-        <attr name="colorTittle" format="color" />
-        <attr name="colorTittleBackgound" format="color" />
-        <attr name="colorText" format="color" />
-        <attr name="colorTextBackgound" format="color" />
+    <!-- AboutView 样式属性 -->
+    <declare-styleable name="AboutView">
+        <attr name="app_name" format="string" />
+        <attr name="app_apkfoldername" format="string" />
+        <attr name="app_apkname" format="string" />
+        <attr name="app_gitname" format="string" />
+        <attr name="app_gitowner" format="string" />
+        <attr name="app_gitappbranch" format="string" />
+        <attr name="app_gitappsubprojectfolder" format="string" />
+        <attr name="appdescription" format="string" />
+        <attr name="appicon" format="reference" />
+        <attr name="is_adddebugtools" format="boolean" />
    </declare-styleable>

-</resources>
+    <!-- AboutViewStyle 样式属性 -->
+    <declare-styleable name="AboutViewStyle">
+        <attr name="aboutViewBackgroundColor" format="color" />
+        <attr name="aboutViewTextColor" format="color" />
+        <attr name="aboutViewTitleColor" format="color" />
+        <attr name="aboutViewDividerColor" format="color" />
+    </declare-styleable>
+
+    <!-- ButtonStyle 样式属性 -->
+    <declare-styleable name="ButtonStyle">
+        <attr name="buttonBackgroundColor" format="color" />
+        <attr name="buttonTextColor" format="color" />
+    </declare-styleable>
+
+    <!-- DialogStyle 样式属性 -->
+    <declare-styleable name="DialogStyle">
+        <attr name="dialogBackgroundColor" format="color" />
+        <attr name="dialogTextColor" format="color" />
+    </declare-styleable>
+
+    <!-- 窗体/控件通用背景色属性 -->
+    <attr name="toolbarBackgroundColor" format="color"/>
+    <attr name="textViewBackgroundColor" format="color"/>
+    <attr name="editTextBackgroundColor" format="color"/>
+    <attr name="scrollViewBackgroundColor" format="color"/>
+
+    <!-- 窗体/控件通用文字色属性 -->
+    <attr name="toolbarTextColor" format="color"/>
+    <attr name="textViewTextColor" format="color"/>
+    <attr name="editTextTextColor" format="color"/>
+
+    <!-- ActivityStyle 样式属性 -->
+    <attr name="activityBackgroundColor" format="color"/>
+    <attr name="activityTextColor" format="color"/>
+
+</resources>
--- a/libappbase/src/main/res/values/colors.xml
+++ b/libappbase/src/main/res/values/colors.xml
@@ -1,74 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <color name="colorPrimary">#FF00B322</color>
-    <color name="colorPrimaryDark">#FF005C12</color>
+    <color name="colorPrimaryDark">#FF008F1A</color>
    <color name="colorAccent">#FF8DFFA2</color>
-    <color name="colorText">#FFFFFB8D</color>
-	<color name="colorTextBackgound">#FF000000</color>
+    <color name="colorText">#FF000000</color>
+	<color name="colorTextBackgound">#FFF5F5F5</color>

 	<!-- ============== 基础黑白（必含，适配文字/背景） ============== -->
-	<color name="white">#FFFFFF</color>          <!-- 纯白色（文字/背景） -->
-	<color name="black">#000000</color>          <!-- 近黑色（重要文字） -->
+	<color name="white">#FFFFFF</color>
+	<color name="black">#000000</color>

 	<!-- ============== 基础色系（按钮/强调色常用） ============== -->
-	<!-- 蓝色系（常用：确认/链接/主题色） -->
-	<color name="blue_light">#4A90E2</color>     <!-- 浅蓝（次要按钮） -->
-	<color name="blue_normal">#2196F3</color>    <!-- 标准蓝（主题/确认按钮） -->
-	<color name="blue_dark">#1976D2</color>      <!-- 深蓝（按压态/重要强调） -->
-	<!-- 绿色系（常用：成功/完成/安全提示） -->
-	<color name="green_light">#66BB6A</color>    <!-- 浅绿（次要成功态） -->
-	<color name="green_normal">#4CAF50</color>   <!-- 标准绿（成功按钮/提示） -->
-	<color name="green_dark">#388E3C</color>     <!-- 深绿（按压态/重要成功） -->
-	<!-- 红色系（常用：错误/警告/删除按钮） -->
-	<color name="red_light">#EF5350</color>      <!-- 浅红（次要错误提示） -->
-	<color name="red_normal">#F44336</color>     <!-- 标准红（删除/错误按钮） -->
-	<color name="red_dark">#D32F2F</color>       <!-- 深红（按压态/重要错误） -->
-	<!-- 黄色系（常用：警告/提醒/高亮） -->
-	<color name="yellow_light">#FFF59D</color>   <!-- 浅黄（次要提醒） -->
-	<color name="yellow_normal">#FFC107</color>  <!-- 标准黄（警告提示/高亮） -->
-	<color name="yellow_dark">#FFA000</color>    <!-- 深黄（重要警告） -->
-	<!-- 橙色系（常用：提醒/进度/活力色） -->
-	<color name="orange_normal">#FF9800</color>  <!-- 标准橙（提醒按钮/进度） -->
-	<!-- 紫色系（常用：特殊强调/个性按钮） -->
-	<color name="purple_normal">#9C27B0</color>  <!-- 标准紫（特殊功能按钮） -->
+	<color name="blue_light">#4A90E2</color>
+	<color name="blue_normal">#2196F3</color>
+	<color name="blue_dark">#1976D2</color>
+	<color name="green_light">#66BB6A</color>
+	<color name="green_normal">#4CAF50</color>
+	<color name="green_dark">#388E3C</color>
+	<color name="red_light">#EF5350</color>
+	<color name="red_normal">#F44336</color>
+	<color name="red_dark">#D32F2F</color>
+	<color name="yellow_light">#FFF59D</color>
+	<color name="yellow_normal">#FFC107</color>
+	<color name="yellow_dark">#FFA000</color>
+	<color name="orange_normal">#FF9800</color>
+	<color name="purple_normal">#9C27B0</color>

 	<!-- ============== 透明色（遮罩/背景叠加） ============== -->
-	<color name="transparent">#00000000</color>  <!-- 全透明 -->
-	<color name="black_transparent_50">#80000000</color> <!-- 50%透明黑（遮罩） -->
+	<color name="transparent">#00000000</color>
+	<color name="black_transparent_50">#80000000</color>

+	<!-- ============== 不透明灰色（常用深浅梯度） ============== -->
+	<color name="gray_100">#F5F5F5</color>
+	<color name="gray_200">#EEEEEE</color>
+	<color name="gray_300">#E0E0E0</color>
+	<color name="gray_400">#BDBDBD</color>
+	<color name="gray_500">#9E9E9E</color>
+	<color name="gray_600">#757575</color>
+	<color name="gray_700">#616161</color>
+	<color name="gray_800">#424242</color>
+	<color name="gray_900">#212121</color>

+	<!-- ============== 半透明灰色 ============== -->
+	<color name="gray_transparent_30">#4D9E9E9E</color>
+	<color name="gray_transparent_50">#809E9E9E</color>
+	<color name="gray_transparent_70">#B39E9E9E</color>

-	<!-- 1. 不透明灰色（常用深浅梯度，直接用） -->
-	<color name="gray_100">#F5F5F5</color> <!-- 极浅灰（接近白色，背景用） -->
-	<color name="gray_200">#EEEEEE</color> <!-- 浅灰（卡片/分割线背景） -->
-	<color name="gray_300">#E0E0E0</color> <!-- 中浅灰（边框/次要背景） -->
-	<color name="gray_400">#BDBDBD</color> <!-- 中灰（次要文字/图标） -->
-	<color name="gray_500">#9E9E9E</color> <!-- 标准中灰（常用辅助文字） -->
-	<color name="gray_600">#757575</color> <!-- 中深灰（常规辅助文字） -->
-	<color name="gray_700">#616161</color> <!-- 深灰（重要辅助文字） -->
-	<color name="gray_800">#424242</color> <!-- 极深灰（接近黑色，标题副文本） -->
-	<color name="gray_900">#212121</color> <!-- 近黑色（特殊场景用） -->
+	<color name="gray_light">#EEE</color>
+	<color name="gray_mid">#999</color>
+	<color name="gray_dark">#666</color>
+	<color name="gray_black">#333</color>

-	<!-- 2. 半透明灰色（带透明度，遮罩/蒙层用） -->
-	<color name="gray_transparent_30">#4D9E9E9E</color> <!-- 30%透明中灰（A=4D） -->
-	<color name="gray_transparent_50">#809E9E9E</color> <!-- 50%透明中灰（A=80） -->
-	<color name="gray_transparent_70">#B39E9E9E</color> <!-- 70%透明中灰（A=B3） -->
-
-	<color name="gray_light">#EEE</color>  <!-- 等价 #EEEEEE（浅灰） -->
-	<color name="gray_mid">#999</color>    <!-- 等价 #999999（中灰） -->
-	<color name="gray_dark">#666</color>   <!-- 等价 #666666（深灰） -->
-	<color name="gray_black">#333</color>  <!-- 等价 #333333（极深灰） -->
-
-	<!-- 50% 透明中灰（弹窗遮罩常用） -->
+	<!-- ============== 遮罩/蒙层 ============== -->
 	<color name="mask_gray">#809E9E9E</color>
-	<!-- 30% 透明深灰（背景叠加） -->
 	<color name="bg_overlay_gray">#4D424242</color>

-	<!-- 1. 常规灰色（按钮默认态，常用中灰） -->
+	<!-- ============== 按钮灰色 ============== -->
 	<color name="btn_gray_normal">#9E9E9E</color>
-	<!-- 2. 按压深色（按钮点击态，加深一级，提升交互感） -->
 	<color name="btn_gray_pressed">#757575</color>
-	<!-- 3. 禁用灰色（按钮不可点击态，浅灰） -->
 	<color name="btn_gray_disabled">#E0E0E0</color>

-</resources>
+</resources>
--- a/libappbase/src/main/res/values/styles.xml
+++ b/libappbase/src/main/res/values/styles.xml
@@ -1,20 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>

+    <!-- APPBaseTheme 普通模式主题 -->
    <style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
        <item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item>
+        <item name="aboutViewBackgroundColor">#FFF5F5F5</item>
+        <item name="aboutViewTextColor">#FF000000</item>
+        <item name="aboutViewTitleColor">#FF000000</item>
+        <item name="aboutViewDividerColor">#FFE0E0E0</item>
+        <item name="buttonBackgroundColor">#FF00B322</item>
+        <item name="buttonTextColor">#FF000000</item>
+        <item name="dialogBackgroundColor">#FFF5F5F5</item>
+        <item name="dialogTextColor">#FF000000</item>
+        <item name="toolbarBackgroundColor">#FF00B322</item>
+        <item name="toolbarTextColor">#FF000000</item>
+        <item name="textViewBackgroundColor">#FFF5F5F5</item>
+        <item name="textViewTextColor">#FF000000</item>
+        <item name="editTextBackgroundColor">#FFFFFFFF</item>
+        <item name="editTextTextColor">#FF000000</item>
+        <item name="scrollViewBackgroundColor">#FFF5F5F5</item>
+        <item name="activityBackgroundColor">#FFF5F5F5</item>
+        <item name="activityTextColor">#FF000000</item>
    </style>

-    <style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
-        <item name="colorTittle">#FFFFF600</item>
+    <!-- GlobalCrashActivityTheme 普通模式样式 -->
+	<style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
+        <item name="android:statusBarColor">#FF00B322</item>
+        <item name="colorTittle">#FF000000</item>
        <item name="colorTittleBackgound">#FF00B322</item>
-        <item name="colorText">#FF00B322</item>
-        <item name="colorTextBackgound">#FF000000</item>
+        <item name="colorText">#FF000000</item>
+        <item name="colorTextBackgound">#FFF5F5F5</item>
 	</style>
-	
+
+    <!-- DialogStyle 对话框样式 -->
 	<style name="DialogStyle" parent="@android:style/Theme.Dialog">
 		<item name="android:windowBackground">@android:color/transparent</item>
 		<item name="android:windowNoTitle">true</item>
 	</style>

-</resources>
+</resources>
--- a/libgpsrelaysentinel/build.properties
+++ b/libgpsrelaysentinel/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
--- a/libgpsrelaysentinel/src/main/AndroidManifest.xml
+++ b/libgpsrelaysentinel/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.libgpsrelaysentinel">
-
-    <application>
-		<service
-			android:name=".service.GpsSubscribeReceiverService"
-			android:exported="true"
-			android:enabled="true">
-			<intent-filter>
-				<action android:name="cc.winboll.studio.libgpsrelaysentinel.action.RECEIVE" />
-			</intent-filter>
-		</service>
-		
-        <receiver android:name=".receiver.GpsSubscribeObserverReceiver">
-
-            <intent-filter>
-
-                <action android:name=".receiver.GpsSubscribeObserverReceiver"/>
-
-            </intent-filter>
-
-        </receiver>
-    </application>
-
-</manifest>
--- a/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/manager/GpsSubscribeManager.java
+++ b/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/manager/GpsSubscribeManager.java
@@ -1,75 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.manager;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:25
- */
-
-import android.content.Context;
-import android.content.Intent;
-import java.util.HashMap;
-import java.util.Map;
-
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeConst;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeResult;
-
-public final class GpsSubscribeManager {
-
-    private static GpsSubscribeManager instance;
-    private final Map<String,GpsSubscribeMsg> subscribeMap;
-    private Context appContext;
-
-    private GpsSubscribeManager(){
-        subscribeMap = new HashMap<String, GpsSubscribeMsg>();
-    }
-
-    public static GpsSubscribeManager getInstance(){
-        if(instance == null){
-            instance = new GpsSubscribeManager();
-        }
-        return instance;
-    }
-
-    public void initContext(final Context context){
-        this.appContext = context.getApplicationContext();
-    }
-
-    public void addSubscribe(final GpsSubscribeMsg subscribeMsg){
-        if(subscribeMsg == null){
-            return;
-        }
-        subscribeMap.put(subscribeMsg.getSubscribeUniqueId(),subscribeMsg);
-    }
-
-    public void removeSubscribe(final String sid){
-        if(sid == null){
-            return;
-        }
-        subscribeMap.remove(sid);
-        SubscribeLocationManager.getInstance().removeSubscribe(sid);
-    }
-
-    public boolean isSubscribeExist(final String sid){
-        return subscribeMap.containsKey(sid);
-    }
-
-    public void sendSubscribeResult(final GpsSubscribeResult result){
-        if(appContext == null || result == null){
-            return;
-        }
-        Intent intent = new Intent(GpsSubscribeConst.ACTION_SUBSCRIBE_CALLBACK);
-        intent.putExtra("data",result);
-        appContext.sendBroadcast(intent);
-    }
-
-    public void clearAllSubscribe(){
-        subscribeMap.clear();
-        SubscribeLocationManager.getInstance().clearAll();
-    }
-
-    public Map<String, GpsSubscribeMsg> getSubscribeMap() {
-        return subscribeMap;
-    }
-}
-
--- a/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/manager/SubscribeLocationManager.java
+++ b/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/manager/SubscribeLocationManager.java
@@ -1,128 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.manager;
-
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeConst;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgpsrelaysentinel.model.LocationPoint;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public final class SubscribeLocationManager {
-
-    private static SubscribeLocationManager instance;
-
-    //订阅配置
-    private final Map<String,GpsSubscribeMsg> subscribeConfigMap;
-    //基准定点坐标
-    private final Map<String,LocationPoint> subscriberPointMap;
-    //真实推送计数(精准统计)
-    private final Map<String,Integer> subscriberPushCountMap;
-
-    private SubscribeLocationManager(){
-        subscribeConfigMap = new HashMap<String, GpsSubscribeMsg>();
-        subscriberPointMap = new HashMap<String, LocationPoint>();
-        subscriberPushCountMap = new HashMap<String, Integer>();
-    }
-
-    public static SubscribeLocationManager getInstance(){
-        if(instance == null){
-            instance = new SubscribeLocationManager();
-        }
-        return instance;
-    }
-
-    //========= 订阅配置 =========
-    public void putSubscribeConfig(String sid,GpsSubscribeMsg msg){
-        subscribeConfigMap.put(sid,msg);
-    }
-
-    public GpsSubscribeMsg getSubscribeConfig(String sid){
-        return subscribeConfigMap.get(sid);
-    }
-
-    //========= 基准定点坐标 =========
-    public void initSubscriberPoint(String sid,double lat,double lng){
-        subscriberPointMap.put(sid,new LocationPoint(lat,lng,System.currentTimeMillis()));
-    }
-
-    public void updateSubscriberPoint(String sid,double lat,double lng){
-        subscriberPointMap.put(sid,new LocationPoint(lat,lng,System.currentTimeMillis()));
-    }
-
-    public LocationPoint getLastPoint(String sid){
-        return subscriberPointMap.get(sid);
-    }
-
-    //========= 精准推送计数 =========
-    public void addPushCount(String sid){
-        int current = subscriberPushCountMap.get(sid) == null ? 0 : subscriberPushCountMap.get(sid);
-        subscriberPushCountMap.put(sid,current + 1);
-    }
-
-    public int getPushCount(String sid){
-        return subscriberPushCountMap.get(sid) == null ? 0 : subscriberPushCountMap.get(sid);
-    }
-
-    public void clearPushCount(String sid){
-        subscriberPushCountMap.put(sid,0);
-    }
-
-    //========= 步长规则判断 =========
-    public boolean isNeedPush(String sid,double nowLat,double nowLng){
-        GpsSubscribeMsg config = getSubscribeConfig(sid);
-        if(config == null){
-            return false;
-        }
-
-        //全量订阅直接放行
-        if(config.getSubscribeMode() == GpsSubscribeConst.SUB_TYPE_ALL){
-            return true;
-        }
-
-        //无初始定点 → 先建立第一个基准点
-        LocationPoint lastPoint = getLastPoint(sid);
-        if(lastPoint == null){
-            return true;
-        }
-
-        //计算实际移动距离
-        double distance = calculateDistance(
-			lastPoint.getLatitude(),lastPoint.getLongitude(),
-			nowLat,nowLng
-        );
-
-        return distance >= config.getStepDistanceM();
-    }
-
-    //两点经纬度距离计算(米)
-    private double calculateDistance(double lat1,double lng1,double lat2,double lng2){
-        double radLat1 = Math.toRadians(lat1);
-        double radLat2 = Math.toRadians(lat2);
-        double radLng1 = Math.toRadians(lng1);
-        double radLng2 = Math.toRadians(lng2);
-
-        double latDiff = radLat1 - radLat2;
-        double lngDiff = radLng1 - radLng2;
-
-        double value = 2 * Math.asin(Math.sqrt(
-										 Math.pow(Math.sin(latDiff / 2),2)
-										 + Math.cos(radLat1) * Math.cos(radLat2)
-										 * Math.pow(Math.sin(lngDiff / 2),2)
-									 ));
-        return value * 6378137;
-    }
-
-    //========= 移除 & 清空 =========
-    public void removeSubscribe(String sid){
-        subscribeConfigMap.remove(sid);
-        subscriberPointMap.remove(sid);
-        subscriberPushCountMap.remove(sid);
-    }
-
-    public void clearAll(){
-        subscribeConfigMap.clear();
-        subscriberPointMap.clear();
-        subscriberPushCountMap.clear();
-    }
-}
-
--- a/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/model/GpsSubscribeConst.java
+++ b/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/model/GpsSubscribeConst.java
@@ -1,46 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.model;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:22
- * WinBoLL Studio
- * Java7 | API26-30
- */
-public final class GpsSubscribeConst {
-	
-	// 新增：GPS定位推送广播
-	public static final String ACTION_GPS_LOCATION = "cc.winboll.studio.ACTION_GPS_LOCATION";
-
-    //订阅运行模式
-    public static final int SUB_TYPE_ALL = 1;
-    public static final int SUB_TYPE_STEP_DISTANCE = 2;
-
-    //原始数据订阅类型
-    public static final int SUBSCRIBE_TYPE_LOCATION = 1;
-    public static final int SUBSCRIBE_TYPE_SATELLITE = 2;
-    public static final int SUBSCRIBE_TYPE_NMEA = 3;
-
-    //订阅返回码
-    public static final int RESULT_SUCCESS = 0;
-    public static final int RESULT_PERMISSION_DENY = 1;
-    public static final int RESULT_PARAM_ERROR = 2;
-    public static final int RESULT_GPS_NOT_AVAILABLE = 3;
-    public static final int RESULT_SYSTEM_LIMIT = 4;
-
-    //GPS设备状态
-    public static final int GPS_STATE_CLOSE = 0;
-    public static final int GPS_STATE_SCANNING = 1;
-    public static final int GPS_STATE_LOCATED = 2;
-    public static final int GPS_STATE_SIGNAL_WEAK = 3;
-
-    //广播Action
-    public static final String ACTION_SUBSCRIBE_REQUEST = "cc.winboll.studio.GPS_SUBSCRIBE_REQUEST";
-    public static final String ACTION_SUBSCRIBE_CALLBACK = "cc.winboll.studio.GPS_SUBSCRIBE_CALLBACK";
-
-    //超时毫秒
-    public static final long SUBSCRIBE_TIME_OUT = 5000;
-
-    //地球半径 距离计算常量
-    public static final double EARTH_RADIUS = 6378137.0;
-}
-
--- a/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/model/GpsSubscribeMsg.java
+++ b/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/model/GpsSubscribeMsg.java
@@ -1,137 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.model;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:24
- */
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-public final class GpsSubscribeMsg implements Parcelable {
-
-    private final String subscribePackage;
-    private final int subscribeMode;
-    private final float stepDistanceM;
-
-    private final int subscribeType;
-    private final long updateInterval;
-    private final float minDistance;
-    private final boolean backgroundPush;
-    private final String subscribeUniqueId;
-
-    public GpsSubscribeMsg(String subscribePackage,
-                           int subscribeMode,
-                           float stepDistanceM,
-                           int subscribeType,
-                           long updateInterval,
-                           float minDistance,
-                           boolean backgroundPush,
-                           String subscribeUniqueId) {
-        this.subscribePackage = subscribePackage;
-        this.subscribeMode = subscribeMode;
-        this.stepDistanceM = stepDistanceM;
-        this.subscribeType = subscribeType;
-        this.updateInterval = updateInterval;
-        this.minDistance = minDistance;
-        this.backgroundPush = backgroundPush;
-        this.subscribeUniqueId = subscribeUniqueId;
-    }
-
-    public String getSubscribePackage() {
-        return subscribePackage;
-    }
-
-    public int getSubscribeMode() {
-        return subscribeMode;
-    }
-
-    public float getStepDistanceM() {
-        return stepDistanceM;
-    }
-
-    public int getSubscribeType() {
-        return subscribeType;
-    }
-
-    public long getUpdateInterval() {
-        return updateInterval;
-    }
-
-    public float getMinDistance() {
-        return minDistance;
-    }
-
-    public boolean isBackgroundPush() {
-        return backgroundPush;
-    }
-
-    public String getSubscribeUniqueId() {
-        return subscribeUniqueId;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(subscribePackage);
-        dest.writeInt(subscribeMode);
-        dest.writeFloat(stepDistanceM);
-        dest.writeInt(subscribeType);
-        dest.writeLong(updateInterval);
-        dest.writeFloat(minDistance);
-        dest.writeByte((byte) (backgroundPush ? 1 : 0));
-        dest.writeString(subscribeUniqueId);
-    }
-
-    public static final Creator<GpsSubscribeMsg> CREATOR = new Creator<GpsSubscribeMsg>() {
-        @Override
-        public GpsSubscribeMsg createFromParcel(Parcel in) {
-            return new GpsSubscribeMsg(
-				in.readString(),
-				in.readInt(),
-				in.readFloat(),
-				in.readInt(),
-				in.readLong(),
-				in.readFloat(),
-				in.readByte() == 1,
-				in.readString()
-            );
-        }
-
-        @Override
-        public GpsSubscribeMsg[] newArray(int size) {
-            return new GpsSubscribeMsg[size];
-        }
-    };
-
-    public Bundle convertToBundle() {
-        Bundle bundle = new Bundle();
-        bundle.putString("pkg", subscribePackage);
-        bundle.putInt("subMode",subscribeMode);
-        bundle.putFloat("stepM",stepDistanceM);
-        bundle.putInt("type", subscribeType);
-        bundle.putLong("interval", updateInterval);
-        bundle.putFloat("distance", minDistance);
-        bundle.putBoolean("bgPush", backgroundPush);
-        bundle.putString("sid", subscribeUniqueId);
-        return bundle;
-    }
-
-    public static GpsSubscribeMsg createByBundle(Bundle bundle) {
-        return new GpsSubscribeMsg(
-			bundle.getString("pkg"),
-			bundle.getInt("subMode"),
-			bundle.getFloat("stepM"),
-			bundle.getInt("type"),
-			bundle.getLong("interval"),
-			bundle.getFloat("distance"),
-			bundle.getBoolean("bgPush"),
-			bundle.getString("sid")
-        );
-    }
-}
-
--- a/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/model/GpsSubscribeResult.java
+++ b/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/model/GpsSubscribeResult.java
@@ -1,115 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.model;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:25
- */
-
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-public final class GpsSubscribeResult implements Parcelable {
-
-    private final String subscribeUniqueId;
-    private final int resultCode;
-    private final String resultDesc;
-    private final int gpsRunningState;
-    private final long realEffectiveInterval;
-    private final long currentTimeStamp;
-
-    public GpsSubscribeResult(String subscribeUniqueId,
-                              int resultCode,
-                              String resultDesc,
-                              int gpsRunningState,
-                              long realEffectiveInterval,
-                              long currentTimeStamp) {
-        this.subscribeUniqueId = subscribeUniqueId;
-        this.resultCode = resultCode;
-        this.resultDesc = resultDesc;
-        this.gpsRunningState = gpsRunningState;
-        this.realEffectiveInterval = realEffectiveInterval;
-        this.currentTimeStamp = currentTimeStamp;
-    }
-
-    public String getSubscribeUniqueId() {
-        return subscribeUniqueId;
-    }
-
-    public int getResultCode() {
-        return resultCode;
-    }
-
-    public String getResultDesc() {
-        return resultDesc;
-    }
-
-    public int getGpsRunningState() {
-        return gpsRunningState;
-    }
-
-    public long getRealEffectiveInterval() {
-        return realEffectiveInterval;
-    }
-
-    public long getCurrentTimeStamp() {
-        return currentTimeStamp;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(subscribeUniqueId);
-        dest.writeInt(resultCode);
-        dest.writeString(resultDesc);
-        dest.writeInt(gpsRunningState);
-        dest.writeLong(realEffectiveInterval);
-        dest.writeLong(currentTimeStamp);
-    }
-
-    public static final Creator<GpsSubscribeResult> CREATOR = new Creator<GpsSubscribeResult>() {
-        @Override
-        public GpsSubscribeResult createFromParcel(Parcel in) {
-            return new GpsSubscribeResult(
-				in.readString(),
-				in.readInt(),
-				in.readString(),
-				in.readInt(),
-				in.readLong(),
-				in.readLong()
-            );
-        }
-
-        @Override
-        public GpsSubscribeResult[] newArray(int size) {
-            return new GpsSubscribeResult[size];
-        }
-    };
-
-    public Bundle convertToBundle() {
-        Bundle bundle = new Bundle();
-        bundle.putString("sid", subscribeUniqueId);
-        bundle.putInt("code", resultCode);
-        bundle.putString("desc", resultDesc);
-        bundle.putInt("gpsState", gpsRunningState);
-        bundle.putLong("realInterval", realEffectiveInterval);
-        bundle.putLong("time", currentTimeStamp);
-        return bundle;
-    }
-
-    public static GpsSubscribeResult createByBundle(Bundle bundle) {
-        return new GpsSubscribeResult(
-			bundle.getString("sid"),
-			bundle.getInt("code"),
-			bundle.getString("desc"),
-			bundle.getInt("gpsState"),
-			bundle.getLong("realInterval"),
-			bundle.getLong("time")
-        );
-    }
-}
-
--- a/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/model/LocationPoint.java
+++ b/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/model/LocationPoint.java
@@ -1,37 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.model;
-
-import java.io.Serializable;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:23
- * 订阅者基准定点坐标
- * 每次推送成功自动更新
- */
-public final class LocationPoint implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private final double latitude;
-    private final double longitude;
-    private final long recordTime;
-
-    public LocationPoint(double latitude, double longitude, long recordTime) {
-        this.latitude = latitude;
-        this.longitude = longitude;
-        this.recordTime = recordTime;
-    }
-
-    public double getLatitude() {
-        return latitude;
-    }
-
-    public double getLongitude() {
-        return longitude;
-    }
-
-    public long getRecordTime() {
-        return recordTime;
-    }
-}
-
--- a/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/receiver/GpsSubscribeObserverReceiver.java
+++ b/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/receiver/GpsSubscribeObserverReceiver.java
@@ -1,42 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.receiver;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:27
- */
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeConst;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeResult;
-
-public final class GpsSubscribeObserverReceiver extends BroadcastReceiver {
-
-    private OnSubscribeResultListener listener;
-
-    public void setOnSubscribeResultListener(OnSubscribeResultListener listener){
-        this.listener = listener;
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        String action = intent.getAction();
-        if(GpsSubscribeConst.ACTION_SUBSCRIBE_CALLBACK.equals(action)){
-            GpsSubscribeResult result = intent.getParcelableExtra("data");
-            if(listener != null && result != null){
-                listener.onResultBack(result);
-            }
-        }
-    }
-
-    public interface OnSubscribeResultListener{
-        void onResultBack(GpsSubscribeResult result);
-    }
-}
-
--- a/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/service/GpsSubscribeReceiverService.java
+++ b/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/service/GpsSubscribeReceiverService.java
@@ -1,39 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.service;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgpsrelaysentinel.model.LocationPoint;
-
-/**
- * 全局消息接收父类服务
- * 所有应用内接收服务全部继承此类
- */
-public abstract class GpsSubscribeReceiverService extends Service {
-
-    public static final String TAG_PARENT = "GpsSubscribeReceiverService";
-
-    //当前绑定的视图订阅SID
-    protected String bindViewSid;
-
-    public void bindControlSid(String sid){
-        this.bindViewSid = sid;
-    }
-
-    /**
-     * 统一接收GPS推送入口
-     */
-    public void onReceiveGpsData(LocationPoint point, GpsSubscribeMsg config){
-        //父类统一日志溯源
-        LogUtils.d(TAG_PARENT,"【消息溯源】接收视图SID：" + bindViewSid);
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-}
-
--- a/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/util/TimeCountUtil.java
+++ b/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/util/TimeCountUtil.java
@@ -1,51 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.util;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:26
- */
-
-import android.os.Handler;
-import android.os.Message;
-
-public final class TimeCountUtil {
-
-    private final Handler mHandler;
-    private long totalTime;
-    private boolean isRunning;
-    public static final int COUNT_FINISH = 1001;
-
-    public TimeCountUtil(final OnCountListener listener) {
-        mHandler = new Handler() {
-            @Override
-            public void handleMessage(Message msg) {
-                super.handleMessage(msg);
-                if(msg.what == COUNT_FINISH){
-                    isRunning = false;
-                    if(listener != null){
-                        listener.onTimeOut();
-                    }
-                }
-            }
-        };
-    }
-
-    public void start(long time){
-        if(isRunning){
-            return;
-        }
-        totalTime = time;
-        isRunning = true;
-        mHandler.sendEmptyMessageDelayed(COUNT_FINISH,totalTime);
-    }
-
-    public void cancel(){
-        mHandler.removeMessages(COUNT_FINISH);
-        isRunning = false;
-    }
-
-    public interface OnCountListener{
-        void onTimeOut();
-    }
-}
-
--- a/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/view/GpsSubscribeControlView.java
+++ b/libgpsrelaysentinel/src/main/java/cc/winboll/studio/libgpsrelaysentinel/view/GpsSubscribeControlView.java
@@ -1,226 +0,0 @@
-package cc.winboll.studio.libgpsrelaysentinel.view;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import cc.winboll.studio.libgpsrelaysentinel.R;
-import cc.winboll.studio.libgpsrelaysentinel.manager.GpsSubscribeManager;
-import cc.winboll.studio.libgpsrelaysentinel.manager.SubscribeLocationManager;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeConst;
-import cc.winboll.studio.libgpsrelaysentinel.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgpsrelaysentinel.model.LocationPoint;
-
-import java.util.UUID;
-
-public final class GpsSubscribeControlView extends LinearLayout {
-
-    //常量抽取
-    private static final long REFRESH_INTERVAL = 600;
-
-    private RadioGroup rgSubscribeMode;
-    private RadioButton rbModeAll;
-    private RadioButton rbModeStep;
-    private EditText etStepMeter;
-    private Switch switchSubscribe;
-    private TextView tvSubscribeSid;
-    private TextView tvSubscribeRecord;
-
-    private String currentSubscribeSid;
-    //一对一专属绑定的接收服务
-    private Class<?> mBindReceiverServiceClazz;
-
-    //final管理器 构造器初始化
-    private final GpsSubscribeManager mSubscribeManager;
-    private final SubscribeLocationManager mLocationManager;
-
-    private final Handler mRefreshHandler = new Handler(Looper.getMainLooper());
-
-
-    public GpsSubscribeControlView(Context context) {
-        super(context);
-        mSubscribeManager = GpsSubscribeManager.getInstance();
-        mLocationManager = SubscribeLocationManager.getInstance();
-        initView(context);
-    }
-
-    public GpsSubscribeControlView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mSubscribeManager = GpsSubscribeManager.getInstance();
-        mLocationManager = SubscribeLocationManager.getInstance();
-        initView(context);
-    }
-
-    private void initView(Context context) {
-        LayoutInflater.from(context).inflate(R.layout.view_gps_subscribe_control, this, true);
-
-        rgSubscribeMode = findViewById(R.id.rg_subscribe_mode);
-        rbModeAll = findViewById(R.id.rb_mode_all);
-        rbModeStep = findViewById(R.id.rb_mode_step);
-        etStepMeter = findViewById(R.id.et_step_meter);
-        switchSubscribe = findViewById(R.id.switch_subscribe);
-        tvSubscribeSid = findViewById(R.id.tv_subscribe_sid);
-        tvSubscribeRecord = findViewById(R.id.tv_subscribe_record);
-
-        initDefaultConfig();
-        initModeSwitch();
-        initSubscribeSwitch();
-        startAutoRefreshRecord();
-    }
-
-    private void initDefaultConfig() {
-        currentSubscribeSid = UUID.randomUUID().toString().substring(0, 16);
-        tvSubscribeSid.setText("订阅SID：" + currentSubscribeSid);
-        rbModeAll.setChecked(true);
-        etStepMeter.setText("10");
-    }
-
-    /**
-     * 外部绑定当前视图专属的接收服务Class
-     */
-    public void bindReceiverService(Class<?> serviceClazz){
-        this.mBindReceiverServiceClazz = serviceClazz;
-    }
-
-    private void initModeSwitch() {
-        rgSubscribeMode.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-				@Override
-				public void onCheckedChanged(RadioGroup group, int checkedId) {
-					etStepMeter.setVisibility(checkedId == R.id.rb_mode_step ? VISIBLE : GONE);
-				}
-			});
-    }
-
-    private void initSubscribeSwitch() {
-        switchSubscribe.setOnCheckedChangeListener(new android.widget.CompoundButton.OnCheckedChangeListener() {
-				@Override
-				public void onCheckedChanged(android.widget.CompoundButton buttonView, boolean isChecked) {
-					if (isChecked) {
-						startSubscribe();
-					} else {
-						stopSubscribe();
-					}
-				}
-			});
-    }
-
-    private void startSubscribe() {
-        int subMode = GpsSubscribeConst.SUB_TYPE_ALL;
-        float stepVal = 10f;
-
-        if (rbModeStep.isChecked()) {
-            subMode = GpsSubscribeConst.SUB_TYPE_STEP_DISTANCE;
-            try {
-                stepVal = Float.parseFloat(etStepMeter.getText().toString().trim());
-            } catch (Exception ignored) {}
-        }
-
-        GpsSubscribeMsg subscribeMsg = new GpsSubscribeMsg(
-			getContext().getPackageName(),
-			subMode,
-			stepVal,
-			GpsSubscribeConst.SUBSCRIBE_TYPE_LOCATION,
-			1000,
-			1f,
-			true,
-			currentSubscribeSid
-        );
-
-        mSubscribeManager.addSubscribe(subscribeMsg);
-        mLocationManager.putSubscribeConfig(currentSubscribeSid, subscribeMsg);
-        mLocationManager.clearPushCount(currentSubscribeSid);
-
-        //开启订阅自动启动专属接收服务
-        if(mBindReceiverServiceClazz != null){
-            Intent startServiceIntent = new Intent(getContext(), mBindReceiverServiceClazz);
-            getContext().startService(startServiceIntent);
-        }
-    }
-
-    private void stopSubscribe() {
-        mSubscribeManager.removeSubscribe(currentSubscribeSid);
-        mLocationManager.removeSubscribe(currentSubscribeSid);
-        tvSubscribeRecord.setText("状态：未订阅");
-
-        //关闭订阅 同步停止专属接收服务
-        if(mBindReceiverServiceClazz != null){
-            Intent stopServiceIntent = new Intent(getContext(), mBindReceiverServiceClazz);
-            getContext().stopService(stopServiceIntent);
-        }
-    }
-
-    private void startAutoRefreshRecord() {
-        mRefreshHandler.postDelayed(new Runnable() {
-				@Override
-				public void run() {
-					refreshRecordInfo();
-					mRefreshHandler.postDelayed(this, REFRESH_INTERVAL);
-				}
-			}, REFRESH_INTERVAL);
-    }
-
-    private void refreshRecordInfo() {
-        if (!switchSubscribe.isChecked()) {
-            tvSubscribeRecord.setText("状态：空闲未订阅");
-            return;
-        }
-
-        GpsSubscribeMsg config = mLocationManager.getSubscribeConfig(currentSubscribeSid);
-        LocationPoint lastPoint = mLocationManager.getLastPoint(currentSubscribeSid);
-
-        if (config == null) {
-            tvSubscribeRecord.setText("状态：已订阅｜等待管理器加载");
-            return;
-        }
-
-        String modeText = config.getSubscribeMode() == GpsSubscribeConst.SUB_TYPE_ALL
-			? "全量订阅" : "步长订阅";
-
-        int realPushCount = mLocationManager.getPushCount(currentSubscribeSid);
-
-        StringBuilder record = new StringBuilder();
-        record.append("【订阅实时数据表】\n");
-        record.append("订阅模式：").append(modeText).append("\n");
-        record.append("步长阈值：").append(config.getStepDistanceM()).append(" 米\n");
-
-        if(lastPoint != null){
-            record.append("基准定点：").append(lastPoint.getLatitude()).append(" , ").append(lastPoint.getLongitude()).append("\n");
-        }else{
-            record.append("基准定点：等待首次定位建立\n");
-        }
-
-        record.append("真实推送次数：").append(realPushCount).append(" 次");
-
-        tvSubscribeRecord.setText(record);
-    }
-
-    public String getCurrentSid() {
-        return currentSubscribeSid;
-    }
-
-    public boolean isSubscribeOpen() {
-        return switchSubscribe.isChecked();
-    }
-
-    /**
-     * 视图销毁：强制停止订阅 + 停止服务 + 清空刷新任务
-     */
-    @Override
-    protected void onDetachedFromWindow() {
-        if(switchSubscribe.isChecked()){
-            switchSubscribe.setChecked(false);
-        }
-        mRefreshHandler.removeCallbacksAndMessages(null);
-        super.onDetachedFromWindow();
-    }
-}
-
--- a/libgpsrelaysentinel/src/main/res/layout/view_gps_subscribe_control.xml
+++ b/libgpsrelaysentinel/src/main/res/layout/view_gps_subscribe_control.xml
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="14dp"
-    android:layout_marginVertical="6dp"
-    android:background="#282828"
-    android:clipToPadding="false">
-
-    <!-- SID标识 -->
-    <TextView
-        android:id="@+id/tv_subscribe_sid"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="#999999"
-        android:textSize="11sp"/>
-
-    <!-- 订阅模式选择 -->
-    <RadioGroup
-        android:id="@+id/rg_subscribe_mode"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="8dp">
-
-        <RadioButton
-            android:id="@+id/rb_mode_all"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="全量订阅"
-            android:textColor="#FFFFFF"/>
-
-        <RadioButton
-            android:id="@+id/rb_mode_step"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="步长订阅"
-            android:layout_marginStart="18dp"
-            android:textColor="#FFFFFF"/>
-    </RadioGroup>
-
-    <!-- 步长输入 -->
-    <EditText
-        android:id="@+id/et_step_meter"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="移动阈值(米)"
-        android:inputType="numberDecimal"
-        android:text="10"
-        android:visibility="gone"
-        android:textColor="#ffffff"
-        android:textColorHint="#666666"
-        android:layout_marginTop="8dp"/>
-
-    <!-- 订阅开关 -->
-    <Switch
-        android:id="@+id/switch_subscribe"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="开启独立订阅"
-        android:textColor="#EEEEEE"
-        android:layout_marginTop="10dp"/>
-
-    <!-- 分割线 -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="#444444"
-        android:layout_marginTop="12dp"/>
-
-    <!-- 订阅数据记录表【ID完全对应源码 tv_subscribe_record】 -->
-    <TextView
-        android:id="@+id/tv_subscribe_record"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="#88EE88"
-        android:textSize="10sp"
-        android:layout_marginTop="10dp"
-        android:gravity="start"/>
-
-</LinearLayout>
-
--- a/libgpsrelaysentinel/.gitignore
+++ b/libgpsrelaysentinel/.gitignore
--- a/libgpsrelaysentinel/build.gradle
+++ b/libgpsrelaysentinel/build.gradle
@@ -9,7 +9,7 @@ android {
    buildToolsVersion "30.0.3"

    defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
        targetSdkVersion 30
    }
    buildTypes {
@@ -21,10 +21,18 @@ android {
 }

 dependencies {
+	// 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+	// Gson
+	api 'com.google.code.gson:gson:2.8.9'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+	// 添加JSch依赖（SFTP核心，com.jcraft:jsch:0.1.54）
+	api 'com.jcraft:jsch:0.1.54'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.15.9'
-    api 'cc.winboll.studio:libappbase:15.15.21'
-	
+	api 'cc.winboll.studio:libaes:15.15.2'
+    api 'cc.winboll.studio:libappbase:15.15.11'
+
    api fileTree(dir: 'libs', include: ['*.jar'])
 }
--- a/gpsrelaysentinel/build.properties
+++ b/gpsrelaysentinel/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu May 07 10:59:47 CST 2026
+#Sat May 09 19:01:46 GMT 2026
 stageCount=27
-libraryProject=
+libraryProject=libwinboll
 baseVersion=15.11
 publishVersion=15.11.26
-buildCount=31
+buildCount=29
 baseBetaVersion=15.11.27
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ZhanGSKen	4708dd4426	<appbase>APK 15.20.0 release Publish.	2026-05-10 13:24:08 +08:00
ZhanGSKen	36e2ed0b48	配置统一应用资源配置版本基础产品线型号	2026-05-10 13:20:21 +08:00
LaizyBoy	3cfee1c4a8	添加应用共享用户ID配置 - AndroidManifest.xml: 添加 android:sharedUserId 和 android:sharedUserLabel - strings.xml: 新增 shared_user_label 字符串资源用于 sharedUserLabel 引用	2026-05-10 13:13:26 +08:00
LaizyBoy	24af31d51d	feat(dark mode): 统一深色模式适配，所有窗体使用attrs.xml主题属性 ## 核心变更 - 所有布局文件文本颜色统一使用 ?attr/* 主题属性引用 - 普通模式文本颜色: #000000 (黑色) - 暗黑模式文本颜色: #E0E0E0 (灰色) ## attrs.xml 属性统一 (libappbase) - 新增 AboutView 样式属性 (AboutView、AboutViewStyle) - 新增 ButtonStyle 样式属性 (buttonBackgroundColor、buttonTextColor) - 新增 DialogStyle 样式属性 (dialogBackgroundColor、dialogTextColor) - 新增通用窗体属性 (activityBackgroundColor、activityTextColor、toolbarBackgroundColor 等) - 移除 appbase/src/main/res/values/attrs.xml，合并到 libappbase ## styles.xml 主题配置 - 普通模式：背景色 #F5F5F5，文本色 #000000，工具栏/按钮背景色 #00B322 - 暗黑模式 (values-night)：背景色 #0D1B2A，文本色 #E0E0E0，工具栏/按钮背景色 #1E3A5F ## 布局适配 - 所有窗体使用 ?attr/activityBackgroundColor / ?attr/activityTextColor - 所有工具栏使用 ?attr/toolbarBackgroundColor - 所有按钮使用 ?attr/buttonBackgroundColor / ?attr/buttonTextColor - 所有对话框使用 ?attr/dialogBackgroundColor / ?attr/dialogTextColor - AboutView 使用 ?attr/aboutViewBackgroundColor 等 ## Java代码适配 - GlobalCrashReportView.java: 默认颜色改为黑色 (Color.BLACK) - CrashHandler.java: 添加 isNightMode 判断，动态设置文本颜色 - AboutView.java: 深色模式标题颜色调整为 gray_500	2026-05-10 07:22:06 +08:00
LaizyBoy	54f77a8d87	feat(AboutView): 适配深色模式 - 优化布局颜色：应用名改为colorPrimaryDark，分割线改为gray_400 - 功能项背景根据深色/浅色模式动态设置背景色(gray_800/white) - 功能项标题文字根据深色/浅色模式动态设置颜色(gray_100/gray_900)	2026-05-10 05:28:06 +08:00
LaizyBoy	69b18343c9	fix(libappbase): 强制Java 7语法兼容性 - 为libappbase模块添加compileOptions配置，确保源码和目标字节码均为Java 7 - 修复BackupUtils.java中HashMap<>泛型简写语法，改为完整类型声明new HashMap<String, String>()，兼容Java 7编译器	2026-05-10 05:20:54 +08:00
ZhanGSKen	e1bd959842	主流版本阶段性调整	2026-05-10 05:15:39 +08:00
ZhanGSKen	bad38e37ae	<libappbase>Library Release 15.15.23	2026-05-10 04:17:16 +08:00
ZhanGSKen	08eb360dbd	<appbase>APK 15.15.23 release Publish.	2026-05-10 04:07:17 +08:00
LaizyBoy	819018b149	fix: appbase 和 libappbase 模块 minSdkVersion 从 21 升级至 26 - appbase/build.gradle: minSdkVersion 21 → 26 - libappbase/build.gradle: minSdkVersion 21 → 26	2026-05-10 04:01:44 +08:00
LaizyBoy	6e6b262e86	feat(build): 升级 Gradle 构建脚本 Java 版本为 11 将 root build.gradle 中 JavaCompile 任务的 sourceCompatibility 和 targetCompatibility 从 VERSION_1_7 升级至 VERSION_11，与项目需求保持一致。	2026-05-10 03:54:30 +08:00
LaizyBoy	9665856b1b	简化应用启动窗口配置：移除分屏测试功能，MainActivity 设为唯一启动器 - 删除 MainActivityAlias 分屏窗口类及相关文件 - 移除 AndroidManifest 中的 MainActivityAlias activity 声明 - 从 activity_main.xml 移除分屏测试按钮 - 删除 MainActivity 中的 onSplitScreenMode() 方法 - 为 MainActivity 添加 LAUNCHER intent-filter，作为唯一启动主窗口	2026-05-10 03:50:12 +08:00
ZhanGSKen	052bbce839	Merge branch 'winboll' into appbase	2026-05-10 03:15:46 +08:00
LaizyBoy	90102f4eea	refactor(winboll): 重命名菜单项为 WinBoLLLibraryActivity	2026-05-10 03:06:43 +08:00
ZhanGSKen	759a08cec9	更换类库窗口标识名称	2026-05-10 03:03:00 +08:00
LaizyBoy	42cc7a2822	feat(winboll): 添加 UnitTest 菜单项跳转到 LibraryActivity - 在 UnitTest 菜单组添加 LibraryActivity 菜单项 - 实现 MainActivity 中菜单项点击事件处理 - 更新 library.xml 布局显示类全名标识 - buildCount 更新为 25	2026-05-10 02:55:37 +08:00
LaizyBoy	c9c95d6ab0	refactor(gradle): 强制项目使用Java 7语法并统一API适配范围 - build.gradle: subprojects Java版本从11降级为1.7 - libwinboll/build.gradle: minSdkVersion从21统一为26 - build.properties: 编译计数器自动递增(buildCount: 23→24)	2026-05-09 22:02:59 +08:00
ZhanGSKen	bc9bd47daa	添加类库模块，便于调试类库编译配置。	2026-05-09 21:17:23 +08:00
ZhanGSKen	4bec8c3e9e	忽略编译问题，暂缓新功能叠加。	2026-05-09 21:16:44 +08:00
ZhanGSKen	e726c9d435	<libappbase>Library Release 15.15.22	2026-05-09 20:50:14 +08:00
ZhanGSKen	5277913606	<appbase>APK 15.15.22 release Publish.	2026-05-09 20:49:55 +08:00
LaizyBoy	c1bd31df2f	refactor(libappbase): 完全重构 LogUtils 日志工具类 - 重构目录结构，按功能模块化拆分初始化、私有工具、日志级别等方法 - 补全所有日志重载方法（Error/Warn/Info/Debug/Verbose） - 优化日志文件裁剪逻辑，保留最新3MB内容 - 新增TAG自动扫描管理机制 - 替换所有内部 LogUtils 调用为 android.util.Log，避免递归嵌套 - 严格遵循 Java 7 语法规范（final 参数、传统 try-catch） - 优化异常/堆栈格式化输出	2026-05-09 20:43:17 +08:00