Merge remote-tracking branch 'origin/winboll' into originmaster

.gitignore

@@ -97,5 +97,10 @@ lint-results.html
 ## WinBoLL 基础应用(避免上传敏感配置)
 /winboll.properties
 /local.properties
+
+## WinBoLL 衍生应用，
+## 外派类型类库应用需要注释掉以下部分，以便部署通用类库编译配置。
+## APPBase,AES需要上传以下两种配置。
+## OriginMaster 仓库合并各类分支需要忽略的文件修改
 /settings.gradle
 /gradle.properties

.winboll/winboll_app_build.gradle

@@ -66,8 +66,8 @@ android {
     }
 	
 	compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     // 应用包输出配置
@@ -101,15 +101,12 @@ android {
             
             // 创建 WinBoLL Studio 发布接口文件夹
             File fWinBoLLStudioDir = file("/sdcard/WinBoLLStudio/APKs");
-			// 如果配置了APK接口文件夹路径，就设置应用APK输出文件夹为接口文件夹。
-			if(winbollProps != null && winbollProps['APKOutputPath'] != null ) {
-                fWinBoLLStudioDir = file(winbollProps['APKOutputPath']);
-			}
-			
             if(!fWinBoLLStudioDir.exists()) {
-                println "[ WinBoLLStudio ] : " + fWinBoLLStudioDir.getAbsolutePath() + " Folder does not exist."
+                //fWinBoLLStudioDir.mkdirs();
-                println '[ WinBoLLStudio ] : The APKOutputPath property is not defined in winboll.properties, please configure APK output folder first.'
+                // 如果没有发布接口文件就不用进行APK发布和源码管理操作
-			} else {
+                // 当前编译环境不是 WinBoLL 主机, 以下将忽略APK发布和源码管理操作。
+                println 'The current compilation environment is not in WinBoLL host, and the following APK publishing and source management operations will be ignore.'
+            } else {
                 /// WINBOLL 主机的 APK 发布和源码管理操作 ///
                 variant.getAssembleProvider().get().doFirst {
                     /* 后期管理预留代码 */

README.md

@@ -1,105 +1,104 @@
-# WinBoLL 源生态计划项目说明书
+WinBoLL 源生态计划项目说明书
  
-## 一、项目概述
+一、项目概述
  
-### 1. 核心定位
+1. 核心定位
-WinBoLL 手机源码计划，旨在通过核心项目 WinBoLL 构建手机端与服务器端的 Android 项目的开发源码生态。实现手机与服务器的源码的联合开发。
  
-### 2. 仓库架构
+【OriginMaster】WinBoLL 源生态计划，旨在通过核心项目 WinBoLL 联动系列开发库，构建手机端 Android 项目开发与多端编译同步的完整生态，实现手机与电脑的源码同步开发。
-#### **仓库类型：功能说明**
-☆ 基础项目分支 WinBoLL：手机端安卓应用开发基础模板。
-☆ 应用项目分支 APPBase、AES、PowerBell、Positions**：安卓应用单一管理系列项目。
-☆ 源码汇总管理 OriginMaster**：各类分支源码合并存档，不适宜作为开发库使用。
  
-### 3. 源码合并管理推送路线图
+2. 仓库架构
-⚠️ **注意**：仅仅展示不同应用模块源码的综合管理路线。分支合并操作时，必须具备 Git 管理经验。
  
-★ WinBoLL → APPBase → OriginMaster
+仓库类型 包含仓库 功能说明 
-★ WinBoLL → AES → OriginMaster
+开发库 WinBoLL、APPBase、AES、PowerBell、Positions 核心开发依赖库，其中 WinBoLL 可作为应用开发的基础继承模板 
-★ WinBoLL → PowerBell → OriginMaster
+分支汇总存档库 OriginMaster 仅用于汇总各开发库分支，不适宜作为开发库克隆使用，非应用开发基础库 
-★ WinBoLL → Positions → OriginMaster
  
-## 二、WinBoLL 项目核心信息
+3. 源码推送路径
  
-### 1. 项目简介
+- WinBoLL → APPBase → OriginMaster
-☆ WinBoLL 项目是为手机端开发Android 项目的需求而设计的项目。
+- WinBoLL → AES → OriginMaster
+- WinBoLL → PowerBell → OriginMaster
+- WinBoLL → Positions → OriginMaster
  
-### 2. 官方资源
+二、WinBoLL APP 核心信息
-#### ☆ 官方网站**：https://www.winboll.cc/
-#### ☆ 源码地址：
-★ Gitea：https://gitea.winboll.cc/Studio/WinBoLL.git
-★ GitHub：https://github.com/ZhanGSKen/WinBoLL.git
-★ 码云：https://gitee.com/zhangsken/winboll.git
  
-## 三、应用编译环境检查问题
+1. 项目简介
-### 核心判断条件：
-☆ WinBoLL 项目以文件夹 `"/sdcard/WinBoLLStudio/APKs"` 是否存在为判断环境编译输出条件，因为编译输出的APK文件需要一个可供保存的环境。
  
-☆ 文件夹"/sdcard/WinBoLLStudio/APKs" 目录条件设置方法：
+WinBoLL Studio Android 应用开源项目，专注于手机端 Android 开发与多端编译同步。
-***Linux 服务器端方面***：建立 `/sdcard/WinBoLLStudio/APKs` 目录即可。
-***手机开发端方面***：建立 `"/sdcard/WinBoLLStudio/APKs"` 目录(即 `"/storage/emulated/0/WinBoLLStudio/APKs"` 目录) 即可。
  
-## 四、前置条件
+2. 官方资源
  
-### 1. WinBoLL APP 开发环境配置介绍
+- 官方网站：https://www.winboll.cc/
-####  WinBoLL APK 编译输出内容包括：
+- 源码地址：
-☆ "/sdcard/WinBoLLStudio/APKs"` 目录内的所有应用分支的 APK 文件。
+- Gitea：https://gitea.winboll.cc/Studio/WinBoLL.git
-winboll.properties 文件的 APKOutputPath 属性可配置这个 APK 输出目录的路径。
+- GitHub：https://github.com/ZhanGSKen/WinBoLL.git
-☆ "/sdcard/AppProjects/app.apk"文件。
+- 码云：https://gitee.com/zhangsken/winboll.git
-winboll.properties 文件的 ExtraAPKOutputPath 属性可配置这个 APK 额外输出文件的路径
+- 托管类库源码：
-#### WinBoLL APK 源码命名空间规范
+- APPBase（jitpack.io）：https://github.com/ZhanGSKen/APPBase.git
-☆ WinBoLL 项目使用 "cc.winboll.studio" 作为源码命名空间。在此命名空间下进行源码定义。
+- AES（jitpack.io）：https://github.com/ZhanGSKen/AES.git
  
-## 五、核心需求规划
+三、通用特征文件夹前置（/sdcard）
  
-### 1. WinBoLL 应用安全验证需求
+- Linux 系统文件夹直接使用  /sdcard 。
-#### ☆ 支持访问 https://console.winboll.cc/ 服务器以校验应用包签名与版本。
+- 手机 SD 卡存储（ /storage/emulated/0 ）挂载的别名也可为  /sdcard 。
  
-### 2. 手机端源码开发管理需求
+四、前置条件
-#### ☆ 支持切换不同 WinBoLL 分支，以开发不同安卓应用。
  
-## 六、编译与使用指南
+1. WinBoLL-APP 配置
  
-### 1. 项目初始化（必须）
+- APK 编译输出目录： /sdcard/WinBoLLStudio/APKs/ ，以及  /sdcard/AppProjects/ （命名为  app.apk ）
-#### 1.  复制 `settings.gradle-demo` 为 `settings.gradle`。编辑 `settings.gradle` 文件内容，取消对应项目模块注释。
+- 签名与命名空间：支持应用签名验证定制化，与衍生 APP 共享  cc.winboll.studio  命名空间
-#### 2.  复制 `gradle.properties-androidx-demo` (Android X 项目) 或 `gradle.properties-android-demo` (基本 Android 项目) 为 `gradle.properties`。
-#### 3.  复制（可选）`local.properties-demo` 为 `local.properties`，编辑 `local.properties` 文件内容，配置 Android SDK 目录。
-#### 4.  **签名设置**：
-    ☆ **调试编译秘钥制作**：使用 Termux 应用终端，cd 进入 GenKeyStore 目录，运行 `bash gen_debug_keystore.sh` 脚本即可生成应用调试秘钥。
-    ☆  **应用秘钥配置方法**：拷贝调试编译秘钥制作生成的 `appkey.jks` 与 `appkey.keystore` 文件到项目根目录即可。
  
-## 七、应用编译命令介绍
+五、核心需求规划
  
-### （1）类库型模块配置要点
+1. 主机端需求
-#### 1.  **优先修改配置文件**：优先修改应用测试项目（目录为 `"<WinBoLl根目录>/<类库测试应用>/"`）内 `build.properties` 文件，设置对应的类库项目名称：`libraryProject=<类库项目模块名>`。
-#### 2.  **编译优先启动步骤**：使用 Termux 应用，进入 `"<WinBoLl根目录>"`，运行 `$ bash .winboll/bashPublishAPKAddTag.sh <类库测试项目模块名>` 命令。运行后可生成测试项目与类库项目的编译参数文件 `build.properties`。生成的 `build.properties` 文件有两份，一份在测试项目模块的文件夹内，一份在类库项目本身的模块文件夹内。
-#### 3.  **最后类库编译发布步骤**：使用 Termux 应用，进入 `"<WinBoLl根目录>"`，运行 `$ bash .winboll/bashPublishLIBAddTag.sh <类库项目模块名>` 命令。运行后可发布至 WinBoLL Nexus Maven 库、本地 maven 目录或者是通用默认的 Gradle Maven 库。
  
-### （2）单一应用型模块与类库测试型模块配置要点
+- 支持  winboll.cc  域名的用户注册登录服务
-#### ☆ APK 编译方法：
+- 支持  https://console.winboll.cc/api  访问
-使用 Termux 应用，进入 `"<WinBoLl根目录>"`，运行 `$ bash .winboll/bashPublishAPKAddTag.sh <应用项目模块名>`。
-#### ☆ 运行后的 APK 输出路径：
-★ 默认路径 (`$ bash gradlew assembleBetaDebug` 任务)：APK 在 `/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/debug/` 目录。
-★ 默认路径 (`$ bash assembleStageRelease` 任务)：APK 在 `/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/` 目录。
-★ 额外输出路径：(假设 `winboll.properties` 文件已配置 `ExtraAPKOutputPath` 属性) 输出至 `ExtraAPKOutputPath` 属性配置的目录下。
  
-### （3）手机端应用调试命令介绍
+2. APP 端需求
-#### ☆ Beta 渠道调试命令
-$bash gradlew assembleBetaDebug
  
-#### ☆ Stage 渠道调试命令
+- 实现手机端 Android 应用开发与管理功能
-$bash gradlew assembleStageDebug
  
-### （4）服务器端开发命令介绍
+六、编译与使用指南
-##### ☆ Stage 渠道应用发布命令为：
-（"<WinBoLl根目录>/settings.gradle"文件需要配置编译模块开启参数，拷贝 settings.gradle-demo 为 settings.gradle 文件取消对应的分支配置部分即可。）
-$bash .winboll/bashPublishAPKAddTag.sh <应用项目模块名> 
-或者是
-$bash gradlew assembleStageRelease
  
+1. 项目初始化（必须）
  
-## 八、WinBoLL 应用 APK 版本号命名规则
+1. 复制  settings.gradle-demo  为  settings.gradle ，取消对应项目模块注释
-### ☆ Stage 渠道：
+2. 复制  gradle.properties-androidx-demo  或  gradle.properties-android-demo  为  gradle.properties 
-#### V<应用开发环境编号><应用功能变更号><应用调试阶段号> （示例： APPBase_15.7.0 ）
+3. （可选）复制  local.properties-demo  为  local.properties ，配置 Android SDK 目录
-### ☆ Beta 渠道：
+4. 签名设置：
-#### V<应用开发环境编号><应用功能变更号><应用调试阶段号>-beta<调试编译计数>_<调试编译时间(分钟+秒钟)> （示例： APPBase_15.9.6-beta8_5413 ）
+- 调试编译：进入 GenKeyStore 目录执行  bash gen_debug_keystore.sh 
+- 非必须：clone keystore 模块，拷贝  appkey.jks  与  appkey.keystore  到项目根目录
+ 
+2. 编译命令
+ 
+（1）类库型项目
+ 
+1. 修改测试项目  build.properties ，设置  libraryProject=<类库项目模块名> 
+2. 编译测试项目： bash .winboll/bashPublishAPKAddTag.sh <应用项目模块名> 
+3. 编译类库项目： bash .winboll/bashPublishLIBAddTag.sh <类库项目模块名> （发布至 WinBoLL Nexus Maven 库）
+ 
+（2）应用型项目
+ 
+- 编译命令： bash .winboll/bashPublishAPKAddTag.sh <应用项目模块名> 
+ 
+（3）调试编译
+ 
+- Beta 调试： bash gradlew assembleBetaDebug 
+- Stage 调试： bash gradlew assembleStageDebug
+ 
+（4）发布编译
+ 
+- Stage 发布：bash .winboll/bashPublishAPKAddTag.sh <应用项目模块名> 
+             或者执行  bash gradlew assembleStageRelease
+ 
+3. 编译输出路径
+ 
+- 默认路径(assembleBetaDebug任务)： /sdcard/WinBoLLStudio/APKs/<项目根目录名称>/debug/ 
+- 默认路径(assembleStageRelease任务)： /sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/ 
+- 额外路径：若  winboll.properties  配置  ExtraAPKOutputPath ，APK 同步拷贝至该ExtraAPKOutputPath路径
+ 
+4. 版本号命名规则
+ 
+- Stage 渠道： V<应用开发环境编号><应用功能变更号><应用调试阶段号> （示例： APPBase_15.7.0 ）
+- Beta 渠道： V<应用开发环境编号><应用功能变更号><应用调试阶段号>-beta<调试编译计数>_<调试编译时间(分钟+秒钟)> （示例： APPBase_15.9.6-beta8_5413 ）

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Apr 25 04:16:42 HKT 2026
+#Tue Jan 13 03:37:56 HKT 2026
-stageCount=10
+stageCount=2
 libraryProject=libaes
 baseVersion=15.15
-publishVersion=15.15.9
+publishVersion=15.15.1
 buildCount=0
-baseBetaVersion=15.15.10
+baseBetaVersion=15.15.2

aes/src/main/AndroidManifest.xml

@@ -3,9 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="cc.winboll.studio.aes">
 
-    <!-- 对正在运行的应用重新排序 -->
-    <uses-permission android:name="android.permission.REORDER_TASKS"/>
-
     <application
         android:name=".App"
         android:allowBackup="true"

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

@@ -1,63 +1,44 @@
 package cc.winboll.studio.aes;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
-import androidx.appcompat.widget.Toolbar;
+import android.widget.Toolbar;
 import cc.winboll.studio.aes.R;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.models.APPInfo;
 import cc.winboll.studio.libappbase.views.AboutView;
 
 /**
  * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/01/13 11:25
+ * @Date 2026/01/11 15:16
  * @Describe 应用介绍窗口
  */
-public class AboutActivity extends BaseWinBoLLActivity {
+public class AboutActivity extends Activity {
 
     public static final String TAG = "AboutActivity";
 
-	private Toolbar mToolbar;
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
 
 		// 设置工具栏
-        initToolbar();
+        Toolbar toolbar = findViewById(R.id.toolbar);
+		setActionBar(toolbar);
+        getActionBar().setSubtitle(TAG);
+        getActionBar().setDisplayHomeAsUpEnabled(true);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    finish(); // 点击导航栏返回按钮，触发 finish()
+                }
+            });
 
 		AboutView aboutView = findViewById(R.id.aboutview);
 		aboutView.setAPPInfo(genDefaultAppInfo());
     }
 
-	private void initToolbar() {
-        LogUtils.d(TAG, "initToolbar() 开始初始化");
-        mToolbar = findViewById(R.id.toolbar);
-        if (mToolbar == null) {
-            LogUtils.e(TAG, "initToolbar() | Toolbar未找到");
-            return;
-        }
-        setSupportActionBar(mToolbar);
-        mToolbar.setSubtitle(getTag());
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					LogUtils.d(TAG, "导航栏 点击返回按钮");
-					WinBoLLActivityManager.getInstance().resumeActivity(MainActivity.class);
-					WinBoLLActivityManager.getInstance().finish(AboutActivity.this);
-				}
-			});
-        LogUtils.d(TAG, "initToolbar() 配置完成");
-    }
-
 	private APPInfo genDefaultAppInfo() {
         LogUtils.d(TAG, "genDefaultAppInfo() 调用");
         String branchName = "aes";

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

@@ -1,45 +0,0 @@
-package cc.winboll.studio.aes;
-
-import android.app.Activity;
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libaes.models.AESThemeBean;
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/01/13 16:35
- * @Describe BaseWinBollActivity 【继承AppCompatActivity，保留核心能力，不额外暴露方法】
- * 继承链路：BaseWinBoLLActivity → AppCompatActivity → FragmentActivity，AppCompat能力天然继承可用
- */
-public abstract class BaseWinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
-    public static final String TAG = "BaseWinBoLLActivity";
-
-    protected volatile AESThemeBean.ThemeType mThemeType;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        mThemeType = AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
-        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
-        super.onCreate(savedInstanceState);
-        WinBoLLActivityManager.getInstance().add(this);
-    }
-
-    @Override
-    protected void onDestroy() {
-        WinBoLLActivityManager.getInstance().registeRemove(this);
-        super.onDestroy();
-    }
-
-    // 子类必须实现getTag()，确保唯一标识
-    @Override
-    public abstract String getTag();
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-}
-

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

@@ -30,7 +30,7 @@ import cc.winboll.studio.libappbase.LogUtils;
 import com.a4455jkjh.colorpicker.ColorPickerDialog;
 import java.util.ArrayList;
 
-public class MainActivity extends DrawerFragmentActivity {
+public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
 
 
     public static final String TAG = "MainActivity";
@@ -38,6 +38,11 @@ public class MainActivity extends DrawerFragmentActivity {
     TestAButtonFragment mTestAButtonFragment;
     TestViewPageFragment mTestViewPageFragment;
 
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
     @Override
     public String getTag() {
         return TAG;
@@ -183,9 +188,8 @@ public class MainActivity extends DrawerFragmentActivity {
             Intent intent = new Intent(this, SettingsActivity.class);
             startActivity(intent);
         } else if (nItemId ==  R.id.item_about) {
-//            Intent intent = new Intent(this, AboutActivity.class);
+            Intent intent = new Intent(this, AboutActivity.class);
-//            startActivity(intent);
+            startActivity(intent);
-			WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, AboutActivity.class);
         }
 
 

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

@@ -55,6 +55,6 @@ public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivi
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        WinBoLLActivityManager.getInstance().finish(this);
+        WinBoLLActivityManager.getInstance().registeRemove(this);
     }
 }

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

@@ -6,7 +6,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<cc.winboll.studio.libaes.views.ASupportToolbar
+	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 28 17:08:30 HKT 2026
+#Tue Jan 13 03:23:34 HKT 2026
-stageCount=22
+stageCount=5
 libraryProject=libappbase
 baseVersion=15.15
-publishVersion=15.15.21
+publishVersion=15.15.4
 buildCount=0
-baseBetaVersion=15.15.22
+baseBetaVersion=15.15.5

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">APPBase+</string>
+    <string name="app_name">AppBase+</string>
 
 </resources>

appbase/src/main/AndroidManifest.xml

@@ -16,17 +16,6 @@
             android:label="@string/app_name"
             android:exported="true"
             android:resizeableActivity="true"
-            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>
@@ -41,17 +30,6 @@
 
         </activity>
 
-        <activity
-            android:name=".Main2Activity"
-            android:label="@string/app_name"
-            android:exported="true"
-            android:resizeableActivity="true"
-            android:launchMode="singleTop"
-            android:taskAffinity="cc.winboll.studio.appbase.Main2Activity"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
-
-        </activity>
-
         <activity android:name=".GlobalApplication$CrashActivity"/>
 
         <meta-data

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

@@ -23,8 +23,17 @@ public class AboutActivity extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
 
+		// 设置工具栏
         Toolbar toolbar = findViewById(R.id.toolbar);
-        setActionBar(toolbar);
+		setActionBar(toolbar);
+        getActionBar().setSubtitle(TAG);
+        getActionBar().setDisplayHomeAsUpEnabled(true);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    finish(); // 点击导航栏返回按钮，触发 finish()
+                }
+            });
 
 		AboutView aboutView = findViewById(R.id.aboutview);
 		aboutView.setAPPInfo(genDefaultAppInfo());
@@ -34,10 +43,10 @@ public class AboutActivity extends Activity {
         LogUtils.d(TAG, "genDefaultAppInfo() 调用");
         String branchName = "appbase";
         APPInfo appInfo = new APPInfo();
-        appInfo.setAppName("APPBase");
+        appInfo.setAppName(getString(R.string.app_name));
         appInfo.setAppIcon(R.drawable.ic_winboll);
         appInfo.setAppDescription(getString(R.string.app_description));
-        appInfo.setAppGitName("WinBoLL");
+        appInfo.setAppGitName("APPBase");
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(branchName);
         appInfo.setAppGitAPPSubProjectFolder(branchName);

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

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

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

@@ -1,20 +0,0 @@
-package cc.winboll.studio.appbase;
-
-import android.os.Bundle;
-import android.widget.Toolbar;
-import cc.winboll.studio.appbase.R;
-
-public class Main2Activity extends MainActivity {
-
-    public static final String TAG = "Main2Activity";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main2);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        if (toolbar != null) {
-            setActionBar(toolbar);
-        }
-    }
-}

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

@@ -10,7 +10,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.appbase.model.TestBean;
 import cc.winboll.studio.libappbase.LogActivity;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.ToastUtils;
@@ -37,29 +36,14 @@ public class MainActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        //ToastUtils.show("onCreate"); // 显示 Activity 创建提示（调试用）
+        ToastUtils.show("onCreate"); // 显示 Activity 创建提示（调试用）
         setContentView(R.layout.activity_main); // 加载主界面布局
 
         // 初始化 Toolbar 并设置为 ActionBar
         mToolbar = findViewById(R.id.toolbar);
         setActionBar(mToolbar); // 将 Toolbar 替代系统默认 ActionBar
-		
-		initTestData();
     }
 
-	void initTestData() {
-		TestBean bean1 = new TestBean();
-		bean1.setTestNum1(456);
-		TestBean.saveBeanToFile(getFilesDir().getAbsolutePath() + getTestBeanRelativePath(), bean1);
-		TestBean bean2 = new TestBean();
-		bean2.setTestNum1(789);
-		TestBean.saveBeanToFile(getExternalFilesDir(null).getAbsolutePath() + getTestBeanRelativePath(), bean2);
-	}
-	
-	String getTestBeanRelativePath() {
-		return "/BaseBaen/"+TestBean.class.getName()+".json";
-	}
-
     /**
      * 创建菜单时回调（加载工具栏菜单）
      * 初始化 ActionBar 菜单，加载自定义菜单布局
@@ -103,17 +87,14 @@ public class MainActivity extends Activity {
         }
     }
 
-    public void onLogTestNewTask(View view) {
-        LogActivity.startLogActivity(this, true);
-    }
-
     /**
      * 日志测试按钮点击事件（打开日志查看界面）
      * 启动 LogActivity，用于查看应用运行日志
      * @param view 触发事件的 View（对应布局中的日志测试按钮）
      */
     public void onLogTest(View view) {
-        LogActivity.startLogActivity(this, false);
+        // 启动日志查看 Activity（通过静态方法传入上下文，简化跳转逻辑）
+        LogActivity.startLogActivity(this);
     }
 
     /**
@@ -157,39 +138,10 @@ public class MainActivity extends Activity {
     }
 	
 	public void onAboutActivity(View view) {
-        LogUtils.d(TAG, "onAboutActivity() 调用");
+        LogUtils.d(TAG, "startAboutActivity() 调用");
         Intent aboutIntent = new Intent(getApplicationContext(), AboutActivity.class);
         startActivity(aboutIntent);
-    }
+        LogUtils.d(TAG, "startAboutActivity: 关于页面已启动");
-
-	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() 多开窗口按钮已点击");
-        ToastUtils.show("多开窗口：已启动新窗口");
-        android.content.Intent intent = new android.content.Intent(this, Main2Activity.class);
-        intent.setFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
-        LogUtils.d(TAG, "onMultiInstance() 准备启动Main2Activity");
-        startActivity(intent);
-        LogUtils.d(TAG, "onMultiInstance() Main2Activity已启动");
     }
 }
 

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);
-    }
-}

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

@@ -1,154 +0,0 @@
-package cc.winboll.studio.appbase.model;
-
-import android.util.JsonReader;
-import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
-import cc.winboll.studio.libappbase.LogUtils;
-import java.io.IOException;
-
-/**
- * 测试实体类
- * 继承BaseBean实现JSON序列化/反序列化能力，提供基础int类型属性的封装与数据持久化支持
- * 适配Java7语法，遵循BaseBean统一的反射识别、JSON读写规范
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/01/31 19:16:00
- * @LastEditTime 2026/02/01 10:46:00
- */
-public class TestBean extends BaseBean {
-
-    // ====================================== 常量定义 ======================================
-    /** 当前类的日志 TAG（用于调试输出） */
-    public static final String TAG = "TestBean";
-
-    // ====================================== 成员属性 ======================================
-    /**
-     * 测试数字属性（默认值：123）
-     * 基础int类型属性，用于测试BaseBean的JSON序列化/反序列化能力
-     */
-    private int testNum1;
-
-    // ====================================== 构造方法 ======================================
-    /**
-     * 无参构造器（默认初始化）
-     * 给testNum1赋值默认值123，满足反射实例化、JSON解析的无参构造要求
-     */
-    public TestBean() {
-        this.testNum1 = 123;
-        LogUtils.d(TAG, "TestBean无参构造器调用，testNum1默认初始化值：" + this.testNum1);
-    }
-
-    /**
-     * 有参构造器（自定义初始化）
-     * @param testNum1 测试数字初始值
-     */
-    public TestBean(int testNum1) {
-        this.testNum1 = testNum1;
-        LogUtils.d(TAG, "TestBean有参构造器调用，传入testNum1：" + testNum1);
-    }
-
-    // ====================================== Get/Set 方法 ======================================
-    /**
-     * 设置测试数字属性值
-     * @param testNum1 待设置的int类型值
-     */
-    public void setTestNum1(int testNum1) {
-        LogUtils.d(TAG, "setTestNum1调用，传入参数：" + testNum1);
-        this.testNum1 = testNum1;
-    }
-
-    /**
-     * 获取测试数字属性值
-     * @return 当前testNum1的int类型值
-     */
-    public int getTestNum1() {
-        LogUtils.d(TAG, "getTestNum1调用，返回值：" + this.testNum1);
-        return testNum1;
-    }
-
-    // ====================================== 重写父类BaseBean方法 ======================================
-    /**
-     * 重写父类方法：获取当前类的全限定名
-     * 用于BaseBean反射识别、类名匹配等统一逻辑
-     * @return 类全限定名（cc.winboll.studio.appbase.model.TestBean）
-     */
-    @Override
-    public String getName() {
-        LogUtils.d(TAG, "getName方法调用，返回类全限定名：" + TestBean.class.getName());
-        return TestBean.class.getName();
-    }
-
-    /**
-     * 重写父类方法：将当前对象序列化为JSON（持久化存储专用）
-     * 遵循BaseBean规范，先执行父类序列化逻辑，再处理子类专属字段
-     * @param jsonWriter JSON写入器（外部传入的JSON流操作实例）
-     * @throws IOException JSON写入异常（流关闭、格式错误等）
-     */
-    @Override
-    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
-        LogUtils.d(TAG, "writeThisToJsonWriter调用，传入参数JsonWriter：" + jsonWriter);
-        // 执行父类公共字段的序列化逻辑
-        super.writeThisToJsonWriter(jsonWriter);
-        // 序列化子类专属字段testNum1
-        jsonWriter.name("testNum1").value(this.getTestNum1());
-        LogUtils.d(TAG, "writeThisToJsonWriter执行完成，已序列化testNum1：" + this.getTestNum1());
-    }
-
-    /**
-     * 重写父类方法：从JSON字段初始化当前对象属性（解析JSON专用）
-     * 先让父类处理公共字段，再匹配子类专属字段，不匹配则返回false跳过
-     * @param jsonReader JSON读取器（外部传入的JSON流操作实例）
-     * @param name 当前解析的JSON字段名
-     * @return true-字段解析成功；false-字段不匹配，需跳过/父类处理
-     * @throws IOException JSON读取异常（字段类型不匹配、流中断等）
-     */
-    @Override
-    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
-        LogUtils.d(TAG, "initObjectsFromJsonReader调用，传入参数：name=" + name + "，JsonReader=" + jsonReader);
-        // 父类优先处理公共字段，处理成功则直接返回
-        if (super.initObjectsFromJsonReader(jsonReader, name)) {
-            LogUtils.d(TAG, "initObjectsFromJsonReader：字段" + name + "由父类BaseBean处理成功");
-            return true;
-        }
-        // 解析子类专属字段
-        if ("testNum1".equals(name)) {
-            this.setTestNum1(jsonReader.nextInt());
-            LogUtils.d(TAG, "initObjectsFromJsonReader：解析testNum1成功，值为：" + this.getTestNum1());
-        } else {
-            LogUtils.w(TAG, "initObjectsFromJsonReader：字段" + name + "不匹配，返回false跳过解析");
-            // 字段不匹配，返回false表示跳过
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 重写父类方法：从JSON读取器完整解析并初始化当前对象（JSON解析入口）
-     * 负责JSON对象的开始/结束标识处理，遍历所有字段并调用字段解析方法
-     * 严格遵循writeThisToJsonWriter的序列化结构，保证解析一致性
-     * @param jsonReader JSON读取器（外部传入的JSON流操作实例）
-     * @return 解析后的当前TestBean实例（支持链式调用）
-     * @throws IOException JSON解析异常（格式错误、字段缺失、流异常等）
-     */
-    @Override
-    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
-        LogUtils.d(TAG, "readBeanFromJsonReader调用，传入参数JsonReader：" + jsonReader);
-        // 开始解析JSON对象，与序列化结构保持一致
-        jsonReader.beginObject();
-        // 遍历所有JSON字段
-        while (jsonReader.hasNext()) {
-            String fieldName = jsonReader.nextName();
-            LogUtils.d(TAG, "readBeanFromJsonReader：开始解析字段，fieldName=" + fieldName);
-            // 解析字段，不匹配则跳过该值
-            if (!this.initObjectsFromJsonReader(jsonReader, fieldName)) {
-                jsonReader.skipValue();
-                LogUtils.w(TAG, "readBeanFromJsonReader：字段" + fieldName + "解析失败，已跳过该值");
-            }
-        }
-        // 结束JSON对象解析，必须调用避免流异常
-        jsonReader.endObject();
-        LogUtils.d(TAG, "readBeanFromJsonReader执行完成，JSON解析结束，当前TestBean实例testNum1：" + this.getTestNum1());
-        // 返回当前实例，支持链式调用
-        return this;
-    }
-}
-

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

@@ -23,18 +23,6 @@
 			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="@android:color/white"
-				android:background="#81C7F5"
-				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"
@@ -59,18 +47,6 @@
 				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="@android:color/white"
-				android:background="#81C7F5"
-				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"
@@ -86,25 +62,13 @@
 			<Button
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="分屏测试"
+				android:text="关于应用"
 				android:textSize="16sp"
 				android:textColor="@android:color/white"
 				android:background="#81C7F5"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
-				android:onClick="onSplitScreenMode"
+				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="@android:color/white"
-				android:background="#81C7F5"
-				android:paddingVertical="12dp"
-				android:layout_marginHorizontal="24dp"
-				android:onClick="onMultiInstance"
 				android:layout_margin="10dp"/>
 			
 		</LinearLayout>
@@ -112,3 +76,4 @@
 	</ScrollView>
 
 </LinearLayout>
+

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">APPBase</string>
+    <string name="app_name">AppBase</string>
     <string name="app_description">WinBoLL 安卓手机端安卓应用开发基础类库。</string>
     <string name="app_normal">Click here is switch to Normal APP</string>
     <string name="app_debug">Click here is switch to APP DEBUG</string>

build.gradle

@@ -1,15 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        maven { url 'https://maven.aliyun.com/repository/public/' } 
-        maven { url 'https://maven.aliyun.com/repository/google/' }
-        maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
-        maven { url 'https://dl.bintray.com/ppartisan/maven/' }
-        maven { url "https://clojars.org/repo/" }
-        maven { url "https://jitpack.io" }
-        mavenCentral()
-        google()
-		
         mavenLocal {
             // 设置本地Maven仓库路径
             url 'file:///sdcard/.m2/repository/'
@@ -20,6 +11,19 @@ buildscript {
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }
         // "WinBoLL Snapshot"
         maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
+        
+        maven { url 'https://maven.aliyun.com/repository/public/' } 
+        maven { url 'https://maven.aliyun.com/repository/google/' }
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
+        maven { url 'https://dl.bintray.com/ppartisan/maven/' }
+        maven { url "https://clojars.org/repo/" }
+        maven { url "https://jitpack.io" }
+        mavenCentral()
+        google()
+        //println "mavenLocal : ==========="
+        //println mavenLocal().url
+        //println "mavenLocal : ==========="
+        //mavenLocal()
     }
     dependencies {
 	    // 适配MIUI12
@@ -31,15 +35,6 @@ buildscript {
 
 allprojects {
     repositories {
-        maven { url 'https://maven.aliyun.com/repository/public/' } 
-        maven { url 'https://maven.aliyun.com/repository/google/' }
-        maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
-        maven { url 'https://dl.bintray.com/ppartisan/maven/' }
-        maven { url "https://clojars.org/repo/" }
-        maven { url "https://jitpack.io" }
-        mavenCentral()
-        google()
-		
         mavenLocal {
             // 设置本地Maven仓库路径
             url 'file:///sdcard/.m2/repository/'
@@ -50,6 +45,19 @@ allprojects {
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }
         // "WinBoLL Snapshot"
         maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
+        
+        maven { url 'https://maven.aliyun.com/repository/public/' } 
+        maven { url 'https://maven.aliyun.com/repository/google/' }
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
+        maven { url 'https://dl.bintray.com/ppartisan/maven/' }
+        maven { url "https://clojars.org/repo/" }
+        maven { url "https://jitpack.io" }
+        mavenCentral()
+        google()
+        //println "mavenLocal : ==========="
+        //println mavenLocal().url
+        //println "mavenLocal : ==========="
+        //mavenLocal()
     }
     ext {
         // 定义全局变量，常用于版本管理

gpsrelaysentinel/README.md

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

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'])
-}

gpsrelaysentinel/build.properties

@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Thu May 07 15:04:39 CST 2026
-stageCount=27
-libraryProject=
-baseVersion=15.11
-publishVersion=15.11.26
-buildCount=33
-baseBetaVersion=15.11.27

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

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

gpsrelaysentinel/src/main/AndroidManifest.xml

@@ -1,62 +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"/>
-
-        <activity android:name=".AboutActivity"/>
-
-    </application>
-
-</manifest>

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

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

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();
-        }
-    }
-}

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;
-    }
-}
-

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;
-    }
-}
-

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;
-    }
-}
-

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

@@ -1,375 +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 android.view.Menu;
-import android.view.MenuItem;
-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);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_main, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.action_about) {
-            startActivity(new Intent(this, AboutActivity.class));
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    /**
-     * GPS服务开关监听
-     */
-    private void initSwitchEvent() {
-        mSwitchService.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-				@Override
-				public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-					if (isChecked) {
-						if (hasLocationPermission()) {
-							startGpsService();
-						} else {
-							requestLocationPermission();
-							mSwitchService.setChecked(false);
-						}
-					} else {
-						stopGpsService();
-					}
-				}
-			});
-    }
-
-    /**
-     * 模拟发送面板 全部事件初始化
-     */
-    private void initSimPanelEvent() {
-        //1.原按钮：发送最后一条真实GPS
-        btnSendLastGps.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					sendLastRealGpsBroadcast();
-				}
-			});
-
-        //2.方位下拉选择 -> 切换角度并刷新预览
-        spinDirection.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-				@Override
-				public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-					currentAngle = getDirectionAngle(position);
-					refreshTargetPreview();
-				}
-
-				@Override
-				public void onNothingSelected(AdapterView<?> parent) {}
-			});
-
-        //3.距离输入变化自动预览
-        etSimDistance.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-				@Override
-				public void onFocusChange(View v, boolean hasFocus) {
-					if (!hasFocus) {
-						refreshTargetPreview();
-					}
-				}
-			});
-
-        //4.模拟发送按钮：计算偏移并赋值全局模拟坐标
-        btnSimSend.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					saveSimGpsData();
-					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();
-    }
-}
-

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监听已停止");
-    }
-}
-

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>

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>
-

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

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

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>
-

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"/>
-

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_about"
-        android:title="About"
-        android:icon="@android:drawable/ic_menu_info_details"
-        app:showAsAction="ifRoom"/>
-</menu>

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>

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>

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>
-

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>

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	
-    <string name="app_name">GPSRelaySentinel</string>
-    <string name="app_description">A GPS relay tool supporting real and simulated positioning, running in background for location forwarding, debugging and simulation.</string>
-
-</resources>

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>

gpsrelaysentinel/src/stage/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>
-

libaes/build.gradle

@@ -63,7 +63,7 @@ dependencies {
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    api 'cc.winboll.studio:libappbase:15.15.19'
+    api 'cc.winboll.studio:libappbase:15.15.3'
 	// 备用库 jitpack.io 地址
 	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'
 	

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Apr 25 04:16:30 HKT 2026
+#Tue Jan 13 03:37:01 HKT 2026
-stageCount=10
+stageCount=2
 libraryProject=libaes
 baseVersion=15.15
-publishVersion=15.15.9
+publishVersion=15.15.1
 buildCount=0
-baseBetaVersion=15.15.10
+baseBetaVersion=15.15.2

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

@@ -5,7 +5,6 @@ package cc.winboll.studio.libaes.activitys;
  * @Date 2024/06/13 18:58:54
  * @Describe 可以加入Fragment的有抽屉的活动窗口抽象类
  */
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -28,16 +27,14 @@ import cc.winboll.studio.libaes.models.AESThemeBean;
 import cc.winboll.studio.libaes.models.DrawerMenuBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.DevelopUtils;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libaes.views.ADrawerMenuListView;
 import cc.winboll.studio.libaes.views.ADsBannerView;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import com.baoyz.widget.PullRefreshLayout;
 import java.util.ArrayList;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 
-public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBoLLActivity, AdapterView.OnItemClickListener {
+public abstract class DrawerFragmentActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
 
     public static final String TAG = "DrawerFragmentActivity";
 
@@ -64,28 +61,17 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        mThemeType = AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+        //mContext = this;
-        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+        mThemeType = getThemeType();
+        setThemeStyle();
         super.onCreate(savedInstanceState);
-        WinBoLLActivityManager.getInstance().add(this);
         mActivityType = initActivityType();
         initRootView();
         LogUtils.d(TAG, "onCreate end.");
     }
 
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-	@Override
-	public String getTag() {
-		return TAG;
-	}
-
     @Override
     protected void onDestroy() {
-		WinBoLLActivityManager.getInstance().registeRemove(this);
         super.onDestroy();
 		// 修复：释放广告资源，避免内存泄漏
 		ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
@@ -171,6 +157,23 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         super.onBackPressed();
     }
 
+    void setThemeStyle() {
+        //setTheme(AESThemeBean.getThemeStyle(getThemeType()));
+        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+    }
+
+    boolean checkThemeStyleChange() {
+        return mThemeType != getThemeType();
+    }
+
+    AESThemeBean.ThemeType getThemeType() {
+        /*SharedPreferences sharedPreferences = getSharedPreferences(
+         SHAREDPREFERENCES_NAME, MODE_PRIVATE);
+         return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))];
+         */
+        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (AESThemeUtil.onAppThemeItemSelected(this, item)) {
@@ -187,6 +190,9 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     @Override
     protected void onResume() {
         super.onResume();
+        if (checkThemeStyleChange()) {
+            recreate();
+        }
 
 		ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
 		if (adsBannerView != null) {

libaes/src/main/java/cc/winboll/studio/libaes/interfaces/IWinBoLLActivity.java

@@ -1,24 +1,18 @@
 package cc.winboll.studio.libaes.interfaces;
 
-import android.app.Activity;
-
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>
  * @Date 2025/05/10 09:34
- * @Describe WinBoll 窗口操作接口（规范定义，职责单一）
+ * @Describe WinBoLL 窗口操作接口
  */
-public interface IWinBoLLActivity {
+ import android.app.Activity;
-    String TAG = "IWinBoLLActivity";
-    String ACTION_BIND = IWinBoLLActivity.class.getName() + ".ACTION_BIND";
  
-    /**
+public abstract interface IWinBoLLActivity {
-     * 获取当前Activity实例
-     */
-    Activity getActivity();
 
-    /**
+    public static final String TAG = "IWinBoLLActivity";
-     * 获取Activity唯一标识（建议使用类名+UUID或固定唯一字符串）
+
-     */
+    public static final String ACTION_BIND = IWinBoLLActivity.class.getName() + ".ACTION_BIND";
-    String getTag();
+
+    public Activity getActivity();
+    public String getTag();
 }
-

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

@@ -20,6 +20,11 @@ public class SecondaryLibraryActivity extends DrawerFragmentActivity implements
 
     SecondaryLibraryFragment mSecondaryLibraryFragment;
 
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
     @Override
     public String getTag() {
         return null;

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

@@ -1,12 +1,17 @@
 package cc.winboll.studio.libaes.utils;
 
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/05/10 10:02
+ * @Describe 应用活动窗口管理器
+ * 参考 ：
+ * android 类似微信小程序多任务窗口 及 设置 TaskDescription 修改 icon 和 label
+ * https://blog.csdn.net/qq_29364417/article/details/109379915?app_version=6.4.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22109379915%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app
+ */
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogActivity;
@@ -15,292 +20,273 @@ import cc.winboll.studio.libappbase.ToastUtils;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Objects;
 
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2025/05/10 10:02
- * @Describe 应用活动窗口管理器（改进版）
- * 核心能力：多任务窗口管理、Activity栈维护、任务前台恢复、批量关闭、前后Activity切换
- * 参考 ：android 类似微信小程序多任务窗口 及 设置 TaskDescription 修改 icon 和 label
- */
 public class WinBoLLActivityManager {
 
     public static final String TAG = "WinBoLLActivityManager";
+
     public static final String EXTRA_TAG = "EXTRA_TAG";
 
-    public enum WinBoLLUI_TYPE { APPLICATION, SERVICE } // 规范命名 大写开头
 
-    private GlobalApplication mGlobalApplication;
+    public enum WinBoLLUI_TYPE { Aplication, Service }
-    private static volatile WinBoLLActivityManager sInstance; // 单例命名规范
-    private final Map<String, IWinBoLLActivity> mActivityListMap; // 私有不可变
-    private static volatile WinBoLLUI_TYPE sWinBoLLUI_TYPE = WinBoLLUI_TYPE.SERVICE;
 
-    // 私有构造 杜绝外部实例化
+    GlobalApplication mGlobalApplication;
-    private WinBoLLActivityManager(@NonNull GlobalApplication application) {
+    volatile static WinBoLLActivityManager _mIWinBoLLActivityManager;
-        mGlobalApplication = application;
+    Map<String, IWinBoLLActivity> mActivityListMap;
-        mActivityListMap = new HashMap<>(); // 菱形泛型简化
+
+    volatile static WinBoLLUI_TYPE _WinBoLLUI_TYPE = WinBoLLUI_TYPE.Service;
+    public static void setWinBoLLUI_TYPE(WinBoLLUI_TYPE winBoLLUI_TYPE) {
+        _WinBoLLUI_TYPE = winBoLLUI_TYPE;
     }
 
-    /**
-     * 初始化管理器（必须在Application onCreate中调用）
-     */
-    public static <T extends GlobalApplication> void init(@NonNull T application) {
-        if (sInstance == null) {
-            synchronized (WinBoLLActivityManager.class) {
-                if (sInstance == null) {
-                    sInstance = new WinBoLLActivityManager(application);
-                }
-            }
-        }
-    }
-
-    /**
-     * 获取单例（需先调用init初始化，否则抛异常）
-     */
-    @NonNull
-    public static WinBoLLActivityManager getInstance() {
-        if (sInstance == null) {
-            throw new IllegalStateException("WinBoLLActivityManager 未初始化，请先在Application中调用 init()");
-        }
-        return sInstance;
-    }
-
-    // ===================== 基础配置 =====================
-    public static void setWinBoLLUI_TYPE(@NonNull WinBoLLUI_TYPE winBoLLUI_TYPE) {
-        sWinBoLLUI_TYPE = winBoLLUI_TYPE;
-    }
-
-    @NonNull
     public static WinBoLLUI_TYPE getWinBoLLUI_TYPE() {
-        return sWinBoLLUI_TYPE;
+        return _WinBoLLUI_TYPE;
     }
 	
-    // ===================== Activity 增删查 =====================
+    WinBoLLActivityManager(GlobalApplication application) {
-    /**
+        mGlobalApplication = application;
-     * 把Activity添加到管理中（自动去重）
+        mActivityListMap = new HashMap<String, IWinBoLLActivity>();
-     */
+    }
-    public <T extends IWinBoLLActivity> void add(@NonNull T activity) {
+
-        String tag = activity.getTag();
+    public static WinBoLLActivityManager getInstance() {
-        if (isActivityActive(tag)) {
+        return _mIWinBoLLActivityManager;
-            LogUtils.d(TAG, String.format("Activity[%s] 已处于活跃状态，无需重复添加", tag));
+    }
-            return;
+	
+	public static synchronized <T extends GlobalApplication> void init(T application) {
+        if (_mIWinBoLLActivityManager == null) {
+            _mIWinBoLLActivityManager = new WinBoLLActivityManager(application);
         }
-        mActivityListMap.put(tag, activity);
-        LogUtils.d(TAG, String.format("添加Activity：%s，当前管理数量：%d", tag, mActivityListMap.size()));
     }
 
     /**
-     * 判断指定Tag的Activity是否活跃
+     * 把Activity添加到管理中
      */
-    public boolean isActivityActive(@NonNull String tag) {
+    public <T extends IWinBoLLActivity> void add(T activity) {
-        return mActivityListMap.containsKey(tag) && mActivityListMap.get(tag) != null;
+        if (isActivityActive(activity.getTag())) {
-    }
+            LogUtils.d(TAG, String.format("add(...) %s is active.", activity.getTag()));
-
+        } else {
-    /**
+            mActivityListMap.put(activity.getTag(), activity);
-     * 根据Tag获取Activity（空安全）
+            LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", activity.getTag(), mActivityListMap.size()));
-     */
-    @Nullable
-    public Activity getActivityByTag(@NonNull String tag) {
-        IWinBoLLActivity winBoLLActivity = mActivityListMap.get(tag);
-        if (winBoLLActivity == null) return null;
-        Activity activity = winBoLLActivity.getActivity();
-        // 过滤已销毁/已结束的Activity
-        if (activity == null || activity.isFinishing() || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed())) {
-            registeRemove(winBoLLActivity);
-            return null;
         }
-        return activity;
     }
 
-    /**
+    //
-     * 移除指定Activity（销毁时调用）
+    // activity: 为 null 时，
-     */
+    // intent.putExtra 函数 "tag" 参数为 tag
-    public <T extends IWinBoLLActivity> boolean registeRemove(@NonNull T iWinBoLLActivity) {
+    // activity: 不为 null 时，
-        String tag = iWinBoLLActivity.getTag();
+    // intent.putExtra 函数 "tag" 参数为 activity.getTag()
-        if (mActivityListMap.containsKey(tag)) {
+    //
-            mActivityListMap.remove(tag);
+    public <T extends IWinBoLLActivity> void startWinBoLLActivity(Context context, Class<T> clazz) {
-            LogUtils.d(TAG, String.format("移除Activity：%s，剩余管理数量：%d", tag, mActivityListMap.size()));
+        // 如果窗口已存在就重启窗口
-            return true;
-        }
-        return false;
-    }
-
-    // ===================== Activity 启动 =====================
-    /**
-     * 启动WinBoLLActivity（存在则前台恢复，不存在则新建多任务窗口）
-     */
-    public <T extends IWinBoLLActivity> void startWinBoLLActivity(@NonNull Context context, @NonNull Class<T> clazz) {
         if (!resumeActivity(clazz)) {
+            // 新建一个任务窗口
             Intent intent = new Intent(context, clazz);
-            setMultiTaskFlags(intent);
+            //打开多任务窗口 flags
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            //intent.putExtra("tag", tag);
             context.startActivity(intent);
         }
     }
 
-    /**
+    public <T extends IWinBoLLActivity> void startWinBoLLActivity(Context context, Intent intent, Class<T> clazz) {
-     * 带Intent参数启动WinBoLLActivity
+        // 如果窗口已存在就重启窗口
-     */
-    public <T extends IWinBoLLActivity> void startWinBoLLActivity(@NonNull Context context, @NonNull Intent intent, @NonNull Class<T> clazz) {
         if (!resumeActivity(clazz)) {
-            setMultiTaskFlags(intent);
+            // 新建一个任务窗口
+            //Intent intent = new Intent(context, clazz);
+            //打开多任务窗口 flags
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            //intent.putExtra("tag", tag);
             context.startActivity(intent);
         }
     }
 
-    /**
+    public <T extends IWinBoLLActivity> void startLogActivity(Context context) {
-     * 启动日志页面（固定多任务模式）
+        // 如果窗口已存在就重启窗口
-     */
+        //if (!resumeActivity(LogActivity.class)) {
-    public void startLogActivity(@NonNull Context context) {
+        // 新建一个任务窗口
         Intent intent = new Intent(context, LogActivity.class);
-        setMultiTaskFlags(intent);
+        //打开多任务窗口 flags
-        intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT); // 分屏相关
+        // Define the bounds.
-        context.startActivity(intent);
+//        Rect bounds = new Rect(0, 0, 800, 200);
-    }
+//        // Set the bounds as an activity option.
-
+//        ActivityOptions options = ActivityOptions.makeBasic();
-    /**
+//        options.setLaunchBounds(bounds);
-     * 设置多任务窗口通用Flags
+        intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
-     */
-    private void setMultiTaskFlags(@NonNull Intent intent) {
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
         intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+
+        //intent.putExtra(EXTRA_TAG, tag);
+
+        //context.startActivity(intent, options.toBundle());
+        context.startActivity(intent);
+        //}
     }
 
-    // ===================== Activity 前台恢复 =====================
+    //
-    /**
+    // 判断 tag 绑定的 Activity 是否已经创建
-     * 根据Activity类 恢复前台（反射获取Tag，需保证无参构造）
+    //
-     */
+    public boolean isActivityActive(String tag) {
-    public <T extends IWinBoLLActivity> boolean resumeActivity(@NonNull Class<T> clazz) {
+        return mActivityListMap.get(tag) != null;
+    }
+
+    Activity getActivityByTag(String tag) {
+        return (mActivityListMap.get(tag) == null) ?null: mActivityListMap.get(tag).getActivity();
+    }
+
+
+    //
+    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
+    //
+    public <T extends IWinBoLLActivity> boolean resumeActivity(Class<T> clazz) {
         try {
-            T instance = clazz.newInstance();
+            Activity activity = getActivityByTag(clazz.newInstance().getTag());
-            return resumeActivity(instance.getTag());
+            if (activity != null) {
+                return resumeActivity(activity);
+            }
         } catch (InstantiationException | IllegalAccessException e) {
-            LogUtils.e(TAG, "恢复Activity失败，类需提供无参构造", e);
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
         return false;
     }
 
-    /**
+    //
-     * 根据Tag 恢复Activity前台
+    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-     */
+    //
-    public boolean resumeActivity(@NonNull String tag) {
+    public <T extends IWinBoLLActivity> boolean resumeActivity(String tag) {
         Activity activity = getActivityByTag(tag);
-        return activity != null && resumeActivity(activity);
+        if (activity != null) {
+            return resumeActivity(activity);
+        }
+        return false;
     }
 
-    /**
+    //
-     * 恢复指定Activity到前台（适配高版本权限）
+    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-     */
+    //
-    @SuppressWarnings("deprecation")
+    public <T extends IWinBoLLActivity> boolean resumeActivity(Activity activity) {
-    public boolean resumeActivity(@NonNull Activity activity) {
+        ActivityManager am = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
-        if (activity.isFinishing() || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed())) {
+        //返回启动它的根任务（home 或者 MainActivity）
-            return false;
+        //Intent intent = new Intent(mContext, activity.getClass());
-        }
+        //TaskStackBuilder stackBuilder = TaskStackBuilder.create(mContext);
-        try {
+        //stackBuilder.addNextIntentWithParentStack(intent);
-            ActivityManager am = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
+        //stackBuilder.startActivities();
-            if (am == null) {
+        am.moveTaskToFront(activity.getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
-                LogUtils.w(TAG, "获取ActivityManager失败，无法恢复前台");
+        //ToastUtils.show("resumeActivity");
-                return false;
+        return true;
-            }
-            // Android 11+ 限制，低版本正常使用
-            am.moveTaskToFront(activity.getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
-			//ToastUtils.show(String.format("Activity[%s] 已恢复到前台", activity.getClass().getSimpleName()));
-            LogUtils.d(TAG, String.format("Activity[%s] 已恢复到前台", activity.getClass().getSimpleName()));
-            return true;
-        } catch (SecurityException e) {
-			//ToastUtils.show("恢复Activity前台失败，缺少权限或系统限制 ：" + e.getMessage());
-            LogUtils.e(TAG, "恢复Activity前台失败，缺少权限或系统限制", e);
-            //ToastUtils.show("窗口恢复失败，请手动打开");
-            return false;
-        }
     }
 
-    // ===================== Activity 关闭 =====================
+
     /**
-     * 结束所有管理的Activity（按UI类型选择关闭策略）
+     * 结束所有 Activity
      */
     public void finishAll() {
-        if (mActivityListMap.isEmpty()) {
+        try {
-            LogUtils.d(TAG, "当前无管理的Activity，无需结束");
+            //ToastUtils.show(String.format("finishAll() size : %d", _mIWinBoLLActivityList.size()));
-            return;
+            for (int i = mActivityListMap.size() - 1; i > -1; i--) {
-        }
+                IWinBoLLActivity iWinBoLLActivity = mActivityListMap.get(i);
-        LogUtils.d(TAG, String.format("开始结束所有Activity，共%d个", mActivityListMap.size()));
+                ToastUtils.show("finishAll() activity");
-        Iterator<Map.Entry<String, IWinBoLLActivity>> iterator = mActivityListMap.entrySet().iterator();
+                if (iWinBoLLActivity != null && iWinBoLLActivity.getActivity() != null && !iWinBoLLActivity.getActivity().isFinishing() && !iWinBoLLActivity.getActivity().isDestroyed()) {
-        while (iterator.hasNext()) {
+                    //ToastUtils.show("activity != null ...");
-            IWinBoLLActivity winBoLLActivity = iterator.next().getValue();
+                    if (getWinBoLLUI_TYPE() == WinBoLLUI_TYPE.Service) {
-            Activity activity = winBoLLActivity.getActivity();
+                        // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。
-            if (activity == null) {
+                        iWinBoLLActivity.getActivity().finishAndRemoveTask();
-                iterator.remove();
+                        //ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
-                continue;
+                    } else if (getWinBoLLUI_TYPE() == WinBoLLUI_TYPE.Aplication) {
-            }
+                        // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。
-            // 安全关闭，避免重复操作
+                        iWinBoLLActivity.getActivity().finish();
-            if (!activity.isFinishing() && !(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed())) {
+                        //ToastUtils.show("finishAll() activity.finish();");
-                if (sWinBoLLUI_TYPE == WinBoLLUI_TYPE.SERVICE) {
+                    } else {
-                    activity.finishAndRemoveTask(); // 结束+移除最近任务
+                        ToastUtils.show("WinBollApplication.WinBollUI_TYPE error.");
-                } else if (sWinBoLLUI_TYPE == WinBoLLUI_TYPE.APPLICATION) {
+                    }
-                    activity.finish(); // 仅结束页面
                 }
             }
-            iterator.remove(); // 移除已处理的项
+        } catch (Exception e) {
-        }
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        LogUtils.d(TAG, "所有Activity结束完成");
-    }
-
-    /**
-     * 结束指定Activity，自动恢复上一个Activity前台
-     */
-    public <T extends IWinBoLLActivity> void finish(@NonNull T iWinBoLLActivity) {
-        Activity currentActivity = iWinBoLLActivity.getActivity();
-        if (currentActivity == null || currentActivity.isFinishing() || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && currentActivity.isDestroyed())) {
-            registeRemove(iWinBoLLActivity);
-            return;
-        }
-
-        // 先获取上一个Activity，再关闭当前
-        Activity preActivity = getPreActivity(iWinBoLLActivity);
-        currentActivity.finish();
-        registeRemove(iWinBoLLActivity); // 关闭后移除管理
-
-        // 恢复上一个Activity前台
-        if (preActivity != null) {
-            resumeActivity(preActivity);
         }
     }
 
     /**
-     * 获取当前Activity的上一个栈内Activity（修复原遍历逻辑错误）
+     * 结束指定Activity
      */
-    @Nullable
+    public <T extends IWinBoLLActivity> void finish(T iWinBoLLActivity) {
-    private Activity getPreActivity(@NonNull IWinBoLLActivity currentActivity) {
+        try {
-        String currentTag = currentActivity.getTag();
+            if (iWinBoLLActivity != null && iWinBoLLActivity.getActivity() != null && !iWinBoLLActivity.getActivity().isFinishing() && !iWinBoLLActivity.getActivity().isDestroyed()) {
-        IWinBoLLActivity preWinBoLLActivity = null;
+                //根据tag 移除 MyActivity
-        for (Map.Entry<String, IWinBoLLActivity> entry : mActivityListMap.entrySet()) {
+                //String tag= activity.getTag();
-            String tag = entry.getKey();
+                //_mIWinBoLLActivityList.remove(tag);
-            if (Objects.equals(tag, currentTag)) {
+                //ToastUtils.show("remove");
-                break; // 找到当前Activity，循环终止，pre即为上一个
+                //ToastUtils.show("_mIWinBoLLActivityArrayMap.size() " + Integer.toString(_mIWinBoLLActivityArrayMap.size()));
+
+                // 窗口回调规则：
+                // [] 当前窗口位置 >> 调度出的窗口位置
+                // ★：[0] 1 2 3 4 >> 1
+                // ★：0 1 [2] 3 4 >> 1
+                // ★：0 1 2 [3] 4 >> 2
+                // ★：0 1 2 3 [4] >> 3
+                // ★：[0] >> 直接关闭当前窗口
+                Activity preActivity = getPreActivity(iWinBoLLActivity);
+                iWinBoLLActivity.getActivity().finish();
+                if (preActivity != null) {
+                    resumeActivity(preActivity);
+                }
             }
-            preWinBoLLActivity = entry.getValue();
+
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
-        return preWinBoLLActivity != null ? preWinBoLLActivity.getActivity() : null;
     }
 
-    // ===================== 调试辅助 =====================
+    Activity getPreActivity(IWinBoLLActivity iWinBoLLActivity) {
-    /**
+        try {
-     * 打印所有管理的Activity信息（调试用）
+            boolean bingo = false;
-     */
+            IWinBoLLActivity preIWinBoLLActivity = null;
-    public void printActivityListInfo() {
+            for (Map.Entry<String, IWinBoLLActivity> entity : mActivityListMap.entrySet()) {
-        if (mActivityListMap.isEmpty()) {
+                if (entity.getKey().equals(iWinBoLLActivity.getTag())) {
-            LogUtils.d(TAG, "当前管理的Activity列表为空");
+                    bingo = true;
-            return;
+                    LogUtils.d(TAG, "bingo");
+                    break;
+                }
+                preIWinBoLLActivity = entity.getValue();
+            }
+
+            if (bingo) {
+                return preIWinBoLLActivity.getActivity();
+            }
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
-        StringBuilder sb = new StringBuilder(String.format("Activity管理列表（总数：%d）\n", mActivityListMap.size()));
+
-        for (Map.Entry<String, IWinBoLLActivity> entry : mActivityListMap.entrySet()) {
+        return null;
-            sb.append("Tag: ").append(entry.getKey())
+    }
-				.append(" | Activity: ").append(entry.getValue().getActivity().getClass().getSimpleName())
+
-				.append("\n");
+    public <T extends IWinBoLLActivity> boolean registeRemove(T iWinBoLLActivity) {
+        IWinBoLLActivity iWinBoLLActivityTest = mActivityListMap.get(iWinBoLLActivity.getTag());
+        if (iWinBoLLActivityTest != null) {
+            mActivityListMap.remove(iWinBoLLActivity.getTag());
+            return true;
+        }
+        return false;
+    }
+
+    public void printAvtivityListInfo() {
+        if (!mActivityListMap.isEmpty()) {
+            StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(mActivityListMap.size()));
+            Iterator<Map.Entry<String, IWinBoLLActivity>> iterator = mActivityListMap.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry<String, IWinBoLLActivity> entry = iterator.next();
+                sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag());
+                //ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag());
+            }
+            sb.append("\nMap entries end.");
+            LogUtils.d(TAG, sb.toString());
+        } else {
+            LogUtils.d(TAG, "The map is empty.");
         }
-        LogUtils.d(TAG, sb.toString());
     }
 }
 

libappbase/build.gradle

@@ -21,14 +21,5 @@ 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'
-
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 28 17:08:04 HKT 2026
+#Tue Jan 13 03:23:17 HKT 2026
-stageCount=22
+stageCount=5
 libraryProject=libappbase
 baseVersion=15.15
-publishVersion=15.15.21
+publishVersion=15.15.4
 buildCount=0
-baseBetaVersion=15.15.22
+baseBetaVersion=15.15.5

libappbase/src/main/AndroidManifest.xml

@@ -3,21 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="cc.winboll.studio.libappbase">
 
-    <!-- 拥有完全的网络访问权限 -->
+    <application>
-    <uses-permission android:name="android.permission.INTERNET"/>
-
-    <!-- 读取您共享存储空间中的内容 -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-
-    <!-- 修改或删除您共享存储空间中的内容 -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <!-- MANAGE_EXTERNAL_STORAGE -->
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
-
-    <application
-        android:requestLegacyExternalStorage="true"
-        android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
             android:name=".CrashHandler$CrashActivity"
@@ -38,15 +24,12 @@
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:exported="true"
             android:launchMode="singleInstance"
-            android:taskAffinity="cc.winboll.studio.libappbase.LogActivity"
             android:process=":LogActivity">
 
         </activity>
 
         <activity android:name="cc.winboll.studio.libappbase.activities.NfcRsaLoginActivity"/>
 
-        <activity android:name="cc.winboll.studio.libappbase.activities.FTPBackupsActivity"/>
-
     </application>
 
 </manifest>

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

@@ -2,7 +2,6 @@ package cc.winboll.studio.libappbase;
 
 import android.app.Application;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -27,12 +26,6 @@ public class GlobalApplication extends Application {
      */
     private static volatile boolean isDebugging = false;
 
-    // 新增：WinBoLL 服务器主机地址（volatile 保证多线程可见性）
-    private static volatile String winbollHost = null;
-    // 新增：SP 存储相关常量（私有存储，仅当前应用可访问）
-    private static final String SP_NAME = "WinBoLL_SP_CONFIG";
-    private static final String SP_KEY_WINBOLL_HOST = "winboll_host";
-
     /**
      * 获取全局 Application 单例实例（外部可通过此方法获取上下文）
      * @return GlobalApplication 单例（未初始化时返回 null，需确保配置 AndroidManifest）
@@ -83,42 +76,6 @@ public class GlobalApplication extends Application {
         return isDebugging;
     }
 
-	// 新增：设置 WinBoLL 服务器主机地址（同时保存到 SP 持久化）
-	public static void setWinbollHost(String host) {
-		if (sInstance == null) {
-			LogUtils.e(TAG, "setWinbollHost: 应用未初始化，设置失败");
-			return;
-		}
-		// 检查并补全末尾 /  核心改动
-		if (host != null && !host.isEmpty() && !host.endsWith("/")) {
-			host += "/";
-		}
-		// 更新内存中的字段
-		winbollHost = host;
-		// 保存到 SP 持久化（私有模式，安全）
-		SharedPreferences sp = sInstance.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
-		sp.edit().putString(SP_KEY_WINBOLL_HOST, host).apply();
-		LogUtils.d(TAG, "setWinbollHost: 服务器地址已设置并持久化，host=" + host);
-	}
-	
-
-    // 新增：获取 WinBoLL 服务器主机地址（优先内存，内存为空则从 SP 读取）
-    public static String getWinbollHost() {
-        if (winbollHost != null) {
-            // 内存中存在，直接返回（提高效率）
-            return winbollHost;
-        }
-        if (sInstance == null) {
-            LogUtils.e(TAG, "getWinbollHost: 应用未初始化，获取失败");
-            return null;
-        }
-        // 内存中不存在，从 SP 读取并更新到内存
-        SharedPreferences sp = sInstance.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
-        winbollHost = sp.getString(SP_KEY_WINBOLL_HOST, "https://console.winboll.cc/");
-        LogUtils.d(TAG, "getWinbollHost: 从 SP 读取服务器地址，host=" + winbollHost);
-        return winbollHost;
-    }
-
     /**
      * 应用启动时初始化（仅执行一次）
      * 初始化核心框架、恢复调试状态、配置全局异常处理等
@@ -129,12 +86,11 @@ public class GlobalApplication extends Application {
         // 初始化单例实例（确保在所有初始化操作前完成）
         sInstance = this;
 		
+
         // 初始化基础组件（日志、崩溃处理、Toast）
         initCoreComponents();
         // 恢复/初始化调试模式状态（从本地文件读取，无文件则默认关闭调试）
         restoreDebugStatus();
-        // 新增：初始化服务器地址（从 SP 读取到内存，提高后续访问效率）
-        initWinbollHost();
 
         LogUtils.d(TAG, "GlobalApplication 初始化完成，单例实例已创建");
     }
@@ -175,11 +131,6 @@ public class GlobalApplication extends Application {
         }
     }
 
-    // 新增：初始化服务器地址（应用启动时从 SP 读取到内存）
-    private void initWinbollHost() {
-        getWinbollHost(); // 触发从 SP 读取并更新内存
-    }
-
     /**
      * 获取应用名称（从 AndroidManifest.xml 的 android:label 读取）
      * @param context 上下文（建议传入 Application 上下文，避免内存泄漏）
@@ -203,7 +154,7 @@ public class GlobalApplication extends Application {
             return appName;
         } catch (NameNotFoundException e) {
             // 包名不存在（理论上不会发生，捕获异常避免崩溃）
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+			LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
             //LogUtils.e(TAG, "获取应用名称失败：包名不存在", e);
             e.printStackTrace();
         }
@@ -219,6 +170,7 @@ public class GlobalApplication extends Application {
         // 释放单例引用（可选，避免内存泄漏风险）
         sInstance = null;
         LogUtils.d(TAG, "GlobalApplication 终止，单例实例已释放");
+		
     }
 }
 

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

@@ -1,11 +1,8 @@
 package cc.winboll.studio.libappbase;
 
 import android.app.Activity;
-import android.app.ActivityOptions;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Rect;
-import android.os.Build;
 import android.os.Bundle;
 import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.R;
@@ -49,39 +46,20 @@ public class LogActivity extends Activity {
      * @param context 上下文（Activity/Fragment），用于启动 Activity
      */
     public static void startLogActivity(Context context) {
-        startLogActivity(context, true);
+        // 创建启动当前 Activity 的 Intent
-    }
-
-    /**
-     * 启动日志 Activity 的静态方法重载（外部调用入口）
-     * @param context 上下文（Activity/Fragment），用于启动 Activity
-     * @param newTask 是否在新窗口中启动
-     */
-    public static void startLogActivity(Context context, boolean newTask) {
         Intent intent = new Intent(context, LogActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
-        if (newTask) {
+        // 添加 Intent 标志：支持分屏/多窗口模式（API 24+）
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
-            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+        // 添加 Intent 标志：创建新任务栈（避免并入调用者任务栈）
-            context.startActivity(intent);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        // 添加 Intent 标志：标记为新文档（多任务窗口中独立显示）
-            intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        // 添加 Intent 标志：允许创建多个任务实例（支持多次启动独立窗口）
-            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
 
-            Rect bounds = new Rect();
+        // 启动 Activity
-            if (context instanceof Activity) {
+        context.startActivity(intent);
-                Activity activity = (Activity) context;
-                activity.getWindow().getDecorView().getDisplay().getRectSize(bounds);
-                bounds.set(0, bounds.height() / 2, bounds.width(), bounds.height());
-            }
-            ActivityOptions options = ActivityOptions.makeBasic();
-            options.setLaunchBounds(bounds);
-            context.startActivity(intent, options.toBundle());
-        } else {
-            context.startActivity(intent);
-        }
     }
 }
 

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

@@ -100,52 +100,10 @@ public class LogUtils {
         // 加载当前应用下的所有类的 TAG
         addClassTAGList();
         loadTAGBeanSettings();
-        checkAndTrimLogFileSize();
         _IsInited = true;
         LogUtils.d(TAG, String.format("mapTAGList : %s", mapTAGList.toString()));
     }
 
-    private static void checkAndTrimLogFileSize() {
-        if (_mfLogCatchFile == null || !_mfLogCatchFile.exists()) {
-            return;
-        }
-
-        final long MAX_FILE_SIZE = 6291456L;
-        final long KEEP_FILE_SIZE = 3145728L;
-
-        long fileSize = _mfLogCatchFile.length();
-        if (fileSize <= MAX_FILE_SIZE) {
-            return;
-        }
-
-        long needSkip = fileSize - KEEP_FILE_SIZE;
-
-        try (FileInputStream fis = new FileInputStream(_mfLogCatchFile);
-             BufferedReader reader = new BufferedReader(new InputStreamReader(fis));
-             FileOutputStream fos = new FileOutputStream(_mfLogCatchFile);
-             BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fos))) {
-
-            StringBuilder sb = new StringBuilder();
-            String line;
-            long skippedTotal = 0;
-            final String lineBreak = System.lineSeparator();
-
-            while ((line = reader.readLine()) != null) {
-                byte[] lineBytes = line.getBytes();
-                skippedTotal += lineBytes.length + lineBreak.getBytes().length;
-
-                if (skippedTotal > needSkip) {
-                    sb.append(line).append(lineBreak);
-                }
-            }
-
-            writer.write(sb.toString());
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
     public static Map<String, Boolean> getMapTAGList() {
         return mapTAGList;
     }

libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/APPValidationDialog.java

@@ -1,186 +0,0 @@
-package cc.winboll.studio.libappbase.dialogs;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.R;
-import cc.winboll.studio.libappbase.ToastUtils;
-import cc.winboll.studio.libappbase.utils.APPUtils;
-import cc.winboll.studio.libappbase.utils.ApkSignUtils;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @CreateTime 2026-01-20 21:20:00
- * @LastEditTime 2026-01-24 18:45:00
- * @Describe 签名显示+正版校验对话框：展示应用签名字节位信息，调用网络接口完成正版合法性校验，实时返回校验结果
- */
-public class APPValidationDialog extends Dialog {
-    // ===================================== 全局常量 =====================================
-    public static final String TAG = "AppValidationDialog";
-    // 签名字节位分组大小
-    private static final int BIT_GROUP_SIZE = 16;
-
-    // ===================================== 控件与上下文属性 =====================================
-    private Context mContext;
-    private EditText etSignFingerprint;
-    private TextView tvAuthResult;
-
-    // ===================================== 业务入参属性 =====================================
-    private String appName;
-    private String versionName;
-    private String clientSign;
-    private String clientHash;
-
-    // ===================================== 构造方法 =====================================
-    public APPValidationDialog(Context context, String appName, String versionName) {
-        super(context, R.style.DialogStyle);
-        this.mContext = context;
-        this.appName = appName;
-        this.versionName = versionName;
-        LogUtils.d(TAG, "AppValidationDialog: 构造方法初始化，入参-> projectName=" + appName + ", versionName=" + versionName);
-    }
-
-    // ===================================== 生命周期方法 =====================================
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        LogUtils.d(TAG, "onCreate: 对话框创建，开始初始化布局与业务逻辑");
-        setContentView(R.layout.dialog_sign_get);
-        setCancelable(true);
-        // 初始化应用签名与哈希
-        initSignAndHash();
-        // 初始化页面控件
-        initView();
-        // 执行签名展示与正版校验
-        doSignShowAndAuthCheck();
-        LogUtils.d(TAG, "onCreate: 对话框初始化流程执行完成");
-    }
-
-    // ===================================== 页面与数据初始化方法 =====================================
-    /**
-     * 初始化页面控件，绑定视图并设置基础属性
-     */
-    private void initView() {
-        LogUtils.d(TAG, "initView: 开始初始化页面控件");
-        etSignFingerprint = findViewById(R.id.et_sign_fingerprint);
-        tvAuthResult = findViewById(R.id.tv_auth_result);
-        // 签名显示框设为只读，方便用户复制
-        etSignFingerprint.setEnabled(false);
-        // 填充签名字节位信息
-        etSignFingerprint.setText(convertSignToBitArrayWithWrap(clientSign));
-        LogUtils.d(TAG, "initView: 控件初始化完成，已填充签名字节位信息");
-    }
-
-    /**
-     * 初始化应用签名与SHA256哈希，调用工具类获取与服务端对齐的参数
-     */
-    private void initSignAndHash() {
-        LogUtils.d(TAG, "initSignAndHash: 开始获取应用签名与SHA256哈希");
-        this.clientSign = ApkSignUtils.getApkSignAlignedWithServer(mContext);
-        this.clientHash = ApkSignUtils.getApkSHA256Hash(mContext);
-        LogUtils.d(TAG, "initSignAndHash: 签名与哈希获取完成-> clientSign=" + clientSign + ", clientHash=" + clientHash);
-    }
-
-    // ===================================== 核心业务方法 =====================================
-    /**
-     * 核心业务：展示签名字节位信息，发起网络正版校验请求
-     */
-    private void doSignShowAndAuthCheck() {
-        LogUtils.d(TAG, "doSignShowAndAuthCheck: 开始执行应用正版合法性校验");
-        // 校验签名与哈希非空，避免空参请求
-        if (clientSign == null || clientHash == null) {
-            String errorMsg = "应用签名或哈希获取失败，无法执行正版校验";
-            LogUtils.e(TAG, "doSignShowAndAuthCheck: " + errorMsg);
-            tvAuthResult.setTextColor(Color.RED);
-            tvAuthResult.setText(errorMsg);
-            ToastUtils.show(errorMsg);
-            return;
-        }
-        // 调用网络校验接口
-        new APPUtils().checkAPKValidation(
-			mContext,
-			appName,
-			versionName,
-			clientSign,
-			clientHash,
-			new APPUtils.CheckResultCallback() {
-				@Override
-				public void onResult(boolean isValid, String message) {
-					LogUtils.d(TAG, "checkAPKValidation: 校验结果返回-> isValid=" + isValid + ", message=" + message);
-					handleAuthResult(isValid, message);
-				}
-			}
-        );
-    }
-
-    /**
-     * 处理正版校验结果，更新UI并提示用户
-     * @param isValid 校验是否通过
-     * @param message 服务端返回提示信息
-     */
-    private void handleAuthResult(boolean isValid, String message) {
-        String showMessage;
-        if (isValid) {
-            showMessage = "< 这是正版的 WinBoLL 应用，请放心使用。 >";
-            tvAuthResult.setTextColor(Color.BLUE);
-            LogUtils.d(TAG, "handleAuthResult: 正版校验通过，" + showMessage + "，服务端信息：" + message);
-        } else {
-            showMessage = "< 您使用的可能不是正版的 WinBoLL 应用。 >";
-            tvAuthResult.setTextColor(Color.RED);
-            LogUtils.e(TAG, "handleAuthResult: 正版校验失败，" + showMessage + "，失败原因：" + message);
-        }
-        // 更新UI并弹提示
-        tvAuthResult.setText(showMessage);
-        ToastUtils.show(showMessage);
-    }
-
-    // ===================================== 工具方法 =====================================
-    /**
-     * 签名字符串转0/1比特数组格式：每2个bit加空格，每16位换行，提升可读性
-     * @param signStr 原始签名字符串
-     * @return 格式化后的比特数字符串，签名字符为空返回空串
-     */
-    private String convertSignToBitArrayWithWrap(String signStr) {
-        LogUtils.d(TAG, "convertSignToBitArrayWithWrap: 开始格式化签名字符串为比特数组");
-        if (signStr == null || signStr.isEmpty()) {
-            LogUtils.w(TAG, "convertSignToBitArrayWithWrap: 原始签名字符串为空，返回空串");
-            return "";
-        }
-        // 字符转8位补零的二进制字符串
-        StringBuilder bitBuilder = new StringBuilder();
-        for (char c : signStr.toCharArray()) {
-            String bit8 = String.format("%8s", Integer.toBinaryString(c)).replace(' ', '0');
-            bitBuilder.append(bit8);
-        }
-        String fullBitStr = bitBuilder.toString();
-        LogUtils.d(TAG, "convertSignToBitArrayWithWrap: 签名转二进制完成，总长度=" + fullBitStr.length() + "bit");
-
-        // 按16位分组，组内每2bit加空格，分组后换行
-        StringBuilder finalBuilder = new StringBuilder();
-        for (int i = 0; i < fullBitStr.length(); i += BIT_GROUP_SIZE) {
-            int end = Math.min(i + BIT_GROUP_SIZE, fullBitStr.length());
-            String group = fullBitStr.substring(i, end);
-            // 组内加空格
-            StringBuilder groupWithSpace = new StringBuilder();
-            for (int j = 0; j < group.length(); j++) {
-                groupWithSpace.append(group.charAt(j));
-                if ((j + 1) % 2 == 0 && j != group.length() - 1) {
-                    groupWithSpace.append(" ");
-                }
-            }
-            finalBuilder.append(groupWithSpace);
-            // 最后一组不换行
-            if (end < fullBitStr.length()) {
-                finalBuilder.append("\n");
-            }
-        }
-        LogUtils.d(TAG, "convertSignToBitArrayWithWrap: 签名比特数组格式化完成");
-        return finalBuilder.toString();
-    }
-}
-

libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/DebugHostDialog.java

@@ -1,99 +0,0 @@
-package cc.winboll.studio.libappbase.dialogs;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.R;
-import cc.winboll.studio.libappbase.ToastUtils;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/01/22 20:59
- * @Describe WinBoLL服务器地址设置对话框（调试模式专用）
- */
-public class DebugHostDialog extends Dialog implements View.OnClickListener {
-    public static final String TAG = "DebugHostDialog";
-
-    private Context mContext;
-    private EditText etHostInput;
-    private Button btnConfirm;
-    private Button btnCancel;
-
-    // 构造方法（适配默认样式）
-    public DebugHostDialog(Context context) {
-        super(context, R.style.DialogStyle);
-        this.mContext = context;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.dialog_winboll_host); // 绑定XML布局
-        setCancelable(true); // 点击外部可关闭
-        initView();
-        initData();
-        LogUtils.d(TAG, "DebugHostDialog 初始化完成");
-    }
-
-    // 初始化视图
-    private void initView() {
-        etHostInput = findViewById(R.id.et_host_input);
-        btnConfirm = findViewById(R.id.btn_confirm);
-        btnCancel = findViewById(R.id.btn_cancel);
-
-        // 绑定点击事件
-        btnConfirm.setOnClickListener(this);
-        btnCancel.setOnClickListener(this);
-    }
-
-    // 初始化数据（显示当前已保存的地址）
-    private void initData() {
-        String currentHost = GlobalApplication.getWinbollHost();
-        if (!TextUtils.isEmpty(currentHost)) {
-            etHostInput.setText(currentHost);
-            etHostInput.setSelection(currentHost.length()); // 光标定位到末尾
-            LogUtils.d(TAG, "当前已保存的服务器地址：" + currentHost);
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        if (id == R.id.btn_confirm) {
-            handleConfirm(); // 确认设置
-        } else if (id == R.id.btn_cancel) {
-            dismiss(); // 取消对话框
-        }
-    }
-
-    // 处理确认设置逻辑
-    private void handleConfirm() {
-        String inputHost = etHostInput.getText().toString().trim();
-        if (TextUtils.isEmpty(inputHost)) {
-            ToastUtils.show("服务器地址不能为空");
-            LogUtils.w(TAG, "设置失败：地址为空");
-            return;
-        }
-
-        // 简单校验URL格式（避免明显错误）
-        if (!inputHost.startsWith("http://") && !inputHost.startsWith("https://")) {
-            ToastUtils.show("地址需以http://或https://开头");
-            LogUtils.w(TAG, "设置失败：地址格式错误，input=" + inputHost);
-            return;
-        }
-
-        // 保存地址到SP+内存
-        GlobalApplication.setWinbollHost(inputHost);
-        ToastUtils.show("服务器地址设置成功");
-        LogUtils.d(TAG, "服务器地址设置成功：" + inputHost);
-        dismiss(); // 关闭对话框
-    }
-}
-

libappbase/src/main/java/cc/winboll/studio/libappbase/models/SFTPAuthModel.java

@@ -1,101 +0,0 @@
-package cc.winboll.studio.libappbase.models;
-
-/**
- * SFTP登录验证信息实体类
- * 封装SFTP登录所需的所有配置信息：服务端地址、端口、账号密码、秘钥信息、编码
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/01/30 19:08:00
- * @LastEditTime 2026/01/31 22:45:00
- */
-public class SFTPAuthModel {
-    public static final String TAG = "SFTPAuthModel";
-
-    // SFTP服务器地址（必填，如192.168.1.100、sftp.xxx.com）
-    private String ftpServer;
-    // SFTP服务器端口（必填，默认22）
-    private int ftpPort = 22;
-    // SFTP登录用户名（匿名登录传null/空）
-    private String ftpUsername;
-    // SFTP登录密码（匿名登录传null/空）
-    private String ftpPassword;
-    // SFTP登录秘钥路径（秘钥登录时使用，本地绝对路径，如/sdcard/sftp/key.pem，账号密码登录传null/空）
-    private String ftpKeyPath;
-    // SFTP登录秘钥密码（秘钥有密码时填写，无密码传null/空）
-    private String ftpKeyPwd;
-    // SFTP编码（默认UTF-8，解决中文文件名乱码）
-    private String ftpCharset = "UTF-8";
-
-    // 空参构造（JavaBean规范）
-    public SFTPAuthModel() {
-    }
-
-    // 全参构造（快速初始化）
-    public SFTPAuthModel(String ftpServer, int ftpPort, String ftpUsername, String ftpPassword,
-						 String ftpKeyPath, String ftpKeyPwd, String ftpCharset) {
-        this.ftpServer = ftpServer;
-        this.ftpPort = ftpPort;
-        this.ftpUsername = ftpUsername;
-        this.ftpPassword = ftpPassword;
-        this.ftpKeyPath = ftpKeyPath;
-        this.ftpKeyPwd = ftpKeyPwd;
-        this.ftpCharset = ftpCharset;
-    }
-
-    // ==================== Get/Set 方法 ====================
-    public String getFtpServer() {
-        return ftpServer;
-    }
-
-    public void setFtpServer(String ftpServer) {
-        this.ftpServer = ftpServer;
-    }
-
-    public int getFtpPort() {
-        return ftpPort;
-    }
-
-    public void setFtpPort(int ftpPort) {
-        this.ftpPort = ftpPort;
-    }
-
-    public String getFtpUsername() {
-        return ftpUsername;
-    }
-
-    public void setFtpUsername(String ftpUsername) {
-        this.ftpUsername = ftpUsername;
-    }
-
-    public String getFtpPassword() {
-        return ftpPassword;
-    }
-
-    public void setFtpPassword(String ftpPassword) {
-        this.ftpPassword = ftpPassword;
-    }
-
-    public String getFtpKeyPath() {
-        return ftpKeyPath;
-    }
-
-    public void setFtpKeyPath(String ftpKeyPath) {
-        this.ftpKeyPath = ftpKeyPath;
-    }
-
-    public String getFtpKeyPwd() {
-        return ftpKeyPwd;
-    }
-
-    public void setFtpKeyPwd(String ftpKeyPwd) {
-        this.ftpKeyPwd = ftpKeyPwd;
-    }
-
-    public String getFtpCharset() {
-        return ftpCharset;
-    }
-
-    public void setFtpCharset(String ftpCharset) {
-        this.ftpCharset = ftpCharset;
-    }
-}
-

libappbase/src/main/java/cc/winboll/studio/libappbase/models/SignCheckResponse.java

@@ -1,39 +0,0 @@
-package cc.winboll.studio.libappbase.models;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/01/22 20:37
- */
-// ==================== JSON响应模型（与后端返回字段完全匹配）====================
-public class SignCheckResponse {
-    private int code;                // 根节点code（后端返回）
-    private String msg;              // 根节点提示信息（后端返回，替换原message）
-    private DataBean data;           // 根节点data对象（后端返回）
-
-    // 内部DataBean：对应后端返回的data字段内容
-    public static class DataBean {
-        private boolean valid;       // 实际是否合法的标识（后端data.valid）
-        private String signature;    // 加密后的签名
-        private String decryptedSign;// 解密后的原始签名
-        private long validTime;      // 时间戳
-    }
-
-    // Getter/Setter（关键：获取data中的valid字段）
-    public boolean isValid() {
-        return data != null && data.valid; // 从data中获取valid值
-    }
-
-    public String getMessage() {
-        return msg; // 对应后端根节点的msg字段
-    }
-
-    // 其他必要的Getter/Setter（用于后续扩展）
-    public int getCode() {
-        return code;
-    }
-
-    public DataBean getData() {
-        return data;
-    }
-}
-

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/APKFileUtils.java

@@ -1,306 +0,0 @@
-package cc.winboll.studio.libappbase.utils;
-
-import cc.winboll.studio.libappbase.LogUtils;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Base64;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-/**
- * APK文件工具类（单例）- 生产级签名+哈希双校验版（修复Too short异常）
- * 1. 稳定解析CERT.RSA原始字节，与客户端Signature.toByteArray()1:1对齐，解决X509解析异常
- * 2. 支持SHA256文件哈希字节级唯一校验，签名+哈希双重验证
- * 3. 入参包含：项目名/版本名/APK名/客户端签名/客户端哈希，适配生产级版本管理
- * 4. APK路径规范：apks_root/项目名/debug/tag/APK文件（支持调试/正式环境）
- * @Author ZhanGSKen<zhangsken@qq.com>
- */
-public class APKFileUtils {
-    // 单例实例
-    private static volatile APKFileUtils sInstance;
-    // 配置项
-    private static final String CONFIG_SECTION = "APP";
-    private static final String KEY_APKS_FOLDER = "apks_folder_path";
-    // 算法常量（与客户端严格对齐）
-    private static final String SIGN_ALGORITHM = "SHA1";    // 签名摘要算法
-    private static final String HASH_ALGORITHM = "SHA-256"; // 文件哈希算法
-    // 签名文件（兼容大小写，适配所有打包工具）
-    private static final String CERT_RSA_UPPER = "META-INF/CERT.RSA";
-    private static final String CERT_RSA_LOWER = "META-INF/cert.rsa";
-    // APK根目录
-    private String apksRootPath;
-
-    private APKFileUtils() {}
-
-    /**
-     * 初始化工具类（需在应用启动时调用）
-     */
-    public static void init() {
-        if (sInstance == null) {
-            synchronized (APKFileUtils.class) {
-                if (sInstance == null) {
-                    sInstance = new APKFileUtils();
-                    //sInstance.loadConfig();
-                }
-            }
-        }
-    }
-
-    /**
-     * 获取单例实例
-     */
-    public static APKFileUtils getInstance() {
-        if (sInstance == null) {
-            LogUtils.e("APKFileUtils", "请先调用init()初始化工具类");
-            throw new IllegalStateException("APKFileUtils未初始化，请先调用init()");
-        }
-        return sInstance;
-    }
-
-    /**
-     * 加载配置文件中的APK根目录
-     */
-//    private void loadConfig() {
-//        try {
-//            apksRootPath = IniConfigUtils.getConfigValue(CONFIG_SECTION, KEY_APKS_FOLDER, "").trim();
-//            if (apksRootPath.isEmpty()) {
-//                LogUtils.e("APKFileUtils", "配置项apks_folder_path为空，初始化失败");
-//                return;
-//            }
-//            File rootDir = new File(apksRootPath);
-//            if (!rootDir.exists() && !rootDir.mkdirs()) {
-//                LogUtils.e("APKFileUtils", "APK根目录创建失败：" + apksRootPath);
-//                apksRootPath = "";
-//                return;
-//            }
-//            LogUtils.i("APKFileUtils", "APK根目录加载成功：" + apksRootPath);
-//        } catch (Exception e) {
-//            LogUtils.e("APKFileUtils", "加载APK根目录配置失败", e);
-//            apksRootPath = "";
-//        }
-//    }
-
-    /**
-     * 对外暴露核心校验方法：签名 + SHA256文件哈希 双校验
-     * 入参包含：项目名/版本名/APK文件名/客户端签名Base64/客户端文件哈希
-     * APK路径规范：apksRootPath/项目名/版本名/APK文件
-     * @param projectName 项目名（非空）
-     * @param versionName 版本名（非空，如15.11.11）
-     * @param apkFileName APK文件名（非空，需以.apk结尾）
-     * @param clientSignBase64 客户端传入的签名Base64（非空）
-     * @param clientFileHash 客户端传入的APK文件SHA256哈希（小写/大写均可，非空）
-     * @return 校验通过返回true，否则false
-     */
-    public static boolean checkAPK(String projectName, String versionName, String apkFileName,
-                                   String clientSignBase64, String clientFileHash) {
-        return getInstance().doCheckAPK(projectName, versionName, apkFileName, clientSignBase64, clientFileHash);
-    }
-
-    /**
-     * 核心校验实现：严格按「哈希先验，签名后验」顺序，哈希不匹配直接返回
-     */
-    private boolean doCheckAPK(String projectName, String versionName, String apkFileName,
-                               String clientSignBase64, String clientFileHash) {
-        // 1. 基础入参非空校验
-        if (isParamEmpty(projectName) || isParamEmpty(versionName) || isParamEmpty(apkFileName)
-            || isParamEmpty(clientSignBase64) || isParamEmpty(clientFileHash)) {
-            LogUtils.w("APKFileUtils", "基础参数不能为空：projectName/versionName/apkFileName/clientSignBase64/clientFileHash");
-            return false;
-        }
-        // 2. APK文件名格式校验
-        if (!apkFileName.endsWith(".apk")) {
-            LogUtils.w("APKFileUtils", "APK文件名格式错误，需以.apk结尾：" + apkFileName);
-            return false;
-        }
-        // 3. APK根目录校验
-        if (isParamEmpty(apksRootPath)) {
-            LogUtils.w("APKFileUtils", "APK根目录未配置，无法进行校验");
-            return false;
-        }
-        // 4. 拼接标准APK路径：根目录/项目名/debug/项目名_版本名.apk（调试环境，可切换tag）
-        String apkFullPath = String.format("%s/%s/debug/%s_%s.apk",
-                                           apksRootPath,
-                                           projectName,
-                                           projectName,
-                                           versionName);
-        //正式环境路径（注释保留，切换时解开即可）
-//        String apkFullPath = String.format("%s/%s/tag/%s_%s.apk",
-//                                           apksRootPath,
-//                                           projectName,
-//                                           projectName,
-//                                           versionName);
-        LogUtils.d("APKFileUtils", String.format("apkFullPath : %s", apkFullPath));
-        File apkFile = new File(apkFullPath);
-        // 5. APK文件存在性校验
-        if (!apkFile.exists() || !apkFile.isFile()) {
-            LogUtils.w("APKFileUtils", "APK文件不存在或非文件类型：" + apkFullPath);
-            return false;
-        }
-
-        try {
-            // ===== 第一步：SHA256文件哈希校验（字节级唯一，优先级最高）=====
-            String serverFileHash = getAPKFileHash(apkFile);
-            if (isParamEmpty(serverFileHash)) {
-                LogUtils.w("APKFileUtils", "解析服务端APK文件哈希失败：" + apkFileName);
-                return false;
-            }
-            boolean isHashMatch = serverFileHash.equalsIgnoreCase(clientFileHash.trim());
-            LogUtils.d("APKFileUtils", "【哈希对比】服务端SHA256：" + serverFileHash);
-            LogUtils.d("APKFileUtils", "【哈希对比】客户端SHA256：" + clientFileHash.trim());
-            if (!isHashMatch) {
-                LogUtils.i("APKFileUtils", "【哈希对比结果】❌ 不匹配（字节级文件不一致）");
-                return false;
-            }
-            LogUtils.i("APKFileUtils", "【哈希对比结果】✅ 匹配（字节级文件完全一致）");
-
-            // ===== 第二步：签名校验（直接读取CERT.RSA原始字节，与客户端严格对齐）=====
-            String serverSignBase64 = getAPKSign(apkFile);
-            if (isParamEmpty(serverSignBase64)) {
-                LogUtils.w("APKFileUtils", "解析服务端APK签名失败：" + apkFileName);
-                return false;
-            }
-            boolean isSignMatch = serverSignBase64.equals(clientSignBase64.trim());
-            LogUtils.d("APKFileUtils", "【签名对比】服务端Base64：" + serverSignBase64);
-            LogUtils.d("APKFileUtils", "【签名对比】客户端Base64：" + clientSignBase64.trim());
-            if (!isSignMatch) {
-                LogUtils.i("APKFileUtils", "【签名对比结果】❌ 不匹配（签名不一致）");
-                return false;
-            }
-            LogUtils.i("APKFileUtils", "【签名对比结果】✅ 匹配（签名完全一致）");
-
-            // 所有校验通过
-            LogUtils.i("APKFileUtils", "APK双校验全部通过：项目名=" + projectName + "，版本名=" + versionName + "，文件名=" + apkFileName);
-            return true;
-        } catch (Exception e) {
-            LogUtils.e("APKFileUtils", "APK双校验异常", e);
-            return false;
-        }
-    }
-
-    /**
-     * 稳定解析APK签名：直接读取CERT.RSA原始字节，SHA1+Base64（与客户端1:1对齐）
-     * 解决X509证书解析的Too short异常，兼容所有APK（普通/加固/自定义打包）
-     * @param apkFile APK文件
-     * @return 签名Base64字符串，失败返回null
-     */
-    private String getAPKSign(File apkFile) {
-        JarFile jarFile = null;
-        InputStream certIs = null;
-        try {
-            jarFile = new JarFile(apkFile);
-            // 先找大写CERT.RSA，找不到再找小写，兼容所有打包工具
-            JarEntry certEntry = jarFile.getJarEntry(CERT_RSA_UPPER);
-            if (certEntry == null) {
-                certEntry = jarFile.getJarEntry(CERT_RSA_LOWER);
-                if (certEntry == null) {
-                    LogUtils.w("APKFileUtils", "APK中未找到签名文件：META-INF/CERT.RSA/cert.rsa");
-                    return null;
-                }
-            }
-            // 核心：直接读取CERT.RSA的原始字节流（不做证书解析，适配PKCS7签名块）
-            certIs = jarFile.getInputStream(certEntry);
-            byte[] sigRawBytes = readStreamToBytes(certIs);
-            if (sigRawBytes == null || sigRawBytes.length == 0) {
-                LogUtils.w("APKFileUtils", "读取CERT.RSA原始字节为空");
-                return null;
-            }
-            // 与客户端完全一致的处理流程：SHA1摘要 → Base64编码（去换行）
-            MessageDigest md = MessageDigest.getInstance(SIGN_ALGORITHM);
-            byte[] signDigest = md.digest(sigRawBytes);
-            String signBase64 = Base64.getEncoder().encodeToString(signDigest)
-				.replaceAll("\\r", "").replaceAll("\\n", "");
-
-            LogUtils.d("APKFileUtils", "APK签名解析成功(Base64)：" + signBase64);
-            return signBase64;
-        } catch (NoSuchAlgorithmException e) {
-            LogUtils.e("APKFileUtils", "解析签名失败：" + SIGN_ALGORITHM + "算法不存在", e);
-            return null;
-        } catch (Exception e) {
-            LogUtils.e("APKFileUtils", "解析APK签名异常", e);
-            return null;
-        } finally {
-            // 强制关闭流资源，避免内存泄漏
-            try {
-                if (certIs != null) certIs.close();
-                if (jarFile != null) jarFile.close();
-            } catch (IOException e) {
-                LogUtils.e("APKFileUtils", "关闭签名文件流失败", e);
-            }
-        }
-    }
-
-    /**
-     * 解析APK文件的SHA256哈希（字节级唯一，任何字节修改都会改变）
-     * @param apkFile APK文件
-     * @return 小写64位SHA256哈希字符串，失败返回null
-     */
-    private String getAPKFileHash(File apkFile) {
-        FileInputStream fis = null;
-        try {
-            MessageDigest md = MessageDigest.getInstance(HASH_ALGORITHM);
-            fis = new FileInputStream(apkFile);
-            byte[] buffer = new byte[8192]; // 8K缓冲区，提升大APK读取效率
-            int len;
-            while ((len = fis.read(buffer)) != -1) {
-                md.update(buffer, 0, len);
-            }
-            // 哈希字节转小写16进制字符串（64位，官方标准格式）
-            byte[] hashBytes = md.digest();
-            StringBuilder sb = new StringBuilder();
-            for (byte b : hashBytes) {
-                sb.append(String.format("%02x", b));
-            }
-            String fileHash = sb.toString();
-            LogUtils.d("APKFileUtils", "APK文件SHA256哈希解析成功：" + fileHash);
-            return fileHash;
-        } catch (NoSuchAlgorithmException e) {
-            LogUtils.e("APKFileUtils", "获取文件哈希失败：" + HASH_ALGORITHM + "算法不存在", e);
-            return null;
-        } catch (Exception e) {
-            LogUtils.e("APKFileUtils", "解析APK文件哈希异常", e);
-            return null;
-        } finally {
-            if (fis != null) {
-                try {
-                    fis.close();
-                } catch (IOException e) {
-                    LogUtils.e("APKFileUtils", "关闭APK文件流失败", e);
-                }
-            }
-        }
-    }
-
-    /**
-     * 流转字节数组工具方法：稳定读取任意输入流，无截断/空指针问题
-     */
-    private byte[] readStreamToBytes(InputStream is) throws IOException {
-        if (is == null) {
-            LogUtils.w("APKFileUtils", "readStreamToBytes: 输入流为null");
-            return new byte[0];
-        }
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        byte[] buffer = new byte[4096];
-        int len;
-        while ((len = is.read(buffer)) != -1) {
-            bos.write(buffer, 0, len);
-        }
-        byte[] result = bos.toByteArray();
-        // 按顺序关闭流
-        is.close();
-        bos.close();
-        return result;
-    }
-
-    /**
-     * 工具方法：判断参数是否为空（null/空字符串/全空格）
-     */
-    private boolean isParamEmpty(String param) {
-        return param == null || param.trim().isEmpty();
-    }
-}
-

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/APPUtils.java

@@ -1,199 +0,0 @@
-package cc.winboll.studio.libappbase.utils;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Base64;
-
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.models.SignCheckResponse;
-
-import com.google.gson.Gson;
-
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @CreateTime 2026-01-20 19:17:00
- * @LastEditTime 2026-01-24 17:58:00
- * @Describe APPUtils 应用合法性校验工具类（OKHTTP网络校验版，兼容Java7）
- * 对外传入签名/哈希值，拼接调试标识后发起网络校验，主线程返回校验结果
- */
-public class APPUtils {
-    // ===================================== 全局常量/单例属性 =====================================
-    public static final String TAG = "APPUtils";
-    // 网络校验接口基础地址
-    private static final String CHECK_API_URI = "api/app-signatures-check";
-    // OKHTTP客户端单例（复用连接，避免资源浪费）
-    private static final OkHttpClient sOkHttpClient = new OkHttpClient();
-    // Gson解析单例（全局复用，提高解析效率）
-    private static final Gson sGson = new Gson();
-
-    // ===================================== 对外核心校验方法 =====================================
-    /**
-     * 检查应用合法性（外部传入签名+哈希，拼接调试标识发起网络校验）
-     * @param context      上下文，用于主线程回调
-     * @param projectName  项目名称（服务端区分项目标识）
-     * @param versionName  应用版本名（服务端版本校验）
-     * @param clientSign   外部计算的应用签名字符串（Base64）
-     * @param clientHash   外部计算的APK SHA256哈希字符串（小写16进制）
-     * @param callback     校验结果回调（主线程调用，返回是否合法+提示信息）
-     */
-    public void checkAPKValidation(Context context, String appName, String versionName,
-                                   String clientSign, String clientHash, final CheckResultCallback callback) {
-        // 方法调用+全量入参调试日志
-        LogUtils.d(TAG, "checkAPKValidation: 方法调用，入参-> appName=" + appName
-				   + ", versionName=" + versionName + ", clientSign=" + clientSign + ", clientHash=" + clientHash);
-
-        // 1. 核心入参空值校验（快速失败）
-        if (context == null) {
-            LogUtils.w(TAG, "checkAPKValidation: 入参context为空，直接返回校验失败");
-            callCallbackOnMainThread(callback, false, "上下文对象不能为空");
-            return;
-        }
-        if (isStringEmpty(appName)) {
-            LogUtils.w(TAG, "checkAPKValidation: 入参projectName为空/空白，直接返回校验失败");
-            callCallbackOnMainThread(callback, false, "项目名称不能为空");
-            return;
-        }
-        if (isStringEmpty(versionName)) {
-            LogUtils.w(TAG, "checkAPKValidation: 入参versionName为空/空白，直接返回校验失败");
-            callCallbackOnMainThread(callback, false, "应用版本名不能为空");
-            return;
-        }
-        if (isStringEmpty(clientSign)) {
-            LogUtils.w(TAG, "checkAPKValidation: 入参clientSign为空/空白，直接返回校验失败");
-            callCallbackOnMainThread(callback, false, "应用签名字符串不能为空");
-            return;
-        }
-        if (isStringEmpty(clientHash)) {
-            LogUtils.w(TAG, "checkAPKValidation: 入参clientHash为空/空白，直接返回校验失败");
-            callCallbackOnMainThread(callback, false, "APK SHA256哈希字符串不能为空");
-            return;
-        }
-        LogUtils.d(TAG, "checkAPKValidation: 入参校验通过，开始处理网络请求");
-
-        // 2. 动态参数URL编码（避免特殊字符导致请求解析异常）
-        LogUtils.d(TAG, "checkAPKValidation: 开始对动态参数进行UTF-8 URL编码");
-        String encodeProjectName = urlEncode(appName);
-        String encodeVersionName = urlEncode(versionName);
-        String encodeClientSign = urlEncode(clientSign);
-        String encodeClientHash = urlEncode(clientHash);
-        String isDebug = String.valueOf(GlobalApplication.isDebugging());
-        LogUtils.d(TAG, "checkAPKValidation: 参数编码完成，debug标识=" + isDebug);
-
-        // 3. 构建完整网络校验请求URL
-        String requestUrl = String.format("%s?isDebug=%s&projectName=%s&versionName=%s&clientSign=%s&clientHash=%s",
-										  GlobalApplication.getWinbollHost() + CHECK_API_URI,
-										  isDebug,
-										  encodeProjectName,
-										  encodeVersionName,
-										  encodeClientSign,
-										  encodeClientHash);
-        LogUtils.d(TAG, "checkAPKValidation: 构建网络校验请求URL=" + requestUrl);
-
-        // 4. 发起OKHTTP异步GET请求（避免阻塞主线程）
-        LogUtils.d(TAG, "checkAPKValidation: 发起异步网络校验请求");
-        Request request = new Request.Builder().url(requestUrl).build();
-        sOkHttpClient.newCall(request).enqueue(new Callback() {
-				@Override
-				public void onFailure(Call call, IOException e) {
-					String errorMsg = "网络校验请求失败：" + e.getMessage();
-					LogUtils.e(TAG, "checkAPKValidation: " + errorMsg, e);
-					callCallbackOnMainThread(callback, false, errorMsg);
-				}
-
-				@Override
-				public void onResponse(Call call, Response response) throws IOException {
-					if (response.isSuccessful() && response.body() != null) {
-						// 响应成功，解析返回JSON
-						String responseJson = response.body().string();
-						LogUtils.d(TAG, "checkAPKValidation: 网络校验响应成功，JSON=" + responseJson);
-						SignCheckResponse checkResponse = sGson.fromJson(responseJson, SignCheckResponse.class);
-						boolean isValid = checkResponse != null && checkResponse.isValid();
-						String msg = checkResponse != null ? checkResponse.getMessage() : "服务端响应解析失败";
-						LogUtils.d(TAG, "checkAPKValidation: 校验结果解析完成，isValid=" + isValid + ", 提示信息=" + msg);
-						callCallbackOnMainThread(callback, isValid, msg);
-					} else {
-						// 响应失败，返回状态码信息
-						String errorMsg = "网络校验响应失败，服务端状态码=" + response.code();
-						LogUtils.e(TAG, "checkAPKValidation: " + errorMsg);
-						callCallbackOnMainThread(callback, false, errorMsg);
-					}
-				}
-			});
-    }
-
-    // ===================================== 内部工具方法 =====================================
-    /**
-     * 字符串空值/空白校验工具
-     * @param str 待校验字符串
-     * @return true=空/空白，false=非空
-     */
-    private boolean isStringEmpty(String str) {
-        return str == null || str.trim().isEmpty();
-    }
-
-    /**
-     * URL编码工具（Java7适配，UTF-8编码，处理特殊字符）
-     * @param content 待编码内容
-     * @return 编码后的字符串，编码失败返回原内容
-     */
-    private String urlEncode(String content) {
-        try {
-            return URLEncoder.encode(content, "UTF-8");
-        } catch (Exception e) {
-            LogUtils.e(TAG, "urlEncode: 字符串编码失败，content=" + content, e);
-            return content;
-        }
-    }
-
-    /**
-     * 主线程执行回调（统一处理，避免外部线程切换）
-     * @param callback 回调接口
-     * @param isValid  是否合法
-     * @param message   提示信息
-     */
-    private void callCallbackOnMainThread(final CheckResultCallback callback,
-                                          final boolean isValid, final String message) {
-        if (callback == null) {
-            LogUtils.w(TAG, "callCallbackOnMainThread: 回调接口为null，无需执行");
-            return;
-        }
-        // 已在主线程直接执行，否则切换主线程
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            callback.onResult(isValid, message);
-        } else {
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-					@Override
-					public void run() {
-						callback.onResult(isValid, message);
-					}
-				});
-        }
-    }
-
-    // ===================================== 校验结果回调接口 =====================================
-    /**
-     * 应用合法性校验结果回调接口（主线程调用）
-     */
-    public interface CheckResultCallback {
-        /**
-         * 校验结果回调方法
-         * @param isValid 是否合法（true=校验通过，false=校验失败）
-         * @param message 校验提示信息（失败时返回错误原因，成功时返回服务端提示）
-         */
-        void onResult(boolean isValid, String message);
-    }
-}
-

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/ApkSignUtils.java

@@ -1,272 +0,0 @@
-package cc.winboll.studio.libappbase.utils;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.Signature;
-import android.util.Base64;
-
-import cc.winboll.studio.libappbase.LogUtils;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Enumeration;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @CreateTime 2026-01-24 10:00:00
- * @LastEditTime 2026-01-24 22:00:00
- * @Describe 客户端签名工具类：与服务端APKFileUtils签名/哈希校验逻辑严格对齐，纯Java7实现；兼容MT重签名（遍历META-INF所有RSA文件），增加PackageManager兜底方案
- */
-public class ApkSignUtils {
-    // ===================================== 全局常量定义 =====================================
-    private static final String TAG = "ApkSignUtils";
-    // 加密算法常量
-    private static final String ALGORITHM_SHA1 = "SHA1";
-    private static final String ALGORITHM_SHA256 = "SHA-256";
-    // 缓冲区大小常量（按业务场景区分）
-    private static final int BUFFER_4K = 4096;
-    private static final int BUFFER_8K = 8192;
-    // 签名文件目录与后缀
-    private static final String META_INF_DIR = "META-INF/";
-    private static final String RSA_SUFFIX_UPPER = ".RSA";
-    private static final String RSA_SUFFIX_LOWER = ".rsa";
-
-    // ===================================== 对外核心方法 =====================================
-    /**
-     * 获取与服务端对齐的签名Base64串（兼容MT重签名）
-     * 优先逻辑：遍历APK内META-INF所有.RSA文件 → 读取第一个有效文件原始字节 → SHA1摘要 → Base64.NO_WRAP
-     * 兜底逻辑：PackageManager获取系统解析的签名 → SHA1摘要 → Base64.NO_WRAP
-     * @param context 上下文，用于获取当前应用APK路径/包信息
-     * @return 签名Base64字符串，任意步骤失败返回null
-     */
-    public static String getApkSignAlignedWithServer(Context context) {
-        LogUtils.d(TAG, "getApkSignAlignedWithServer: 方法调用，开始执行服务端对齐签名计算（兼容MT重签名）");
-        // 入参空值快速校验
-        if (context == null) {
-            LogUtils.w(TAG, "getApkSignAlignedWithServer: 入参context为null，直接返回null");
-            return null;
-        }
-
-        // 方案1：优先读取APK内META-INF目录下所有RSA文件（兼容MT重签名任意命名）
-        String signBase64 = getSignFromApkRsaFile(context);
-        if (signBase64 != null) {
-            LogUtils.d(TAG, "getApkSignAlignedWithServer: 方案1成功（APK内读取RSA文件），返回签名Base64");
-            return signBase64;
-        }
-
-        // 方案2：兜底 - PackageManager获取系统解析的应用签名（避免APK文件读取失败）
-        signBase64 = getSignFromPackageManager(context);
-        if (signBase64 != null) {
-            LogUtils.d(TAG, "getApkSignAlignedWithServer: 方案2成功（PackageManager兜底），返回签名Base64");
-            return signBase64;
-        }
-
-        // 所有方案失败
-        LogUtils.e(TAG, "getApkSignAlignedWithServer: 所有签名获取方案均失败");
-        return null;
-    }
-
-    /**
-     * 获取当前运行APK的SHA256哈希值（兼容重签名APK）
-     * 逻辑：读取APK完整文件字节流 → SHA256摘要 → 转小写64位16进制字符串，服务端同款校验逻辑
-     * @param context 上下文，用于获取当前应用APK的真实安装路径
-     * @return SHA256小写16进制字符串，任意步骤失败返回null
-     */
-    public static String getApkSHA256Hash(Context context) {
-        LogUtils.d(TAG, "getApkSHA256Hash: 方法调用，开始执行APK文件SHA256哈希计算");
-        // 入参空值快速校验
-        if (context == null) {
-            LogUtils.w(TAG, "getApkSHA256Hash: 入参context为null，直接返回null");
-            return null;
-        }
-
-        JarFile jarFile = null;
-        FileInputStream fis = null;
-        try {
-            // 1. 获取当前应用APK真实路径
-            ApplicationInfo appInfo = context.getApplicationContext().getApplicationInfo();
-            String apkPath = appInfo.sourceDir;
-            LogUtils.d(TAG, "getApkSHA256Hash: 成功获取APK路径，path=" + apkPath);
-            if (apkPath == null || apkPath.trim().isEmpty()) {
-                LogUtils.e(TAG, "getApkSHA256Hash: 获取到的APK路径为空，无法读取文件计算哈希");
-                return null;
-            }
-
-            // 2. 读取APK文件并计算SHA256哈希（完善流关闭）
-            File apkFile = new File(apkPath);
-            MessageDigest md = MessageDigest.getInstance(ALGORITHM_SHA256);
-            fis = new FileInputStream(apkFile);
-            byte[] buffer = new byte[BUFFER_8K];
-            int readLen;
-            while ((readLen = fis.read(buffer)) != -1) {
-                md.update(buffer, 0, readLen);
-            }
-            LogUtils.d(TAG, "getApkSHA256Hash: APK文件读取完成，开始转换哈希结果");
-
-            // 3. 哈希字节数组转小写64位16进制字符串
-            byte[] hashBytes = md.digest();
-            StringBuilder sb = new StringBuilder();
-            for (byte b : hashBytes) {
-                sb.append(String.format("%02x", b));
-            }
-            String sha256Hash = sb.toString();
-            LogUtils.d(TAG, "getApkSHA256Hash: APK SHA256哈希计算完成，成功返回结果");
-            return sha256Hash;
-
-        } catch (NoSuchAlgorithmException e) {
-            LogUtils.e(TAG, "getApkSHA256Hash: 获取SHA-256算法实例失败", e);
-        } catch (Exception e) {
-            LogUtils.e(TAG, "getApkSHA256Hash: 计算APK SHA256哈希发生未知异常", e);
-        } finally {
-            // 强制关闭流，避免重签名APK解析的流泄漏
-            try {
-                if (fis != null) fis.close();
-                if (jarFile != null) jarFile.close();
-            } catch (IOException e) {
-                LogUtils.e(TAG, "getApkSHA256Hash: 关闭流资源异常", e);
-            }
-        }
-        return null;
-    }
-
-    // ===================================== 内部核心工具方法（兼容重签名） =====================================
-    /**
-     * 方案1：遍历APK内META-INF所有.RSA/.rsa文件，读取第一个有效文件计算签名
-     * @param context 上下文
-     * @return 签名Base64，失败返回null
-     */
-    private static String getSignFromApkRsaFile(Context context) {
-        JarFile jarFile = null;
-        InputStream is = null;
-        try {
-            // 获取APK路径
-            ApplicationInfo appInfo = context.getApplicationContext().getApplicationInfo();
-            String apkPath = appInfo.sourceDir;
-            if (apkPath == null || apkPath.trim().isEmpty()) {
-                LogUtils.w(TAG, "getSignFromApkRsaFile: APK路径为空，跳过该方案");
-                return null;
-            }
-
-            // 打开APK的JarFile
-            jarFile = new JarFile(apkPath);
-            Enumeration<JarEntry> entries = jarFile.entries();
-            JarEntry targetRsaEntry = null;
-
-            // 遍历所有条目，找到META-INF下第一个.RSA/.rsa文件
-            while (entries.hasMoreElements()) {
-                JarEntry entry = entries.nextElement();
-                String entryName = entry.getName();
-                // 过滤：META-INF目录下 + 以.RSA/.rsa结尾 + 非目录
-                if (entryName.startsWith(META_INF_DIR) && !entry.isDirectory()
-					&& (entryName.endsWith(RSA_SUFFIX_UPPER) || entryName.endsWith(RSA_SUFFIX_LOWER))) {
-                    targetRsaEntry = entry;
-                    LogUtils.d(TAG, "getSignFromApkRsaFile: 找到有效签名文件，name=" + entryName);
-                    break; // 取第一个有效RSA文件即可
-                }
-            }
-
-            // 未找到任何RSA文件
-            if (targetRsaEntry == null) {
-                LogUtils.w(TAG, "getSignFromApkRsaFile: 未在META-INF找到任何.RSA/.rsa签名文件");
-                return null;
-            }
-
-            // 读取RSA文件原始字节
-            is = jarFile.getInputStream(targetRsaEntry);
-            byte[] certRawBytes = readStreamToBytes(is);
-            if (certRawBytes == null || certRawBytes.length == 0) {
-                LogUtils.w(TAG, "getSignFromApkRsaFile: 读取RSA文件字节为空");
-                return null;
-            }
-
-            // 计算SHA1+Base64
-            MessageDigest md = MessageDigest.getInstance(ALGORITHM_SHA1);
-            byte[] signDigest = md.digest(certRawBytes);
-            return Base64.encodeToString(signDigest, Base64.NO_WRAP);
-
-        } catch (Exception e) {
-            LogUtils.e(TAG, "getSignFromApkRsaFile: 从APK内读取RSA文件失败", e);
-            return null;
-        } finally {
-            // 强制关闭所有流
-            try {
-                if (is != null) is.close();
-                if (jarFile != null) jarFile.close();
-            } catch (IOException e) {
-                LogUtils.e(TAG, "getSignFromApkRsaFile: 关闭流资源异常", e);
-            }
-        }
-    }
-
-    /**
-     * 方案2：兜底 - 通过PackageManager获取系统解析的应用签名
-     * 避免APK文件读取失败（如权限、解析问题），兼容所有重签名场景
-     * @param context 上下文
-     * @return 签名Base64，失败返回null
-     */
-    private static String getSignFromPackageManager(Context context) {
-        try {
-            // 获取当前应用包信息（包含签名）
-            PackageInfo packageInfo = context.getPackageManager()
-				.getPackageInfo(context.getPackageName(), PackageManager.GET_SIGNATURES);
-            if (packageInfo == null || packageInfo.signatures == null || packageInfo.signatures.length == 0) {
-                LogUtils.w(TAG, "getSignFromPackageManager: 未获取到应用签名信息");
-                return null;
-            }
-
-            // 取第一个签名（重签名后一般只有一个签名）
-            Signature signature = packageInfo.signatures[0];
-            byte[] signBytes = signature.toByteArray();
-
-            // 计算SHA1+Base64，与服务端逻辑对齐
-            MessageDigest md = MessageDigest.getInstance(ALGORITHM_SHA1);
-            byte[] signDigest = md.digest(signBytes);
-            return Base64.encodeToString(signDigest, Base64.NO_WRAP);
-
-        } catch (PackageManager.NameNotFoundException e) {
-            LogUtils.e(TAG, "getSignFromPackageManager: 包名未找到，无法获取签名", e);
-        } catch (NoSuchAlgorithmException e) {
-            LogUtils.e(TAG, "getSignFromPackageManager: 获取SHA1算法实例失败", e);
-        } catch (Exception e) {
-            LogUtils.e(TAG, "getSignFromPackageManager: PackageManager获取签名失败", e);
-        }
-        return null;
-    }
-
-    /**
-     * 输入流转字节数组，通用工具方法（完善try-finally）
-     * 4K缓冲区，适配小文件读取（如RSA签名文件），保证流资源正常关闭
-     * @param is 待读取的输入流
-     * @return 转换后的字节数组，流为null/读取失败返回空字节数组
-     * @throws IOException 流读取相关异常向上抛出
-     */
-    private static byte[] readStreamToBytes(InputStream is) throws IOException {
-        if (is == null) {
-            LogUtils.w(TAG, "readStreamToBytes: 入参输入流为null，返回空字节数组");
-            return new byte[0];
-        }
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        byte[] buffer = new byte[BUFFER_4K];
-        int readLen;
-        try {
-            while ((readLen = is.read(buffer)) != -1) {
-                bos.write(buffer, 0, readLen);
-            }
-            return bos.toByteArray();
-        } finally {
-            // 强制关闭所有流
-            is.close();
-            bos.close();
-        }
-    }
-}
-

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/BackupUtils.java

@@ -1,305 +0,0 @@
-package cc.winboll.studio.libappbase.utils;
-
-import android.content.Context;
-import android.os.Environment;
-import android.text.TextUtils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.models.SFTPAuthModel;
-
-/**
- * 文件备份工具类（单例模式）
- * 区分应用Data目录/应用专属外部文件目录双Map管理备份文件路径
- * 核心功能：文件添加/移除 + ZIP打包（分data/sdcard目录） + SFTP分步式上传（登录→传输→登出）
- * 依赖：FTPUtils（单例）、SFTPAuthModel（外部实体类）、Android上下文
- * 兼容：Java7、Android 6.0+，无第三方依赖（ZIP为原生实现），免动态读写权限
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/01/30 20:18:00
- * @LastEditTime 2026/02/01 02:05:00
- */
-public class BackupUtils {
-    public static final String TAG = "BackupUtils";
-    // ZIP内部分级目录常量（统一维护，便于修改）
-    private static final String ZIP_DIR_DATA = "data/";
-    private static final String ZIP_DIR_SDCARD = "sdcard/";
-
-    // 单例实例（双重校验锁，volatile保证可见性，线程安全）
-    private static volatile BackupUtils sInstance;
-
-    // 双Map分目录管理：key=文件唯一标识，value=对应目录下的相对路径
-    private final Map<String, String> mDataDirFileMap; // 基础根目录：应用私有Data目录(/data/data/[包名]/files)
-    private final Map<String, String> mSdcardFileMap; // 基础根目录：应用专属外部文件目录(/storage/emulated/0/Android/data/[包名]/files)
-
-    // 全局上下文（持有Application上下文，避免Activity内存泄漏）
-    private Context mAppContext;
-    // SFTP认证配置（直接引用外部实体类，无内部封装）
-    private SFTPAuthModel mFtpAuthModel;
-    // SFTP服务器指定上传目录（独立参数传入，标准化后作为成员变量）
-    private String mFtpTargetDir;
-    // 应用专属外部文件目录（SDCard Map的基础根目录，初始化时赋值，避免重复创建）
-    private File mAppExternalFilesDir;
-
-    // 私有构造器：新增双Map入参，空值则使用内部默认初始化，非空则用入参初始化
-    private BackupUtils(Context context, SFTPAuthModel ftpAuthModel, String ftpTargetDir,
-                        Map<String, String> dataDirFileMap, Map<String, String> sdcardFileMap) {
-        this.mAppContext = context.getApplicationContext();
-        this.mFtpAuthModel = ftpAuthModel;
-        // 初始化SDCard Map的基础根目录：应用专属外部文件目录（/storage/emulated/0/Android/data/[包名]/files）
-        this.mAppExternalFilesDir = mAppContext.getExternalFilesDir(null);
-        // 标准化SFTP上传目录：空则默认/，非空则补全结尾斜杠
-        this.mFtpTargetDir = TextUtils.isEmpty(ftpTargetDir) ? "/" : (ftpTargetDir.endsWith("/") ? ftpTargetDir : ftpTargetDir + "/");
-
-        // 核心修改：入参Map非空且非空集合时，使用入参初始化；否则内部new HashMap()
-        this.mDataDirFileMap = (dataDirFileMap != null && !dataDirFileMap.isEmpty()) 
-			? new HashMap<>(dataDirFileMap) // 新建Map避免外部篡改内部数据
-			: new HashMap<>();
-        this.mSdcardFileMap = (sdcardFileMap != null && !sdcardFileMap.isEmpty())
-			? new HashMap<>(sdcardFileMap) // 深拷贝，隔离外部引用
-			: new HashMap<>();
-
-        LogUtils.d(TAG, "BackupUtils初始化完成 → SFTP服务器：" + ftpAuthModel.getFtpServer() + ":" + ftpAuthModel.getFtpPort() + " | 上传目录：" + mFtpTargetDir);
-        LogUtils.d(TAG, "SDCard Map基础根目录：" + (mAppExternalFilesDir == null ? "获取失败" : mAppExternalFilesDir.getAbsolutePath()));
-        LogUtils.d(TAG, "初始化后DataMap大小：" + mDataDirFileMap.size() + " | SdcardMap大小：" + mSdcardFileMap.size());
-    }
-
-    /**
-     * 单例初始化方法（必须先调用，否则getInstance()会抛异常）
-     * 新增双Map入参，支持外部初始化待备份文件列表
-     * @param context 上下文（推荐传Application，避免内存泄漏）
-     * @param ftpAuthModel 外部SFTP认证实体类（含服务器/账号/端口等）
-     * @param ftpTargetDir SFTP服务器指定上传目录（如/backup，自动补全斜杠）
-     * @param dataDirFileMap 外部传入的Data目录文件Map，null/空则内部默认初始化
-     * @param sdcardFileMap 外部传入的SDCard目录文件Map，null/空则内部默认初始化
-     * @return BackupUtils单例实例
-     */
-    public static BackupUtils getInstance(Context context, SFTPAuthModel ftpAuthModel, String ftpTargetDir,
-                                          Map<String, String> dataDirFileMap, Map<String, String> sdcardFileMap) {
-        if (sInstance == null) {
-            synchronized (BackupUtils.class) {
-                if (sInstance == null) {
-                    // 前置强校验：避免空参数导致后续空指针
-                    if (context == null) {
-                        throw new IllegalArgumentException("初始化失败：Context 不能为空");
-                    }
-                    if (ftpAuthModel == null || TextUtils.isEmpty(ftpAuthModel.getFtpServer())) {
-                        throw new IllegalArgumentException("初始化失败：SFTPAuthModel/ftpServer 不能为空");
-                    }
-                    // 透传新增的双Map入参至构造器
-                    sInstance = new BackupUtils(context, ftpAuthModel, ftpTargetDir, dataDirFileMap, sdcardFileMap);
-                }
-            }
-        }
-        return sInstance;
-    }
-
-    /**
-     * 重载默认初始化方法：兼容原有调用逻辑，无需传入Map，内部默认初始化
-     * 避免修改后影响原有代码调用
-     */
-    public static BackupUtils getInstance(Context context, SFTPAuthModel ftpAuthModel, String ftpTargetDir) {
-        return getInstance(context, ftpAuthModel, ftpTargetDir, null, null);
-    }
-
-    /**
-     * 获取单例实例（需先调用带参getInstance初始化）
-     * @return BackupUtils单例实例
-     */
-    public static BackupUtils getInstance() {
-        if (sInstance == null) {
-            throw new IllegalStateException("BackupUtils未初始化，请先调用getInstance(Context, SFTPAuthModel, String[, Map, Map])");
-        }
-        return sInstance;
-    }
-
-    // ====================================== 以下原有方法均未修改 ======================================
-    public void addDataDirFile(String key, String relativePath) {
-        if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(relativePath)) {
-            mDataDirFileMap.put(key, relativePath);
-            LogUtils.d(TAG, "添加Data目录文件：" + key + " → " + relativePath);
-        }
-    }
-
-    public void removeDataDirFile(String key) {
-        if (!TextUtils.isEmpty(key) && mDataDirFileMap.containsKey(key)) {
-            mDataDirFileMap.remove(key);
-            LogUtils.d(TAG, "移除Data目录文件：" + key);
-        }
-    }
-
-    public String getDataDirFile(String key) {
-        return mDataDirFileMap.get(key);
-    }
-
-    public Map<String, String> getAllDataDirFiles() {
-        return new HashMap<>(mDataDirFileMap);
-    }
-
-    public void clearDataDirFiles() {
-        mDataDirFileMap.clear();
-        LogUtils.d(TAG, "清空Data目录所有备份文件");
-    }
-
-    public void addSdcardFile(String key, String relativePath) {
-        if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(relativePath) && mAppExternalFilesDir != null) {
-            mSdcardFileMap.put(key, relativePath);
-            LogUtils.d(TAG, "添加外部文件目录文件：" + key + " → " + relativePath);
-        }
-    }
-
-    public void removeSdcardFile(String key) {
-        if (!TextUtils.isEmpty(key) && mSdcardFileMap.containsKey(key)) {
-            mSdcardFileMap.remove(key);
-            LogUtils.d(TAG, "移除外部文件目录文件：" + key);
-        }
-    }
-
-    public String getSdcardFile(String key) {
-        return mSdcardFileMap.get(key);
-    }
-
-    public Map<String, String> getAllSdcardFiles() {
-        return new HashMap<>(mSdcardFileMap);
-    }
-
-    public void clearSdcardFiles() {
-        mSdcardFileMap.clear();
-        LogUtils.d(TAG, "清空外部文件目录所有备份文件");
-    }
-
-    public boolean packAndUploadByFtp() {
-        if (mDataDirFileMap.isEmpty() && mSdcardFileMap.isEmpty()) {
-            LogUtils.e(TAG, "SFTP上传失败：无待备份文件（DataDir+外部文件目录均为空）");
-            return false;
-        }
-        if (mAppExternalFilesDir == null) {
-            LogUtils.e(TAG, "SFTP上传失败：应用专属外部文件目录获取失败，无法访问文件");
-            return false;
-        }
-
-        String zipFileName = UUID.randomUUID().toString().replace("-", "")
-			+ "-" + System.currentTimeMillis() + ".zip";
-        File tempZipFile = new File(mAppContext.getExternalCacheDir(), zipFileName);
-        String remoteFtpFilePath = mFtpTargetDir + zipFileName;
-
-        FTPUtils ftpUtils = FTPUtils.getInstance();
-        boolean isUploadSuccess = false;
-
-        try {
-            LogUtils.d(TAG, "开始SFTP登录：" + mFtpAuthModel.getFtpServer() + ":" + mFtpAuthModel.getFtpPort());
-            boolean isFtpLogin = ftpUtils.login(mFtpAuthModel);
-            if (!isFtpLogin) {
-                LogUtils.e(TAG, "SFTP上传失败：SFTP登录失败（账号/密码/服务器/端口错误）");
-                return false;
-            }
-            LogUtils.i(TAG, "SFTP登录成功，准备打包文件：" + zipFileName);
-
-            LogUtils.d(TAG, "开始本地ZIP打包（分data/sdcard目录），临时文件路径：" + tempZipFile.getAbsolutePath());
-            boolean isPackSuccess = packFilesToZip(tempZipFile);
-            if (!isPackSuccess || !tempZipFile.exists() || tempZipFile.length() == 0) {
-                LogUtils.e(TAG, "SFTP上传失败：ZIP打包失败（文件不存在/空文件）");
-                return false;
-            }
-            LogUtils.i(TAG, "ZIP打包成功，文件大小：" + tempZipFile.length() / 1024 + "KB");
-
-            LogUtils.d(TAG, "开始SFTP上传：本地→SFTP" + remoteFtpFilePath);
-            isUploadSuccess = ftpUtils.uploadFile(tempZipFile.getAbsolutePath(), remoteFtpFilePath);
-            if (isUploadSuccess) {
-                LogUtils.i(TAG, "SFTP上传全流程成功：" + remoteFtpFilePath);
-            } else {
-                LogUtils.e(TAG, "SFTP上传失败：文件传输到服务器失败（响应码异常/权限不足）");
-            }
-
-        } catch (Exception e) {
-            LogUtils.e(TAG, "SFTP上传异常：" + e.getMessage(), e);
-            isUploadSuccess = false;
-        } finally {
-            if (ftpUtils.isConnected()) {
-                ftpUtils.logout();
-            }
-            ftpUtils.disconnect();
-            if (tempZipFile.exists()) {
-                boolean isDelete = tempZipFile.delete();
-                LogUtils.d(TAG, "本地临时ZIP文件删除：" + (isDelete ? "成功" : "失败"));
-            }
-            System.gc();
-        }
-
-        return isUploadSuccess;
-    }
-
-    private boolean packFilesToZip(File zipFile) {
-        ZipOutputStream zos = null;
-        try {
-            zos = new ZipOutputStream(new FileOutputStream(zipFile), Charset.forName("UTF-8"));
-            zos.setLevel(ZipOutputStream.DEFLATED);
-
-            if (!mDataDirFileMap.isEmpty()) {
-                packDirFilesToZip(zos, mDataDirFileMap, mAppContext.getFilesDir(), ZIP_DIR_DATA);
-                LogUtils.d(TAG, "Data目录文件已打包到ZIP→" + ZIP_DIR_DATA + "子目录");
-            }
-            if (!mSdcardFileMap.isEmpty() && mAppExternalFilesDir != null) {
-                packDirFilesToZip(zos, mSdcardFileMap, mAppExternalFilesDir, ZIP_DIR_SDCARD);
-                LogUtils.d(TAG, "应用专属外部文件目录文件已打包到ZIP→" + ZIP_DIR_SDCARD + "子目录");
-            }
-
-            zos.flush();
-            return true;
-        } catch (IOException e) {
-            LogUtils.e(TAG, "ZIP打包IO异常：" + e.getMessage(), e);
-            return false;
-        } finally {
-            if (zos != null) {
-                try {
-                    zos.close();
-                } catch (IOException e) {
-                    LogUtils.e(TAG, "关闭ZIP流异常：" + e.getMessage(), e);
-                }
-            }
-        }
-    }
-
-    private void packDirFilesToZip(ZipOutputStream zos, Map<String, String> fileMap, File baseDir, String zipSubDir) {
-        for (Map.Entry<String, String> entry : fileMap.entrySet()) {
-            String relativePath = entry.getValue();
-            if (TextUtils.isEmpty(relativePath)) {
-                continue;
-            }
-            File localFile = new File(baseDir, relativePath);
-            if (!localFile.exists() || !localFile.isFile()) {
-                LogUtils.w(TAG, "跳过无效文件：" + localFile.getAbsolutePath());
-                continue;
-            }
-            String zipInnerPath = zipSubDir + relativePath;
-            try {
-                addSingleFileToZip(zos, localFile, zipInnerPath);
-            } catch (IOException e) {
-                LogUtils.e(TAG, "打包单个文件失败：" + zipInnerPath, e);
-            }
-        }
-    }
-
-    private void addSingleFileToZip(ZipOutputStream zos, File localFile, String zipInnerPath) throws IOException {
-        ZipEntry zipEntry = new ZipEntry(zipInnerPath);
-        zos.putNextEntry(zipEntry);
-        FileInputStream fis = new FileInputStream(localFile);
-        byte[] buffer = new byte[4096];
-        int len;
-        while ((len = fis.read(buffer)) != -1) {
-            zos.write(buffer, 0, len);
-        }
-        fis.close();
-        zos.closeEntry();
-    }
-}
-

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/FTPUtils.java

@@ -1,487 +0,0 @@
-package cc.winboll.studio.libappbase.utils;
-
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.models.SFTPAuthModel;
-import com.jcraft.jsch.ChannelSftp;
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
-import com.jcraft.jsch.SftpATTRS;
-import com.jcraft.jsch.SftpException;
-
-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.util.Properties;
-import java.util.Vector;
-
-/**
- * SFTP/FTP工具类（单例模式）- Java7兼容 · 适配FTPAuthModel实体类
- * 底层严格基于JSch 0.1.54原生ChannelSftp+SftpException接口实现，替换原commons-net FTP
- * 核心功能：登录/登出、文件上传/下载、文件夹列举、文件/文件夹存在性判断
- * 依赖：com.jcraft:jsch:0.1.54
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/01/30 19:04
- */
-public class FTPUtils {
-    // 单例实例（双重校验锁 volatile 保证可见性，Java7兼容）
-    private static volatile FTPUtils sInstance;
-    // JSch核心对象：Session（连接会话）、ChannelSftp（SFTP通道）
-    private JSch mJSch;
-    private Session mSession;
-    private ChannelSftp mSftpChannel;
-    // 日志TAG
-    public static final String TAG = "FTPUtils";
-    // SFTP默认端口（FTPAuthModel未设置时使用）
-    private static final int DEFAULT_SFTP_PORT = 22;
-    // 连接超时时间 5s（Java7原生Socket超时）
-    private static final int CONNECT_TIMEOUT = 5000;
-
-    // 私有构造器：禁止外部实例化
-    private FTPUtils() {
-        initSftpClient();
-    }
-
-    /**
-     * 获取单例实例（双重校验锁，线程安全，Java7兼容）
-     * @return FTPUtils 单例
-     */
-    public static FTPUtils getInstance() {
-        if (sInstance == null) {
-            synchronized (FTPUtils.class) {
-                if (sInstance == null) {
-                    sInstance = new FTPUtils();
-                }
-            }
-        }
-        return sInstance;
-    }
-
-    /**
-     * 初始化SFTP客户端（JSch），创建核心原生对象
-     */
-    private void initSftpClient() {
-        if (mJSch == null) {
-            mJSch = new JSch();
-            LogUtils.d(TAG, "SFTP客户端（JSch）初始化完成");
-        }
-        // 重置会话和通道，避免连接残留
-        mSession = null;
-        mSftpChannel = null;
-    }
-
-    /**
-     * 【推荐】SFTP登录（基于FTPAuthModel实体类，完全兼容原有参数）
-     * @param ftpAuthModel 登录配置实体类（不能为空，端口默认22，编码默认UTF-8）
-     * @return 登录成功返回true，失败false
-     */
-    public boolean login(SFTPAuthModel ftpAuthModel) {
-        // 1. 实体类非空校验
-        if (ftpAuthModel == null) {
-            LogUtils.e(TAG, "SFTP登录失败：FTPAuthModel实体类为null");
-            return false;
-        }
-        // 2. 核心参数校验（服务器地址不能为空）
-        if (isParamEmpty(ftpAuthModel.getFtpServer())) {
-            LogUtils.e(TAG, "SFTP登录失败：服务器地址（ftpServer）不能为空");
-            return false;
-        }
-        // 3. 若已连接，先断开
-        if (isConnected()) {
-            logout();
-        }
-        // 4. 重新初始化客户端
-        initSftpClient();
-
-        try {
-            // 获取服务器地址、端口（默认22）、账号、密码
-            String host = ftpAuthModel.getFtpServer();
-            int port = ftpAuthModel.getFtpPort() <= 0 ? DEFAULT_SFTP_PORT : ftpAuthModel.getFtpPort();
-            String username = ftpAuthModel.getFtpUsername();
-            String password = ftpAuthModel.getFtpPassword();
-
-            // SFTP不支持匿名登录，账号密码不能为空（原生接口无匿名登录能力）
-            if (isParamEmpty(username) || isParamEmpty(password)) {
-                LogUtils.e(TAG, "SFTP登录失败：SFTP不支持匿名登录，请配置有效账号密码");
-                return false;
-            }
-
-            // 1. 创建JSch会话（原生接口）
-            mSession = mJSch.getSession(username, host, port);
-            mSession.setPassword(password);
-
-            // 2. 设置会话属性（跳过SSH密钥校验，适配大部分服务器）
-            Properties sessionProps = new Properties();
-            sessionProps.put("StrictHostKeyChecking", "no");
-            sessionProps.put("PreferredAuthentications", "password");
-            mSession.setConfig(sessionProps);
-
-            // 3. 设置会话连接超时（原生接口，底层Socket超时）
-            mSession.setTimeout(CONNECT_TIMEOUT);
-
-            // 4. 建立会话连接（原生接口）
-            mSession.connect();
-            LogUtils.d(TAG, "SFTP会话连接成功：" + host + ":" + port);
-
-            // 5. 打开SFTP通道（类型：sftp，原生接口强转）
-            mSftpChannel = (ChannelSftp) mSession.openChannel("sftp");
-            mSftpChannel.connect();
-
-            // 6. 设置文件名编码（解决中文乱码，ChannelSftp原生接口）
-            String charset = isParamEmpty(ftpAuthModel.getFtpCharset()) ? "UTF-8" : ftpAuthModel.getFtpCharset();
-            mSftpChannel.setFilenameEncoding(charset);
-            LogUtils.d(TAG, "SFTP文件名编码设置成功：" + charset);
-
-            LogUtils.i(TAG, "SFTP登录成功，服务器：" + host + ":" + port + "，用户名：" + username);
-            return true;
-
-        } catch (JSchException e) {
-            LogUtils.e(TAG, "SFTP登录JSch异常：" + e.getMessage(), e);
-            logout();
-            return false;
-        } catch (SftpException e) {
-            // 匹配SftpException原生属性和方法
-            LogUtils.e(TAG, "SFTP通道初始化异常：id=" + e.id + "，msg=" + e.getMessage() + "，detail=" + e.toString());
-            logout();
-            return false;
-        }
-    }
-
-    /**
-     * 【已废弃】原FTP多参数登录方法，适配JSch后保留，推荐使用login(FTPAuthModel)
-     * @deprecated 请使用基于FTPAuthModel的登录方法
-     */
-    @Deprecated
-    public boolean login(String host, int port, String username, String password) {
-        SFTPAuthModel ftpAuthModel = new SFTPAuthModel();
-        ftpAuthModel.setFtpServer(host);
-        ftpAuthModel.setFtpPort(port <= 0 ? DEFAULT_SFTP_PORT : port);
-        ftpAuthModel.setFtpUsername(username);
-        ftpAuthModel.setFtpPassword(password);
-        return login(ftpAuthModel);
-    }
-
-    /**
-     * SFTP登出并断开连接，释放所有资源（严格调用原生disconnect接口）
-     * @return 登出成功返回true，失败false
-     */
-    public boolean logout() {
-        boolean isSuccess = true;
-        // 关闭SFTP通道（原生接口disconnect，非空判断即可）
-        if (mSftpChannel != null) {
-            try {
-                mSftpChannel.disconnect();
-                LogUtils.d(TAG, "SFTP通道已断开");
-            } catch (Exception e) {
-                LogUtils.e(TAG, "关闭SFTP通道异常：" + e.getMessage(), e);
-                isSuccess = false;
-            }
-        }
-        // 关闭JSch会话（原生接口disconnect，非空判断即可）
-        if (mSession != null) {
-            try {
-                mSession.disconnect();
-                LogUtils.d(TAG, "SFTP会话已断开");
-            } catch (Exception e) {
-                LogUtils.e(TAG, "关闭SFTP会话异常：" + e.getMessage(), e);
-                isSuccess = false;
-            }
-        }
-        // 重置客户端，避免资源残留
-        initSftpClient();
-        if (isSuccess) {
-            LogUtils.i(TAG, "SFTP登出成功");
-        } else {
-            LogUtils.w(TAG, "SFTP登出失败：部分资源未正常释放");
-        }
-        return isSuccess;
-    }
-
-    /**
-     * 强制断开连接（兜底资源释放），同logout方法
-     */
-    public void disconnect() {
-        logout();
-    }
-
-    /**
-     * 判断SFTP是否已连接（会话+通道均调用原生isConnected接口）
-     * @return 已连接返回true，否则false
-     */
-    public boolean isConnected() {
-        return mSession != null && mSession.isConnected()
-			&& mSftpChannel != null && mSftpChannel.isConnected();
-    }
-
-    /**
-     * 上传文件到SFTP指定路径（覆盖式上传，调用ChannelSftp原生put接口，OVERWRITE模式）
-     * @param localFilePath 本地文件绝对路径（如/sdcard/test.apk）
-     * @param remoteFilePath SFTP服务器目标路径（如/ftp/apk/test.apk，需包含文件名）
-     * @return 上传成功返回true，失败false
-     */
-    public boolean uploadFile(String localFilePath, String remoteFilePath) {
-        // 前置校验
-        if (!isConnected()) {
-            LogUtils.e(TAG, "文件上传失败：SFTP未连接服务器");
-            return false;
-        }
-        if (isParamEmpty(localFilePath) || isParamEmpty(remoteFilePath)) {
-            LogUtils.e(TAG, "文件上传失败：本地/远程路径不能为空");
-            return false;
-        }
-        File localFile = new File(localFilePath);
-        if (!localFile.exists() || !localFile.isFile()) {
-            LogUtils.e(TAG, "文件上传失败：本地文件不存在/非文件，路径：" + localFilePath);
-            return false;
-        }
-
-        InputStream fis = null;
-        try {
-            // 自动创建远程多级目录（基于原生mkdir/stat接口）
-            createRemoteDir(remoteFilePath);
-            // 读取本地文件，上传到SFTP（原生put接口，OVERWRITE覆盖模式）
-            fis = new FileInputStream(localFile);
-            mSftpChannel.put(fis, remoteFilePath, ChannelSftp.OVERWRITE);
-            LogUtils.i(TAG, "文件上传成功：本地" + localFilePath + " → 远程" + remoteFilePath);
-            return true;
-        } catch (IOException e) {
-            LogUtils.e(TAG, "文件上传IO异常：" + e.getMessage(), e);
-            return false;
-        } catch (SftpException e) {
-            // 严格匹配SftpException原生属性：id、getMessage()、toString()
-            LogUtils.e(TAG, "文件上传SFTP异常：id=" + e.id + "，msg=" + e.getMessage() + "，detail=" + e.toString());
-            return false;
-        } finally {
-            // 关闭流资源，避免内存泄漏
-            closeStream(fis, null);
-        }
-    }
-
-    /**
-     * 从SFTP下载文件到本地指定路径（覆盖式下载，调用ChannelSftp原生get接口）
-     * @param remoteFilePath SFTP服务器文件路径（如/ftp/apk/test.apk）
-     * @param localFilePath 本地目标路径（如/sdcard/test.apk，需包含文件名）
-     * @return 下载成功返回true，失败false
-     */
-    public boolean downloadFile(String remoteFilePath, String localFilePath) {
-        // 前置校验
-        if (!isConnected()) {
-            LogUtils.e(TAG, "文件下载失败：SFTP未连接服务器");
-            return false;
-        }
-        if (isParamEmpty(remoteFilePath) || isParamEmpty(localFilePath)) {
-            LogUtils.e(TAG, "文件下载失败：远程/本地路径不能为空");
-            return false;
-        }
-        // 校验远程文件是否存在（基于ChannelSftp原生stat接口）
-        if (!isFileExists(remoteFilePath)) {
-            LogUtils.e(TAG, "文件下载失败：远程文件不存在，路径：" + remoteFilePath);
-            return false;
-        }
-
-        OutputStream fos = null;
-        try {
-            // 创建本地多级目录
-            File localFile = new File(localFilePath);
-            File parentDir = localFile.getParentFile();
-            if (!parentDir.exists() && !parentDir.mkdirs()) {
-                LogUtils.e(TAG, "文件下载失败：创建本地目录失败，路径：" + parentDir.getAbsolutePath());
-                return false;
-            }
-            // 从SFTP读取文件，写入本地（原生get接口）
-            fos = new FileOutputStream(localFile);
-            mSftpChannel.get(remoteFilePath, fos);
-            LogUtils.i(TAG, "文件下载成功：远程" + remoteFilePath + " → 本地" + localFilePath);
-            return true;
-        } catch (IOException e) {
-            LogUtils.e(TAG, "文件下载IO异常：" + e.getMessage(), e);
-            // 删除未下载完成的本地文件
-            new File(localFilePath).delete();
-            return false;
-        } catch (SftpException e) {
-            // 严格匹配SftpException原生属性：id、getMessage()、toString()
-            LogUtils.e(TAG, "文件下载SFTP异常：id=" + e.id + "，msg=" + e.getMessage() + "，detail=" + e.toString());
-            // 删除未下载完成的本地文件
-            new File(localFilePath).delete();
-            return false;
-        } finally {
-            // 关闭流资源，避免内存泄漏
-            closeStream(null, fos);
-        }
-    }
-
-    /**
-     * 列举SFTP指定文件夹下的所有文件/文件夹（返回ChannelSftp原生Vector，过滤.和..）
-     * @param remoteDir SFTP服务器目录路径（如/ftp/apk/，结尾带/或不带均可）
-     * @return 成功返回原生Vector<ChannelSftp.LsEntry>，失败返回空Vector
-     */
-    @SuppressWarnings("rawtypes")
-    public Vector listDir(String remoteDir) {
-        Vector fileList = new Vector();
-        // 前置校验
-        if (!isConnected()) {
-            LogUtils.e(TAG, "列举目录失败：SFTP未连接服务器");
-            return fileList;
-        }
-        if (isParamEmpty(remoteDir)) {
-            LogUtils.e(TAG, "列举目录失败：远程目录路径不能为空");
-            return fileList;
-        }
-        // 校验目录是否存在（基于ChannelSftp原生stat接口）
-        if (!isDirExists(remoteDir)) {
-            LogUtils.e(TAG, "列举目录失败：远程目录不存在，路径：" + remoteDir);
-            return fileList;
-        }
-
-        try {
-            // 列举目录下所有文件/文件夹（调用ChannelSftp原生ls接口，返回原生Vector）
-            Vector vector = mSftpChannel.ls(remoteDir);
-            if (vector != null && vector.size() > 0) {
-                for (Object obj : vector) {
-                    // 过滤.和..上级目录，仅保留有效文件/目录
-                    ChannelSftp.LsEntry entry = (ChannelSftp.LsEntry) obj;
-                    String fileName = entry.getFilename();
-                    if (!".".equals(fileName) && !"..".equals(fileName)) {
-                        fileList.add(obj);
-                    }
-                }
-            }
-            LogUtils.i(TAG, "列举目录成功：" + remoteDir + "，共" + fileList.size() + "个文件/文件夹");
-        } catch (SftpException e) {
-            // 严格匹配SftpException原生属性：id、getMessage()、toString()
-            LogUtils.e(TAG, "列举目录SFTP异常：id=" + e.id + "，msg=" + e.getMessage() + "，detail=" + e.toString());
-        }
-        return fileList;
-    }
-
-    /**
-     * 判断SFTP服务器上**文件**是否存在（基于ChannelSftp原生stat接口，匹配SftpException原生异常）
-     * @param remoteFilePath SFTP服务器文件路径（如/ftp/apk/test.apk）
-     * @return 存在且为文件返回true，否则false
-     */
-    public boolean isFileExists(String remoteFilePath) {
-        // 前置校验
-        if (!isConnected()) {
-            LogUtils.e(TAG, "判断文件存在性失败：SFTP未连接服务器");
-            return false;
-        }
-        if (isParamEmpty(remoteFilePath)) {
-            LogUtils.e(TAG, "判断文件存在性失败：远程文件路径不能为空");
-            return false;
-        }
-
-        try {
-            // 调用ChannelSftp原生stat接口获取属性，不存在会抛出SSH_FX_NO_SUCH_FILE异常
-            SftpATTRS attrs = mSftpChannel.stat(remoteFilePath);
-            // 原生isReg()判断是否为文件
-            return attrs.isReg();
-        } catch (SftpException e) {
-            // 仅匹配原生异常码SSH_FX_NO_SUCH_FILE(2)：文件/目录不存在，不记错误日志
-            if (e.id != ChannelSftp.SSH_FX_NO_SUCH_FILE) {
-                LogUtils.e(TAG, "判断文件存在性SFTP异常：id=" + e.id + "，msg=" + e.getMessage() + "，detail=" + e.toString());
-            }
-            return false;
-        }
-    }
-
-    /**
-     * 判断SFTP服务器上**文件夹**是否存在（基于ChannelSftp原生stat接口，匹配SftpException原生异常）
-     * @param remoteDir SFTP服务器目录路径（如/ftp/apk/，结尾带/或不带均可）
-     * @return 存在且为目录返回true，否则false
-     */
-    public boolean isDirExists(String remoteDir) {
-        // 前置校验
-        if (!isConnected()) {
-            LogUtils.e(TAG, "判断目录存在性失败：SFTP未连接服务器");
-            return false;
-        }
-        if (isParamEmpty(remoteDir)) {
-            LogUtils.e(TAG, "判断目录存在性失败：远程目录路径不能为空");
-            return false;
-        }
-
-        try {
-            // 调用ChannelSftp原生stat接口获取属性，不存在会抛出SSH_FX_NO_SUCH_FILE异常
-            SftpATTRS attrs = mSftpChannel.stat(remoteDir);
-            // 原生isDir()判断是否为目录
-            return attrs.isDir();
-        } catch (SftpException e) {
-            // 仅匹配原生异常码SSH_FX_NO_SUCH_FILE(2)：文件/目录不存在，不记错误日志
-            if (e.id != ChannelSftp.SSH_FX_NO_SUCH_FILE) {
-                LogUtils.e(TAG, "判断目录存在性SFTP异常：id=" + e.id + "，msg=" + e.getMessage() + "，detail=" + e.toString());
-            }
-            return false;
-        }
-    }
-
-    // ===================================== 内部工具方法（仅调用原生接口） =====================================
-    /**
-     * 递归创建SFTP远程多级目录（基于ChannelSftp原生mkdir/stat接口，不存在则创建）
-     * @param remoteFilePath SFTP远程文件路径/目录路径
-     */
-    private void createRemoteDir(String remoteFilePath) {
-        if (!isConnected()) {
-            LogUtils.e(TAG, "创建远程目录失败：SFTP未连接服务器");
-            return;
-        }
-        try {
-            // 提取目录路径（文件路径→目录路径，目录路径直接使用）
-            String remoteDir = remoteFilePath.lastIndexOf("/") > 0
-				? remoteFilePath.substring(0, remoteFilePath.lastIndexOf("/"))
-				: remoteFilePath;
-            // 按/分割多级目录，递归创建（避免多级目录不存在）
-            String[] dirs = remoteDir.split("/");
-            StringBuilder currentDir = new StringBuilder();
-            for (String dir : dirs) {
-                if (isParamEmpty(dir)) {
-                    continue;
-                }
-                currentDir.append("/").append(dir);
-                String dirPath = currentDir.toString();
-                // 目录不存在则调用ChannelSftp原生mkdir创建
-                if (!isDirExists(dirPath)) {
-                    mSftpChannel.mkdir(dirPath);
-                    LogUtils.d(TAG, "创建SFTP远程目录成功：" + dirPath);
-                }
-            }
-        } catch (SftpException e) {
-            // 严格匹配SftpException原生属性：id、getMessage()、toString()
-            LogUtils.e(TAG, "创建远程目录SFTP异常：id=" + e.id + "，msg=" + e.getMessage() + "，detail=" + e.toString());
-        }
-    }
-
-    /**
-     * 关闭流资源（通用工具方法，Java7原生IO，避免内存泄漏）
-     * @param is 输入流（可为null）
-     * @param os 输出流（可为null）
-     */
-    private void closeStream(InputStream is, OutputStream os) {
-        if (is != null) {
-            try {
-                is.close();
-            } catch (IOException e) {
-                LogUtils.e(TAG, "关闭输入流异常：" + e.getMessage(), e);
-            }
-        }
-        if (os != null) {
-            try {
-                os.close();
-            } catch (IOException e) {
-                LogUtils.e(TAG, "关闭输出流异常：" + e.getMessage(), e);
-            }
-        }
-    }
-
-    /**
-     * 判断参数是否为空（null/空字符串/全空格，Java7原生字符串操作）
-     * @param param 待判断参数
-     * @return 为空返回true，否则false
-     */
-    private boolean isParamEmpty(String param) {
-        return param == null || param.trim().isEmpty();
-    }
-}
-

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/SignGetUtils.java

@@ -1,71 +0,0 @@
-package cc.winboll.studio.libappbase.utils;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.Signature;
-import android.util.Base64;
-import cc.winboll.studio.libappbase.LogUtils;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/01/20 19:50
- * @Describe 获取应用签名指纹（SHA1+Base64，直接复制用）
- */
-public class SignGetUtils {
-    private static final String TAG = "SignGetUtils";
-
-    /**
-     * 一键获取当前应用签名指纹（直接调用，看日志复制结果）
-     */
-    public static void getCurrentAppSign(Context context) {
-        if (context == null) {
-            LogUtils.e(TAG, "context不能为空");
-            return;
-        }
-        try {
-            PackageManager pm = context.getPackageManager();
-            PackageInfo pkgInfo = pm.getPackageInfo(context.getPackageName(), PackageManager.GET_SIGNATURES);
-            Signature[] signatures = pkgInfo.signatures;
-            if (signatures == null || signatures.length == 0) {
-                LogUtils.e(TAG, "未获取到应用签名");
-                return;
-            }
-            // 和APPUtils校验格式完全一致（SHA1+Base64 NO_WRAP）
-            MessageDigest md = MessageDigest.getInstance("SHA1");
-            md.update(signatures[0].toByteArray());
-            String signBase64 = Base64.encodeToString(md.digest(), Base64.NO_WRAP);
-
-            // 关键日志：复制【】里的内容到APPUtils的TARGET_SIGN_FINGERPRINT
-            LogUtils.d(TAG, "当前应用包名：" + context.getPackageName());
-            LogUtils.d(TAG, "当前应用签名指纹（直接复制）：【" + signBase64 + "】");
-        } catch (PackageManager.NameNotFoundException e) {
-            LogUtils.e(TAG, "获取签名失败：包名不存在", e);
-        } catch (NoSuchAlgorithmException e) {
-            LogUtils.e(TAG, "获取签名失败：不支持SHA1", e);
-        } catch (Exception e) {
-            LogUtils.e(TAG, "获取签名失败", e);
-        }
-    }
-	
-	// 新增：直接返回签名字符串，供对话框调用
-//	public static String getSignStr(Context context) {
-//		if (context == null) return null;
-//		try {
-//			PackageManager pm = context.getPackageManager();
-//			PackageInfo pkgInfo = pm.getPackageInfo(context.getPackageName(), PackageManager.GET_SIGNATURES);
-//			Signature[] signatures = pkgInfo.signatures;
-//			if (signatures == null || signatures.length == 0) return null;
-//
-//			MessageDigest md = MessageDigest.getInstance("SHA1");
-//			md.update(signatures[0].toByteArray());
-//			return Base64.encodeToString(md.digest(), Base64.NO_WRAP);
-//		} catch (Exception e) {
-//			LogUtils.e(TAG, "获取签名字符串失败", e);
-//			return null;
-//		}
-//	}
-}
-

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

@@ -8,7 +8,6 @@ import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -17,204 +16,163 @@ import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.R;
 import cc.winboll.studio.libappbase.ToastUtils;
-import cc.winboll.studio.libappbase.dialogs.DebugHostDialog;
-import cc.winboll.studio.libappbase.dialogs.APPValidationDialog;
 import cc.winboll.studio.libappbase.models.APPInfo;
 
 /**
+ * @Describe AboutView 原生实现关于页面，无第三方依赖，适配API30，抽象通用功能控件（邮件/网页跳转）
  * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @CreateTime 2026-01-11 12:23:00
+ * @Date 2026/01/11 12:23:00
- * @LastEditTime 2026-01-24 20:50:00
+ * @LastEditTime 2026/01/12 01:05:30
- * @Describe AboutView 原生实现关于页面，无第三方依赖，适配API30；抽象通用功能控件（邮件/网页跳转），支持调试工具入口动态显隐，集成应用正版校验、调试地址配置弹窗
  */
 public class AboutView extends LinearLayout {
-    // ===================================== 全局常量 =====================================
+    // 全局常量区（标识、回调标识）
     public static final String TAG = "AboutView";
     public static final int MSG_APPUPDATE_CHECKED = 0;
 
-    // 固定链接/邮件常量
+    // 固定链接常量
     private static final String WINBOLL_OFFICIAL_HOME = "https://www.winboll.cc";
+    // 邮件相关常量（统一封装，便于维护）
     private static final String EMAIL_TITLE = "联系WinBoLLStudio";
     private static final String EMAIL_ADDRESS = "studio@winboll.cc";
     private static final String EMAIL_TYPE = "message/rfc822";
 
-    // 布局尺寸常量（dp）
+    // 布局尺寸常量（统一管理，适配多屏幕，dp为基准单位）
     private static final int PADDING_LARGE = 32;
     private static final int PADDING_MID = 16;
     private static final int PADDING_SMALL = 8;
     private static final int ICON_SIZE = 48;
+    private static final int LINE_HEIGHT = 1;
     private static final int ITEM_ICON_SIZE = 24;
 
-    // 服务器默认地址常量
+    // 成员属性区（按 核心依赖→业务配置→视图相关 归类排序，注释清晰）
-    private static final String SERVER_DEBUG_HOST = "https://yun-preivew.winboll.cc";
+    private Context mContext;                    // 上下文对象，全局复用
-    private static final String SERVER_RELEASE_HOST = "https://yun.winboll.cc";
+    private APPInfo mAPPInfo;                    // 应用核心信息实体
+    private OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener;  // 调试信息填充监听
 
-    // ===================================== 核心成员属性 =====================================
+    private String mszAppName = "";              // 应用名称
-    // 上下文与业务实体
+    private String mszAppVersionName = "";       // 应用版本号
-    private Context mContext;
+    private String mszAppDescription = "";       // 应用描述文案
-    private APPInfo mAPPInfo;
+    private String mszHomePage = "";             // 应用主页/APK下载地址
-    private OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener;
+    private String mszGitea = "";                // 应用Git源码地址
+    private String mszAppGitName = "";           // 应用Git仓库名称
+    private String mszAppAPKName = "";           // 应用APK基础名称
+    private String mszAppAPKFolderName = "";     // 应用APK存储文件夹
+    private String mszCurrentAppPackageName = "";// 当前APK完整文件名
+    private String mszReleaseAPKName = "";       // 正式版APK完整文件名
+    private volatile String mszNewestAppPackageName = "";  // 最新版APK文件名（支持异步更新）
+    private String mszWinBoLLServerHost = "";    // 服务器地址
+    private int mnAppIcon = 0;                   // 应用图标资源ID
+    private boolean mIsAddDebugTools = false;    // 是否启用调试工具标识
+    private EditText metDevUserName;             // 调试用户名输入框
+    private EditText metDevUserPassword;         // 调试密码输入框
 
-    // 应用基础信息
+    // 构造方法区（按 参数从少到多 排序，适配 代码创建+XML引用 场景）
-    private String mszAppName = "";
-    private String mszAppVersionName = "";
-    private String mszAppDescription = "";
-    private String mszHomePage = "";
-    private String mszGitea = "";
-    private String mszAppGitName = "";
-    private String mszAppAPKName = "";
-    private String mszAppAPKFolderName = "";
-    private String mszCurrentAppPackageName = "";
-    private String mszReleaseAPKName = "";
-    private volatile String mszNewestAppPackageName = "";
-    private String mszWinBoLLServerHost = "";
-    private int mnAppIcon = 0;
-    private boolean mIsAddDebugTools = false;
-
-    // 调试视图
-    private EditText metDevUserName;
-    private EditText metDevUserPassword;
-
-    // ===================================== 页面视图控件 =====================================
-    private DebugSwitchImageView ivAppIcon;
-    private TextView tvAppNameVersion;
-    private TextView tvAppDesc;
-    private LinearLayout llFunctionContainer;
-	private ImageButton ibSebugStepOver;
-    private ImageButton ibSigngetDialog;
-    private ImageButton ibWinBoLLHostDialog;
-
-    // ===================================== 构造方法（按参数从少到多排序） =====================================
     public AboutView(Context context) {
         super(context);
-        LogUtils.d(TAG, "AboutView(Context)：代码创建视图，执行默认初始化");
+        LogUtils.d(TAG, "AboutView(Context) 构造方法调用，代码创建视图场景");
         this.mContext = context;
         initDefaultParams();
-        initViewFromXml();
     }
 
-//    public AboutView(Context context, APPInfo appInfo) {
+    public AboutView(Context context, APPInfo appInfo) {
-//        super(context);
+        super(context);
-//        LogUtils.d(TAG, "AboutView(Context,APPInfo)：传入应用信息，appName=" + (appInfo == null ? "null" : appInfo.getAppName()));
+        LogUtils.d(TAG, "AboutView(Context,APPInfo) 构造调用，入参APPInfo：" + (appInfo == null ? "null" : appInfo.getAppName()));
-//        this.mContext = context;
+        this.mContext = context;
-//        this.mAPPInfo = appInfo;
+        this.mAPPInfo = appInfo;
-//        initViewFromXml();
+        initAll();
-//        initAll();
+    }
-//    }
 
     public AboutView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        LogUtils.d(TAG, "AboutView(Context,AttributeSet)：XML布局引用，执行默认初始化");
+        LogUtils.d(TAG, "AboutView(Context,AttributeSet) 构造调用，XML布局引用场景");
         this.mContext = context;
         initDefaultParams();
-        initViewFromXml();
     }
 
     public AboutView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        LogUtils.d(TAG, "AboutView(Context,AttributeSet,int)：XML布局+样式配置，defStyleAttr=" + defStyleAttr);
+        LogUtils.d(TAG, "AboutView(Context,AttributeSet,int) 构造调用，XML布局+样式配置，defStyleAttr：" + defStyleAttr);
         this.mContext = context;
         initDefaultParams();
-        initViewFromXml();
     }
 
-    // ===================================== 对外公开方法 =====================================
+    // 对外公开方法区（供外部调用，职责单一，注释明确）
     /**
-     * 一站式初始化所有关于页逻辑，包含参数、应用信息、页面视图全流程
+     * 一站式初始化所有关于页逻辑，包含参数、信息、视图全流程初始化
      */
     public void initAll() {
-        LogUtils.d(TAG, "initAll()：开始一站式初始化，APPInfo是否为空=" + (mAPPInfo == null));
+        LogUtils.d(TAG, "initAll() 一站式初始化调用，APPInfo是否为空：" + (mAPPInfo == null));
         if (mAPPInfo == null) {
-            LogUtils.w(TAG, "initAll()：初始化终止，APPInfo为null");
+            LogUtils.w(TAG, "initAll() 初始化终止：APPInfo 为 null，无法获取应用核心信息");
             return;
         }
+        // 基础布局配置
+        setOrientation(VERTICAL);
+        setPadding(dp2px(PADDING_MID), dp2px(PADDING_LARGE), dp2px(PADDING_MID), dp2px(PADDING_LARGE));
+        setGravity(Gravity.CENTER_HORIZONTAL);
+
+        // 按初始化流程执行，有序无冗余
         initDefaultParams();
-        initAPPBaseInfo();
+        initAppBaseInfo();
-        initAPPVersionInfo();
+        initAppVersionInfo();
         initServerConfig();
-        initAPPLinkInfo();
+        initAppLinkInfo();
         initReleaseAPKInfo();
         initAboutPageView();
-        LogUtils.d(TAG, "initAll()：所有初始化流程执行完成");
+        LogUtils.d(TAG, "initAll() 所有初始化流程执行完成");
     }
 
     /**
-     * 重置应用信息并重新初始化页面，支持动态更新关于页内容
+     * 重置应用信息并重新初始化关于页，支持动态更新页面内容
      * @param appInfo 新的应用信息实体
      */
-//    public void setAPPInfoAndInit(APPInfo appInfo) {
+    public void setAPPInfoAndInit(APPInfo appInfo) {
-//        LogUtils.d(TAG, "setAPPInfoAndInit()：重置应用信息，appName=" + (appInfo == null ? "null" : appInfo.getAppName()));
+        LogUtils.d(TAG, "setAPPInfoAndInit() 调用，传入新APPInfo：" + (appInfo == null ? "null" : appInfo.getAppName()));
-//        this.mAPPInfo = appInfo;
+        this.mAPPInfo = appInfo;
-//        if (llFunctionContainer != null) llFunctionContainer.removeAllViews();
+        removeAllViews();
-//        initAll();
+        initAll();
-//        LogUtils.d(TAG, "setAPPInfoAndInit()：应用信息重置+页面重构完成");
+        LogUtils.d(TAG, "setAPPInfoAndInit() 应用信息重置+页面重构完成");
-//    }
+    }
 
     /**
-     * 设置应用信息，兼容旧调用逻辑，设置后自动重构页面
+     * 设置应用信息（兼容旧调用逻辑），设置后自动重构页面
      * @param appInfo 应用核心信息实体
      */
     public void setAPPInfo(APPInfo appInfo) {
-        LogUtils.d(TAG, "setAPPInfo()：设置应用信息，appName=" + (appInfo == null ? "null" : appInfo.getAppName()));
+        LogUtils.d(TAG, "setAPPInfo() 调用，传入APPInfo：" + (appInfo == null ? "null" : appInfo.getAppName()));
         this.mAPPInfo = appInfo;
-        if (llFunctionContainer != null) llFunctionContainer.removeAllViews();
+        removeAllViews();
         initAll();
     }
 
     /**
-     * 设置调试信息自动填充监听，供调试场景回调使用
+     * 设置调试信息自动填充监听，用于调试场景的信息回调
      * @param l 监听回调接口实现
      */
     public void setOnRequestDevUserInfoAutofillListener(OnRequestDevUserInfoAutofillListener l) {
-        LogUtils.d(TAG, "setOnRequestDevUserInfoAutofillListener()：设置调试信息填充监听完成");
+        LogUtils.d(TAG, "setOnRequestDevUserInfoAutofillListener() 调试监听设置完成");
         this.mOnRequestDevUserInfoAutofillListener = l;
     }
 
-    // ===================================== 内部初始化方法 =====================================
+    // 内部初始化方法区（按 基础→业务→视图 流程排序，单一职责）
     /**
      * 初始化默认兜底参数，防止空指针，为后续初始化做基础铺垫
      */
     private void initDefaultParams() {
-        LogUtils.d(TAG, "initDefaultParams()：开始初始化默认参数");
+        LogUtils.d(TAG, "initDefaultParams() 执行默认参数初始化");
-        mszWinBoLLServerHost = GlobalApplication.isDebugging() ? SERVER_DEBUG_HOST : SERVER_RELEASE_HOST;
+        mszWinBoLLServerHost = GlobalApplication.isDebugging() ? "https://yun-preivew.winboll.cc" : "https://yun.winboll.cc";
-        mnAppIcon = (mnAppIcon == 0) ? R.drawable.ic_winboll : mnAppIcon;
+        mnAppIcon = mnAppIcon == 0 ? R.drawable.ic_winboll : mnAppIcon;
         mIsAddDebugTools = false;
-        LogUtils.d(TAG, "initDefaultParams()：默认参数初始化完成，服务器地址=" + mszWinBoLLServerHost + "，应用图标ID=" + mnAppIcon);
+        LogUtils.d(TAG, "initDefaultParams() 完成，默认服务器地址：" + mszWinBoLLServerHost + "，默认图标ID：" + mnAppIcon);
     }
 
-    /**
-     * 加载XML布局并绑定所有视图控件，初始化按钮点击事件
-     */
-    private void initViewFromXml() {
-		LogUtils.d(TAG, "initViewFromXml()：开始加载布局并绑定控件");
-		View.inflate(mContext, R.layout.layout_about_view, this);
-		// 基础控件绑定
-		ivAppIcon = findViewById(R.id.iv_app_icon);
-		tvAppNameVersion = findViewById(R.id.tv_app_name_version);
-		tvAppDesc = findViewById(R.id.tv_app_desc);
-		llFunctionContainer = findViewById(R.id.ll_function_container);
-		// 功能按钮绑定
-		ibSebugStepOver = findViewById(R.id.ib_debug_step_over);
-		ibSigngetDialog = findViewById(R.id.ib_signgetdialog);
-		ibWinBoLLHostDialog = findViewById(R.id.ib_winbollhostdialog);
-
-		// 调试按钮统一只在调试模式显示
-		ibWinBoLLHostDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
-		//ibSigngetDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
-		ibSebugStepOver.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
-
-		// 绑定按钮点击事件
-		setBtnClickListener();
-		LogUtils.d(TAG, "initViewFromXml()：布局加载+控件绑定+事件初始化完成");
-	}
-
     /**
      * 从APPInfo实体读取应用基础核心配置，赋值到本地属性
      */
-    private void initAPPBaseInfo() {
+    private void initAppBaseInfo() {
-        LogUtils.d(TAG, "initAPPBaseInfo()：开始读取APPInfo基础配置");
+        LogUtils.d(TAG, "initAppBaseInfo() 读取APPInfo基础配置");
         if (mAPPInfo == null) {
-            LogUtils.w(TAG, "initAPPBaseInfo()：跳过执行，APPInfo为null");
+            LogUtils.w(TAG, "initAppBaseInfo() 跳过执行：APPInfo 为 null");
             return;
         }
         mszAppName = mAPPInfo.getAppName() == null ? "" : mAPPInfo.getAppName();
@@ -222,44 +180,44 @@ public class AboutView extends LinearLayout {
         mszAppAPKName = mAPPInfo.getAppAPKName() == null ? "" : mAPPInfo.getAppAPKName();
         mszAppGitName = mAPPInfo.getAppGitName() == null ? "" : mAPPInfo.getAppGitName();
         mszAppDescription = mAPPInfo.getAppDescription() == null ? "" : mAPPInfo.getAppDescription();
-        mnAppIcon = (mAPPInfo.getAppIcon() != 0) ? mAPPInfo.getAppIcon() : mnAppIcon;
+        mnAppIcon = mAPPInfo.getAppIcon() != 0 ? mAPPInfo.getAppIcon() : mnAppIcon;
         mIsAddDebugTools = mAPPInfo.isAddDebugTools();
-        LogUtils.d(TAG, "initAPPBaseInfo()：基础配置读取完成，应用名=" + mszAppName + "，调试开关=" + mIsAddDebugTools);
+        LogUtils.d(TAG, "initAppBaseInfo() 读取完成，应用名：" + mszAppName + "，调试开关：" + mIsAddDebugTools);
     }
 
     /**
-     * 从包管理中获取当前应用版本号，初始化版本相关信息
+     * 初始化应用版本信息，从包管理中获取当前应用版本号
      */
-    private void initAPPVersionInfo() {
+    private void initAppVersionInfo() {
-        LogUtils.d(TAG, "initAPPVersionInfo()：开始初始化应用版本信息");
+        LogUtils.d(TAG, "initAppVersionInfo() 初始化应用版本信息");
         try {
             mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
         } catch (PackageManager.NameNotFoundException e) {
-            LogUtils.e(TAG, "initAPPVersionInfo()：获取版本号失败，默认赋值unknown", e);
+            LogUtils.d(TAG, "initAppVersionInfo() 获取版本号失败，默认赋值unknown", e);
             mszAppVersionName = "unknown";
         }
-        mszCurrentAppPackageName = String.format("%s_%s.apk", mszAppVersionName, mszAppVersionName);
+        mszCurrentAppPackageName = String.format("%s_%s.apk", mszAppAPKName, mszAppVersionName);
-        LogUtils.d(TAG, "initAPPVersionInfo()：版本信息初始化完成，版本号=" + mszAppVersionName + "，当前APK名=" + mszCurrentAppPackageName);
+        LogUtils.d(TAG, "initAppVersionInfo() 完成，版本号：" + mszAppVersionName + "，当前APK名：" + mszCurrentAppPackageName);
     }
 
     /**
      * 初始化服务器相关配置，预留扩展接口
      */
     private void initServerConfig() {
-        LogUtils.d(TAG, "initServerConfig()：服务器配置初始化，预留扩展接口");
+        LogUtils.d(TAG, "initServerConfig() 服务器配置初始化（预留扩展）");
     }
 
     /**
-     * 初始化应用相关链接（主页+Git源码地址），根据分支配置动态拼接Git地址
+     * 初始化应用相关链接（主页+Git源码地址），动态拼接Git地址
      */
-    private void initAPPLinkInfo() {
+    private void initAppLinkInfo() {
-        LogUtils.d(TAG, "initAPPLinkInfo()：开始初始化应用链接信息");
+        LogUtils.d(TAG, "initAppLinkInfo() 初始化应用链接信息");
         if (mAPPInfo == null) {
-            LogUtils.w(TAG, "initAPPLinkInfo()：跳过执行，APPInfo为null");
+            LogUtils.w(TAG, "initAppLinkInfo() 跳过执行：APPInfo 为 null");
             return;
         }
         mszHomePage = mAPPInfo.getAppHomePage() == null ? "" : mAPPInfo.getAppHomePage();
-        // 拼接Git地址，兼容无分支配置场景
+        // 分场景拼接Git地址，兼容无分支配置场景
         if (mAPPInfo.getAppGitAPPBranch() == null || mAPPInfo.getAppGitAPPBranch().trim().isEmpty()) {
             mszGitea = String.format("https://gitea.winboll.cc/%s/%s", mAPPInfo.getAppGitOwner(), mszAppGitName);
         } else {
@@ -267,98 +225,102 @@ public class AboutView extends LinearLayout {
 									 mAPPInfo.getAppGitOwner(), mszAppGitName,
 									 mAPPInfo.getAppGitAPPBranch(), mAPPInfo.getAppGitAPPSubProjectFolder());
         }
-        LogUtils.d(TAG, "initAPPLinkInfo()：链接信息初始化完成，应用主页=" + mszHomePage + "，Git地址=" + mszGitea);
+        LogUtils.d(TAG, "initAppLinkInfo() 完成，应用主页：" + mszHomePage + "，Git地址：" + mszGitea);
     }
 
     /**
      * 初始化正式版APK信息，去除beta后缀适配正式包命名规范
      */
     private void initReleaseAPKInfo() {
-        LogUtils.d(TAG, "initReleaseAPKInfo()：开始初始化正式版APK信息");
+        LogUtils.d(TAG, "initReleaseAPKInfo() 初始化正式版APK信息");
         String szReleaseAppVersionName = "unknown";
         try {
             String szSubBetaSuffix = subBetaSuffix(mContext.getPackageName());
             szReleaseAppVersionName = mContext.getPackageManager().getPackageInfo(szSubBetaSuffix, 0).versionName;
         } catch (PackageManager.NameNotFoundException e) {
-            LogUtils.e(TAG, "initReleaseAPKInfo()：获取正式版版本号失败", e);
+            LogUtils.d(TAG, "initReleaseAPKInfo() 获取正式版版本号失败", e);
         }
         mszReleaseAPKName = String.format("%s_%s.apk", mszAppAPKName, szReleaseAppVersionName);
-        LogUtils.d(TAG, "initReleaseAPKInfo()：正式版APK信息初始化完成，APK名=" + mszReleaseAPKName);
+        LogUtils.d(TAG, "initReleaseAPKInfo() 完成，正式版APK名：" + mszReleaseAPKName);
     }
 
     /**
-     * 核心视图组装：赋值基础信息到控件，添加通用功能项到容器
+     * 核心视图组装：按 图标→应用信息→分割线→通用功能控件 顺序构建页面
      */
     private void initAboutPageView() {
-        LogUtils.d(TAG, "initAboutPageView()：开始组装关于页视图");
+        LogUtils.d(TAG, "initAboutPageView() 开始组装关于页视图");
-        // 赋值基础信息
+        addAppIcon();
-        ivAppIcon.setImageResource(mnAppIcon);
+        addAppInfoDesc();
-        tvAppNameVersion.setText(String.format("%s %s", mszAppName, mszAppVersionName));
+        addLineSeparator();
-        if (mszAppDescription.isEmpty()) {
+
-            tvAppDesc.setVisibility(GONE);
+        // 通用功能控件：网页跳转类+邮件类，复用抽象控件
-        } else {
+        addView(new WebJumpFunctionItemView(mContext, "WinBoLL 主页", WINBOLL_OFFICIAL_HOME, R.drawable.ic_winboll));
-            tvAppDesc.setVisibility(VISIBLE);
+        addView(new EmailFunctionItemView(mContext, "联系邮箱", "WinBoLLStudio<studio@winboll.cc>", R.drawable.ic_winboll));
-            tvAppDesc.setText(mszAppDescription);
-        }
-        // 添加通用功能项
-        addFunctionView(new WebJumpFunctionItemView(mContext, "WinBoLL 主页", WINBOLL_OFFICIAL_HOME, R.drawable.ic_winboll));
-        addFunctionView(new EmailFunctionItemView(mContext, "联系邮箱", "WinBoLLStudio<studio@winboll.cc>", R.drawable.ic_winboll));
         if (!mszHomePage.isEmpty()) {
-            addFunctionView(new WebJumpFunctionItemView(mContext, "应用APK下载地址", mszHomePage, R.drawable.ic_winboll));
+            addView(new WebJumpFunctionItemView(mContext, "应用APK下载地址", mszHomePage, R.drawable.ic_winboll));
         }
         if (!mszGitea.isEmpty()) {
-            addFunctionView(new WebJumpFunctionItemView(mContext, "应用Git源码地址", mszGitea, R.drawable.ic_winboll));
+            addView(new WebJumpFunctionItemView(mContext, "应用Git源码地址", mszGitea, R.drawable.ic_winboll));
         }
-        LogUtils.d(TAG, "initAboutPageView()：视图组装完成，功能项加载完毕");
+        LogUtils.d(TAG, "initAboutPageView() 视图组装完成，功能项加载完毕");
     }
 
-    // ===================================== 内部工具/事件方法 =====================================
+    // 视图构建辅助方法区（基础视图组件）
     /**
-     * 绑定功能按钮点击事件，处理正版校验、调试地址配置弹窗唤起
+     * 添加应用图标组件，居中展示
      */
-    private void setBtnClickListener() {
+    private void addAppIcon() {
-        LogUtils.d(TAG, "setBtnClickListener()：开始绑定功能按钮点击事件");
+        ImageView ivIcon = new ImageView(mContext);
-        // 取消调试状态按钮
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(dp2px(ICON_SIZE), dp2px(ICON_SIZE));
-        ibSebugStepOver.setOnClickListener(new OnClickListener() {
+        params.bottomMargin = dp2px(PADDING_MID);
-				@Override
+        ivIcon.setLayoutParams(params);
-				public void onClick(View v) {
+        ivIcon.setImageResource(mnAppIcon);
-					LogUtils.d(TAG, "ibSebugStepOver onClick：取消调试状态按钮已点击");
+        ivIcon.setScaleType(ImageView.ScaleType.CENTER_CROP);
-					GlobalApplication.setIsDebugging(false);
+        addView(ivIcon);
-					GlobalApplication.saveDebugStatus(GlobalApplication.getInstance());
-					ToastUtils.show("已取消调试状态，重启应用可生效。");
-				}
-			});
-		// 正版校验弹窗
-        ibSigngetDialog.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					LogUtils.d(TAG, "ibSigngetDialog onClick：唤起应用正版校验弹窗");
-					new APPValidationDialog(mContext, mszAppName, mszAppVersionName).show();
-				}
-			});
-        // 调试地址配置弹窗
-        ibWinBoLLHostDialog.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					LogUtils.d(TAG, "ibWinBoLLHostDialog onClick：唤起调试地址配置弹窗");
-					new DebugHostDialog(mContext).show();
-				}
-			});
-        LogUtils.d(TAG, "setBtnClickListener()：功能按钮点击事件绑定完成");
     }
 
     /**
-     * 添加功能项视图到容器，统一设置间距
+     * 添加应用名称+版本号+描述信息组件，垂直居中展示
-     * @param view 功能项视图
      */
-    private void addFunctionView(View view) {
+    private void addAppInfoDesc() {
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+        LinearLayout llDesc = new LinearLayout(mContext);
-        params.topMargin = 0;
+        llDesc.setOrientation(VERTICAL);
-        llFunctionContainer.addView(view, params);
+        llDesc.setGravity(Gravity.CENTER);
+        llDesc.setPadding(0, 0, 0, dp2px(PADDING_MID));
+
+        TextView tvAppName = new TextView(mContext);
+        tvAppName.setText(String.format("%s %s", mszAppName, mszAppVersionName));
+        tvAppName.setTextSize(18);
+        tvAppName.setTextColor(mContext.getResources().getColor(R.color.gray_900));
+        llDesc.addView(tvAppName);
+
+        if (!mszAppDescription.isEmpty()) {
+            TextView tvDesc = new TextView(mContext);
+            tvDesc.setText(mszAppDescription);
+            tvDesc.setTextSize(14);
+            tvDesc.setTextColor(mContext.getResources().getColor(R.color.gray_500));
+            tvDesc.setPadding(0, dp2px(PADDING_SMALL), 0, 0);
+            llDesc.addView(tvDesc);
+        }
+        addView(llDesc);
     }
 
     /**
-     * dp转px工具方法，适配不同屏幕密度，保证布局一致性
+     * 添加视图分割线，区分不同功能模块
+     */
+    private void addLineSeparator() {
+        View line = new View(mContext);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, dp2px(LINE_HEIGHT));
+        params.topMargin = dp2px(PADDING_SMALL);
+        params.bottomMargin = dp2px(PADDING_MID);
+        line.setLayoutParams(params);
+        line.setBackgroundColor(mContext.getResources().getColor(R.color.gray_200));
+        addView(line);
+    }
+
+    // 工具方法区（通用工具+业务工具，静态优先，便于复用）
+    /**
+     * dp 转 px 工具方法，适配不同屏幕密度，保证布局一致性
      * @param dpValue dp单位尺寸
      * @return 转换后的px单位尺寸
      */
@@ -373,20 +335,17 @@ public class AboutView extends LinearLayout {
      * @return 去除beta后缀后的正式包名
      */
     public static String subBetaSuffix(String input) {
-        LogUtils.d(TAG, "subBetaSuffix()：执行包名beta后缀去除，原始包名=" + input);
+        LogUtils.d(TAG, "subBetaSuffix() 执行包名beta后缀去除，原始包名：" + input);
         if (input != null && input.endsWith(".beta")) {
             String result = input.substring(0, input.length() - ".beta".length());
-            LogUtils.d(TAG, "subBetaSuffix()：处理成功，正式包名=" + result);
+            LogUtils.d(TAG, "subBetaSuffix() 处理成功，正式包名：" + result);
             return result;
         }
-        LogUtils.d(TAG, "subBetaSuffix()：无需处理，包名不含beta后缀");
+        LogUtils.d(TAG, "subBetaSuffix() 无需处理，包名不含beta后缀");
         return input == null ? "" : input;
     }
 
-    // ===================================== 内部抽象通用功能项基类 =====================================
+    // 内部抽象通用功能项基类 - 统一样式，减少冗余
-    /**
-     * 通用功能项基类，统一样式、布局、视图构建，减少冗余代码
-     */
     private abstract class BaseFunctionItemView extends LinearLayout implements OnClickListener {
         protected Context mItemContext;
         protected String mTitle;
@@ -404,32 +363,17 @@ public class AboutView extends LinearLayout {
             setOnClickListener(this);
         }
 
-        /**
+        // 统一布局配置
-         * 统一初始化功能项布局属性
-         */
         private void initItemLayout() {
             setOrientation(HORIZONTAL);
             setGravity(Gravity.CENTER_VERTICAL);
             setPadding(dp2px(PADDING_MID), dp2px(PADDING_SMALL), dp2px(PADDING_MID), dp2px(PADDING_SMALL));
             setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
             setClickable(true);
-            setBackground(create_item_background());
+            setBackgroundResource(android.R.drawable.list_selector_background);
         }
 
-        /**
+        // 统一视图构建
-         * 创建带1像素边框的背景drawable
-         */
-        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.setCornerRadius(4);
-            drawable.setColor(mItemContext.getResources().getColor(android.R.color.white));
-            return drawable;
-        }
-
-        /**
-         * 统一构建功能项视图（左侧图标+右侧标题/内容）
-         */
         private void initItemViews() {
             // 左侧图标
             if (mIconRes != 0) {
@@ -440,17 +384,20 @@ public class AboutView extends LinearLayout {
                 ivIcon.setImageResource(mIconRes);
                 addView(ivIcon);
             }
+
             // 右侧文本容器
             LinearLayout llText = new LinearLayout(mItemContext);
             llText.setOrientation(VERTICAL);
             llText.setLayoutParams(new LayoutParams(0, LayoutParams.WRAP_CONTENT, 1.0f));
             addView(llText);
+
             // 标题
             TextView tvTitle = new TextView(mItemContext);
             tvTitle.setText(mTitle);
             tvTitle.setTextSize(16);
             tvTitle.setTextColor(mItemContext.getResources().getColor(R.color.gray_900));
             llText.addView(tvTitle);
+
             // 内容
             TextView tvContent = new TextView(mItemContext);
             tvContent.setText(mContent);
@@ -460,17 +407,11 @@ public class AboutView extends LinearLayout {
             llText.addView(tvContent);
         }
 
-        /**
+        // 子类指定内容文本颜色
-         * 子类抽象方法：指定内容文本颜色
-         * @return 颜色值
-         */
         protected abstract int getContentTextColor();
     }
 
-    // ===================================== 内部邮件功能项子类 =====================================
+    // 邮件类功能控件 - 专属邮件唤起逻辑
-    /**
-     * 邮件类功能控件，实现专属邮件唤起逻辑，双方案兼容（纯邮件客户端/通用邮件应用）
-     */
     private class EmailFunctionItemView extends BaseFunctionItemView {
         public EmailFunctionItemView(Context context, String title, String content, int iconRes) {
             super(context, title, content, iconRes);
@@ -483,37 +424,36 @@ public class AboutView extends LinearLayout {
 
         @Override
         public void onClick(View v) {
-            LogUtils.d(TAG, "EmailFunctionItemView onClick：触发邮件唤起逻辑");
+            LogUtils.d(TAG, "EmailFunctionItemView onClick 触发邮件唤起");
-            // 方案1：纯邮件客户端唤起
+            // 双方案邮件唤起逻辑
             Intent emailIntent = new Intent(Intent.ACTION_SENDTO);
             emailIntent.setData(Uri.parse("mailto:" + EMAIL_ADDRESS));
             emailIntent.putExtra(Intent.EXTRA_SUBJECT, EMAIL_TITLE);
             emailIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
             if (emailIntent.resolveActivity(mItemContext.getPackageManager()) != null) {
                 mItemContext.startActivity(emailIntent);
-                LogUtils.d(TAG, "EmailFunctionItemView：纯邮件客户端唤起成功");
+                LogUtils.d(TAG, "邮件唤起成功：系统纯邮件客户端");
                 return;
             }
-            // 方案2：通用邮件应用兜底
+
             Intent fallbackIntent = new Intent(Intent.ACTION_SEND);
             fallbackIntent.setType(EMAIL_TYPE);
             fallbackIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{EMAIL_ADDRESS});
             fallbackIntent.putExtra(Intent.EXTRA_SUBJECT, EMAIL_TITLE);
             fallbackIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
             if (fallbackIntent.resolveActivity(mItemContext.getPackageManager()) != null) {
                 mItemContext.startActivity(fallbackIntent);
-                LogUtils.d(TAG, "EmailFunctionItemView：通用邮件应用唤起成功");
+                LogUtils.d(TAG, "邮件唤起成功：通用邮件应用");
             } else {
                 ToastUtils.show("未找到可发送邮件的应用");
-                LogUtils.w(TAG, "EmailFunctionItemView：邮件唤起失败，无可用邮件应用");
+                LogUtils.w(TAG, "邮件唤起失败：无可用邮件相关应用");
             }
         }
     }
 
-    // ===================================== 内部网页跳转功能项子类 =====================================
+    // 网页跳转类功能控件 - 专属网页跳转逻辑
-    /**
-     * 网页跳转类功能控件，实现专属网页唤起逻辑，包含空地址校验、异常捕获
-     */
     private class WebJumpFunctionItemView extends BaseFunctionItemView {
         public WebJumpFunctionItemView(Context context, String title, String content, int iconRes) {
             super(context, title, content, iconRes);
@@ -526,28 +466,25 @@ public class AboutView extends LinearLayout {
 
         @Override
         public void onClick(View v) {
-            LogUtils.d(TAG, "WebJumpFunctionItemView onClick：触发网页跳转，地址=" + mContent);
+            LogUtils.d(TAG, "WebJumpFunctionItemView onClick 触发网页跳转，地址：" + mContent);
             if (mContent.isEmpty()) {
                 ToastUtils.show("跳转地址为空");
-                LogUtils.w(TAG, "WebJumpFunctionItemView：网页跳转失败，地址为空");
+                LogUtils.w(TAG, "网页跳转失败：地址为空");
                 return;
             }
             try {
                 Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(mContent));
                 browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 mItemContext.startActivity(browserIntent);
-                LogUtils.d(TAG, "WebJumpFunctionItemView：网页跳转成功");
+                LogUtils.d(TAG, "网页跳转成功");
             } catch (Exception e) {
-                LogUtils.e(TAG, "WebJumpFunctionItemView：网页跳转失败", e);
+                LogUtils.d(TAG, "网页跳转失败，异常捕获", e);
                 ToastUtils.show("链接无法打开");
             }
         }
     }
 
-    // ===================================== 内部回调接口 =====================================
+    // 内部接口区（置于类末尾，逻辑闭环）
-    /**
-     * 调试信息自动填充回调接口
-     */
     public interface OnRequestDevUserInfoAutofillListener {
         void requestAutofill(EditText etDevUserName, EditText etDevUserPassword);
     }

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

@@ -1,61 +0,0 @@
-package cc.winboll.studio.libappbase.views;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.Toast;
-import cc.winboll.studio.libappbase.GlobalApplication;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/04/06 19:32
- * @Describe 具有调试模式切换功能的应用Logo控件，连续点击10次弹出提示
- */
-public class DebugSwitchImageView extends ImageView {
-
-    public static final String TAG = "DebugSwitchImageView";
-
-    // 连续点击计数
-    private int mClickCount = 0;
-    // 目标点击次数
-    private static final int TARGET_CLICK_COUNT = 10;
-
-	public DebugSwitchImageView(Context context) {
-        super(context);
-        init();
-    }
-
-    public DebugSwitchImageView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public DebugSwitchImageView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init();
-    }
-
-    public DebugSwitchImageView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init();
-    }
-
-    private void init() {
-        setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					mClickCount++;
-					if (mClickCount == TARGET_CLICK_COUNT) {
-						// 达到10次，弹出Toast
-						Toast.makeText(getContext(), "连续点击已达到10次，现在开启应用调试功能。", Toast.LENGTH_SHORT).show();
-						GlobalApplication.setIsDebugging(true);
-						GlobalApplication.saveDebugStatus(GlobalApplication.getInstance());
-						// 重置计数，可再次触发
-						mClickCount = 0;
-					}
-				}
-			});
-    }
-}
-

libappbase/src/main/res/drawable/ic_bug.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M14,12H10V10H14M14,16H10V14H14M20,8H17.19C16.74,7.22 16.12,6.55 15.37,6.04L17,4.41L15.59,3L13.42,5.17C12.96,5.06 12.5,5 12,5C11.5,5 11.04,5.06 10.59,5.17L8.41,3L7,4.41L8.62,6.04C7.88,6.55 7.26,7.22 6.81,8H4V10H6.09C6.04,10.33 6,10.66 6,11V12H4V14H6V15C6,15.34 6.04,15.67 6.09,16H4V18H6.81C7.85,19.79 9.78,21 12,21C14.22,21 16.15,19.79 17.19,18H20V16H17.91C17.96,15.67 18,15.34 18,15V14H20V12H18V11C18,10.66 17.96,10.33 17.91,10H20V8Z"/>
-
-</vector>

libappbase/src/main/res/drawable/ic_debug_step_over.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M19,7H16.19C15.74,6.2 15.12,5.5 14.37,5L16,3.41L14.59,2L12.42,4.17C11.96,4.06 11.5,4 11,4S10.05,4.06 9.59,4.17L7.41,2L6,3.41L7.62,5C6.87,5.5 6.26,6.21 5.81,7H3V9H5.09C5.03,9.33 5,9.66 5,10V11H3V13H5V14C5,14.34 5.03,14.67 5.09,15H3V17H5.81C7.26,19.5 10.28,20.61 13,19.65V19C13,18.43 13.09,17.86 13.25,17.31C12.59,17.76 11.8,18 11,18C8.79,18 7,16.21 7,14V10C7,7.79 8.79,6 11,6S15,7.79 15,10V14C15,14.19 15,14.39 14.95,14.58C15.54,14.04 16.24,13.62 17,13.35V13H19V11H17V10C17,9.66 16.97,9.33 16.91,9H19V7M13,9V11H9V9H13M13,13V15H9V13H13M16,16H22V22H16V16Z"/>
-
-</vector>

libappbase/src/main/res/drawable/shape_edittext_bg.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#FFFFFF"/>
-            <stroke android:width="1dp" android:color="#007AFF"/>
-            <corners android:radius="8dp"/>
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#FFFFFF"/>
-            <stroke android:width="1dp" android:color="#E5E5E5"/>
-            <corners android:radius="8dp"/>
-        </shape>
-    </item>
-</selector>
-

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

@@ -1,52 +0,0 @@
-<?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="#FFDCDCDC">
-
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="应用指纹校验"
-		android:textSize="16sp"
-		android:textColor="@color/gray_900"
-		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="@color/gray_900"/>
-
-</LinearLayout>
-

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

@@ -1,60 +0,0 @@
-<?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="#FFFFFF">
-
-    <!-- 标题 -->
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="设置服务器地址"
-        android:textSize="16sp"
-        android:textColor="#212121"
-        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: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: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="#2196F3"
-            android:textColor="#FFFFFF"/>
-
-    </LinearLayout>
-
-</LinearLayout>
-

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

@@ -1,92 +0,0 @@
-<?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">
-
-	<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="@color/gray_900"/>
-
-		<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="@color/gray_500"/>
-
-		<View
-			android:layout_width="match_parent"
-			android:layout_height="1px"
-			android:layout_marginTop="4dp"
-			android:layout_marginBottom="8dp"
-			android:background="@color/gray_200"/>
-
-		<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>
-

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

@@ -12,9 +12,4 @@
         <item name="colorTextBackgound">#FF000000</item>
 	</style>
 
-	<style name="DialogStyle" parent="@android:style/Theme.Dialog">
-		<item name="android:windowBackground">@android:color/transparent</item>
-		<item name="android:windowNoTitle">true</item>
-	</style>
-
 </resources>

libappbase/src/main/res/xml/network_security_config.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <!-- 原有配置 保留 -->
-        <domain includeSubdomains="true">winboll.cc</domain>
-        <domain includeSubdomains="true">localhost</domain>
-        <domain includeSubdomains="true">127.0.0.1</domain>
-
-        <!-- 精准配置10.8.0.0/24 前20个IP（10.8.0.0~10.8.0.19）-->
-        <domain includeSubdomains="false">10.8.0.0</domain>
-        <domain includeSubdomains="false">10.8.0.1</domain>
-        <domain includeSubdomains="false">10.8.0.2</domain>
-        <domain includeSubdomains="false">10.8.0.3</domain>
-        <domain includeSubdomains="false">10.8.0.4</domain>
-        <domain includeSubdomains="false">10.8.0.5</domain>
-        <domain includeSubdomains="false">10.8.0.6</domain>
-        <domain includeSubdomains="false">10.8.0.7</domain>
-        <domain includeSubdomains="false">10.8.0.8</domain>
-        <domain includeSubdomains="false">10.8.0.9</domain>
-        <domain includeSubdomains="false">10.8.0.10</domain>
-        <domain includeSubdomains="false">10.8.0.11</domain>
-        <domain includeSubdomains="false">10.8.0.12</domain>
-        <domain includeSubdomains="false">10.8.0.13</domain>
-        <domain includeSubdomains="false">10.8.0.14</domain>
-        <domain includeSubdomains="false">10.8.0.15</domain>
-        <domain includeSubdomains="false">10.8.0.16</domain>
-        <domain includeSubdomains="false">10.8.0.17</domain>
-        <domain includeSubdomains="false">10.8.0.18</domain>
-        <domain includeSubdomains="false">10.8.0.19</domain>
-    </domain-config>
-</network-security-config>
-
-
-
-

libgpsrelaysentinel/build.gradle

@@ -1,35 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
-apply from: '../.winboll/winboll_lib_build.gradle'
-apply from: '../.winboll/winboll_lint_build.gradle'
-
-android {
-	// 适配MIUI12
-	compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-
-    defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 30
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-}
-
-dependencies {
-	
-	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.15.9'
-    api 'cc.winboll.studio:libappbase:15.15.21'
-	
-    api fileTree(dir: 'libs', include: ['*.jar'])
-}

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

libgpsrelaysentinel/proguard-rules.pro

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

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>

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;
-    }
-}
-

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();
-    }
-}
-

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;
-}
-

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")
-        );
-    }
-}
-

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")
-        );
-    }
-}
-

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;
-    }
-}
-