<winboll>APK 15.20.5 release Publish.

- App.onCreate() 中调用 AESThemeUtil.init() 注入当前应用的
  R.style.* 主题ID列表（按 ThemeType.ordinal() 顺序排列），
  避免 Jitpack AESThemeUtil 内部 ArrayList 为空导致越界崩溃
- PatternLockActivity / SettingsActivity 删除冗余的
  AESThemeUtil.applyAppTheme(this) 调用（父类 BaseWinBoLLActivity
  已在 onCreate 中通过 setThemeStyle() 处理主题设置）

.gitignore

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

.winboll/winboll_app_build.gradle

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

README.md

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

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Jun 02 08:54:20 HKT 2026
+#Wed May 27 20:22:45 HKT 2026
-stageCount=13
+stageCount=11
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.12
+publishVersion=15.20.10
 buildCount=0
-baseBetaVersion=15.20.13
+baseBetaVersion=15.20.11

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

@@ -5,11 +5,10 @@ package cc.winboll.studio.aes;
  * @Date 2024/06/13 19:03:58
  * @Describe AES应用类
  */
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import android.view.Gravity;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.ToastUtils;
-import java.util.ArrayList;
 
 
 public class App extends GlobalApplication {
@@ -19,7 +18,6 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-		AESThemeUtil.init(null);
 		WinBoLLActivityManager.init(this);
 
         // 初始化 Toast 框架

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 03 06:52:38 HKT 2026
+#Wed May 27 14:51:29 HKT 2026
-stageCount=26
+stageCount=23
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.25
+publishVersion=15.20.22
 buildCount=0
-baseBetaVersion=15.20.26
+baseBetaVersion=15.20.23

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

@@ -1,11 +1,8 @@
 package cc.winboll.studio.appbase;
 
-import cc.winboll.studio.libappbase.CrashHandler;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.ToastUtils;
-import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
+import cc.winboll.studio.libappbase.BuildConfig;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>
@@ -24,24 +21,10 @@ public class App extends GlobalApplication {
      */
     @Override
     public void onCreate() {
-		try {
+        super.onCreate();
-			super.onCreate();
+		
-			
+        // 初始化 Toast 工具类（传入应用全局上下文，确保 Toast 可在任意地方调用）
-			// 初始化 Toast 工具类（传入应用全局上下文，确保 Toast 可在任意地方调用）
+        ToastUtils.init(getApplicationContext());
-			ToastUtils.init(getApplicationContext());
-		} catch (Throwable e) {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            pw.close();
-            String stackTraceStr = sw.toString();
-            CrashHandleNotifyUtils.handleUncaughtException(
-                this,
-                getPackageName(),
-                stackTraceStr,
-                CrashHandler.CrashActivity.class
-            );
-        }
     }
 
     /**

gitsion/README.md

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

gitsion/app_update_description.txt

@@ -1 +0,0 @@
-

gitsion/build.gradle

@@ -1,122 +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.gitsion"
-        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(':libgitsion')
-    
-    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.20.15'
-    api 'cc.winboll.studio:libappbase:15.20.26'
-	
-	api fileTree(dir: 'libs', include: ['*.jar'])
-}

gitsion/build.properties

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

gitsion/proguard-rules.pro

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

gitsion/src/beta/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>
-

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

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

gitsion/src/main/AndroidManifest.xml

@@ -1,63 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.gitsion">
-
-    <!-- 只能在前台获取精确的位置信息 -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-
-    <!-- 只有在前台运行时才能获取大致位置信息 -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-
-    <!-- 在后台使用位置信息 -->
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
-
-    <!-- 运行前台服务 -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:label="@string/app_name"
-        android:theme="@style/MyAppTheme"
-        android:resizeableActivity="true"
-        android:name=".App">
-
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name">
-
-            <intent-filter>
-
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-
-            </intent-filter>
-
-        </activity>
-
-        <meta-data
-            android:name="android.max_aspect"
-            android:value="4.0"/>
-
-        <activity android:name=".GlobalApplication$CrashActivity"/>
-
-        <service
-            android:name=".MainService"
-            android:enabled="true"
-            android:exported="false"/>
-
-        <service android:name=".GpsReceiverChildService1"/>
-
-        <service android:name=".GpsReceiverChildService2"/>
-
-        <service android:name=".GpsReceiverChildService3"/>
-
-        <activity android:name=".AboutActivity"/>
-        <activity android:name=".GpsHistoryActivity"/>
-
-    </application>
-
-</manifest>

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

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

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

@@ -1,357 +0,0 @@
-package cc.winboll.studio.gitsion;
-
-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.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.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
-import cc.winboll.studio.libappbase.CrashActivity;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.ToastUtils;
-import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-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.io.PrintWriter;
-import java.io.StringWriter;
-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() {
-        try {
-			super.onCreate();
-			ToastUtils.init(this);
-			WinBoLLActivityManager.init(this);
-			AESThemeUtil.init(null);
-			GpsHistoryManager.getInstance().init(this);
-		} catch (Throwable e) {
-			StringWriter sw = new StringWriter();
-			PrintWriter pw = new PrintWriter(sw);
-			e.printStackTrace(pw);
-			pw.close();
-			String stackTraceStr = sw.toString();
-			CrashHandleNotifyUtils.handleUncaughtException(
-				this,
-				getPackageName(),
-				stackTraceStr,
-				CrashActivity.class
-			);
-		}
-    }
-
-    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();
-        }
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

gitsion/src/main/res/drawable-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>

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

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

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

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillColor="#26A69A"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-</vector>

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

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

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

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

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

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

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

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

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

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

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

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_about"
-        android:title="About"
-        android:icon="@android:drawable/ic_menu_info_details"
-        app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/action_gps_history"
-        android:title="GPS历史"
-        android:icon="@android:drawable/ic_menu_myplaces"
-        app:showAsAction="ifRoom"/>
-    <group android:id="@+id/group_debug">
-        <item
-            android:id="@+id/action_app_log"
-            android:title="应用日志"
-            android:visible="false"/>
-    </group>
-</menu>

gitsion/src/main/res/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>

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

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

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

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

@@ -1,14 +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>
-
-    <color name="mainWindowBackgroundColor">#FFF5F5F5</color>
-    <color name="mainWindowTextColor">#FF000000</color>
-    <color name="mainWindowDarkBackgroundColor">#FFF5F5F5</color>
-    <color name="mainWindowDarkTextColor">#FF000000</color>
-    <color name="toolbarBackgroundColor">#FF009688</color>
-    <color name="toolbarTextColor">#FF000000</color>
-    <color name="debugTextColor">#FF808080</color>
-</resources>

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

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

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

@@ -1,35 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-
-        <item name="themeDebug">@style/DebugActivityTheme</item>
-
-        <item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
-        <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
-        <item name="mainWindowDarkBackgroundColor">@color/mainWindowDarkBackgroundColor</item>
-        <item name="mainWindowDarkTextColor">@color/mainWindowDarkTextColor</item>
-        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
-        <item name="toolbarTextColor">@color/toolbarTextColor</item>
-        <item name="activityBackgroundColor">?attr/mainWindowBackgroundColor</item>
-        <item name="activityTextColor">?attr/mainWindowTextColor</item>
-        <item name="debugTextColor">@color/debugTextColor</item>
-        <item name="aboutViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
-        <item name="aboutViewTextColor">?attr/mainWindowTextColor</item>
-        <item name="aboutViewTitleColor">?attr/mainWindowTextColor</item>
-        <item name="aboutViewDividerColor">?attr/mainWindowDarkTextColor</item>
-    </style>
-
-    <style name="DebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorTittle">?attr/mainWindowTextColor</item>
-        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
-        <item name="colorText">?attr/debugTextColor</item>
-        <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
-        <item name="debugTextColor">@color/debugTextColor</item>
-        <item name="toolbarTextColor">@color/toolbarTextColor</item>
-    </style>
-
-</resources>

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

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Put flavor specific strings here -->
-
-</resources>

libaes/build.gradle

@@ -66,9 +66,9 @@ dependencies {
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    //api 'cc.winboll.studio:libappbase:15.20.22'
+    api 'cc.winboll.studio:libappbase:15.20.22'
 	// 备用库 jitpack.io 地址
-	api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.22'
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.15.21'
 	
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Jun 02 08:54:20 HKT 2026
+#Wed May 27 20:22:45 HKT 2026
-stageCount=13
+stageCount=11
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.12
+publishVersion=15.20.10
 buildCount=0
-baseBetaVersion=15.20.13
+baseBetaVersion=15.20.11

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

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

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

@@ -10,7 +10,6 @@ import android.util.JsonWriter;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
 import java.io.IOException;
-import java.util.ArrayList;
 
 public class AESThemeBean extends BaseBean {
 
@@ -42,28 +41,13 @@ public class AESThemeBean extends BaseBean {
             return name;
         }
     }
-
+    
-	public static void fillThemeStyleIDList(ArrayList<Integer> themeStyleIDList) {
-		if (themeStyleIDList == null) {
-			themeStyleIDList = new ArrayList<Integer>();
-
-		} 
-		themeStyleIDList.clear();
-		themeStyleIDList.add(cc.winboll.studio.libaes.R.style.AESTheme);
-		themeStyleIDList.add(cc.winboll.studio.libaes.R.style.DepthAESTheme);
-		themeStyleIDList.add(cc.winboll.studio.libaes.R.style.SkyAESTheme);
-		themeStyleIDList.add(cc.winboll.studio.libaes.R.style.GoldenAESTheme);
-		themeStyleIDList.add(cc.winboll.studio.libaes.R.style.BearingAESTheme);
-		themeStyleIDList.add(cc.winboll.studio.libaes.R.style.MemorAESTheme);
-		themeStyleIDList.add(cc.winboll.studio.libaes.R.style.TaoAESTheme);
-	}
-
     // 保存当前主题
     int currentThemeStyleID = getThemeStyleID(ThemeType.AES);
-
+    
     public AESThemeBean() {
     }
-
+    
     public AESThemeBean(int currentThemeStyleID) {
         this.currentThemeStyleID = currentThemeStyleID;
     }
@@ -75,7 +59,7 @@ public class AESThemeBean extends BaseBean {
     public int getCurrentThemeTypeID() {
         return this.currentThemeStyleID;
     }
-
+    
     @Override
     public String getName() {
         return AESThemeBean.class.getName();
@@ -90,7 +74,8 @@ public class AESThemeBean extends BaseBean {
 
     @Override
     public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
-        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+        if(super.initObjectsFromJsonReader(jsonReader, name)) { return true; }
+        else{
             if (name.equals("currentThemeTypeID")) {
                 setCurrentThemeTypeID(jsonReader.nextInt());
             } else {
@@ -105,7 +90,7 @@ public class AESThemeBean extends BaseBean {
         jsonReader.beginObject();
         while (jsonReader.hasNext()) {
             String name = jsonReader.nextName();
-            if (!initObjectsFromJsonReader(jsonReader, name)) {
+            if(!initObjectsFromJsonReader(jsonReader, name)) {
                 jsonReader.skipValue();
             }
         }

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

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

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

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

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

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

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

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

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

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

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

@@ -86,9 +86,9 @@
     </style>
 
     <style name="TaoAESTheme" parent="AESTheme">
-        <item name="colorPrimary">#FF7E7E7E</item>
+        <item name="colorPrimary">#FFACACAC</item>
-        <item name="colorPrimaryDark">#FF000000</item>
+        <item name="colorPrimaryDark">#FF898989</item>
-        <item name="colorAccent">#FFE2E2E2</item>
+        <item name="colorAccent">#FFD8D8D8</item>
     </style>
 
     <style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog">
@@ -112,4 +112,4 @@
         <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item>
     </style>
 
-</resources>
+</resources>

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jun 03 06:52:38 HKT 2026
+#Wed May 27 14:51:29 HKT 2026
-stageCount=26
+stageCount=23
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.25
+publishVersion=15.20.22
 buildCount=0
-baseBetaVersion=15.20.26
+baseBetaVersion=15.20.23

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

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

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

@@ -6,10 +6,6 @@ import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.util.Log;
-import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 
 /**
  * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
@@ -129,32 +125,17 @@ public class GlobalApplication extends Application {
      */
     @Override
     public void onCreate() {
-        try {
+        super.onCreate();
-            super.onCreate();
+        // 初始化单例实例（确保在所有初始化操作前完成）
-			
+        sInstance = this;
-            // 初始化单例实例（确保在所有初始化操作前完成）
-            sInstance = this;
 
-            restoreDebugStatus();
+        restoreDebugStatus();
-            // 初始化基础组件（日志、崩溃处理、Toast）
+        // 初始化基础组件（日志、崩溃处理、Toast）
-            initCoreComponents();
+        initCoreComponents();
-            // 初始化服务器地址（从 SP 读取到内存，提高后续访问效率）
+        // 初始化服务器地址（从 SP 读取到内存，提高后续访问效率）
-            initWinbollHost();
+        initWinbollHost();
 
-            LogUtils.d(TAG, "GlobalApplication 初始化完成，单例实例已创建");
+        LogUtils.d(TAG, "GlobalApplication 初始化完成，单例实例已创建");
-        } catch (Throwable e) {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            pw.close();
-            String stackTraceStr = sw.toString();
-            CrashHandleNotifyUtils.handleUncaughtException(
-                this,
-                getPackageName(),
-                stackTraceStr,
-                CrashHandler.CrashActivity.class
-            );
-        }
     }
 
     /**
@@ -209,7 +190,7 @@ public class GlobalApplication extends Application {
      */
     public static String getAppName(Context context) {
         if (context == null) {
-            Log.w(TAG, "getAppName: 上下文为空，返回 null");
+            LogUtils.w(TAG, "getAppName: 上下文为空，返回 null");
             return null;
         }
         PackageManager packageManager = context.getPackageManager();
@@ -225,7 +206,8 @@ public class GlobalApplication extends Application {
             return appName;
         } catch (NameNotFoundException e) {
             // 包名不存在（理论上不会发生，捕获异常避免崩溃）
-            Log.e(TAG, "获取应用名称失败：包名不存在", e);
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            //LogUtils.e(TAG, "获取应用名称失败：包名不存在", e);
             e.printStackTrace();
         }
         return null;

libgitsion/.gitignore

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

libgitsion/build.gradle

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

libgitsion/build.properties

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

libgitsion/proguard-rules.pro

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

libgitsion/src/main/AndroidManifest.xml

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

libgitsion/src/main/java/cc/winboll/studio/libgitsion/manager/GpsSubscribeManager.java

@@ -1,75 +0,0 @@
-package cc.winboll.studio.libgitsion.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.libgitsion.model.GpsSubscribeConst;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgitsion.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(GpsSubscribeConst.EXTRA_SUBSCRIBE_RESULT, result);
-        appContext.sendBroadcast(intent);
-    }
-
-    public void clearAllSubscribe(){
-        subscribeMap.clear();
-        SubscribeLocationManager.getInstance().clearAll();
-    }
-
-    public Map<String, GpsSubscribeMsg> getSubscribeMap() {
-        return subscribeMap;
-    }
-}
-

libgitsion/src/main/java/cc/winboll/studio/libgitsion/manager/SubscribeLocationManager.java

@@ -1,128 +0,0 @@
-package cc.winboll.studio.libgitsion.manager;
-
-import cc.winboll.studio.libgitsion.model.GpsSubscribeConst;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgitsion.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();
-    }
-}
-

libgitsion/src/main/java/cc/winboll/studio/libgitsion/model/GpsSubscribeConst.java

@@ -1,51 +0,0 @@
-package cc.winboll.studio.libgitsion.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";
-
-    //Intent Extra 键名
-    public static final String EXTRA_SUBSCRIBE_SID = "extra_subscribe_sid";
-    public static final String EXTRA_SUBSCRIBE_RESULT = "extra_subscribe_result";
-    public static final String EXTRA_LOCATION_POINT = "extra_location_point";
-
-    //超时毫秒
-    public static final long SUBSCRIBE_TIME_OUT = 5000;
-
-    //地球半径 距离计算常量
-    public static final double EARTH_RADIUS = 6378137.0;
-}
-

libgitsion/src/main/java/cc/winboll/studio/libgitsion/model/GpsSubscribeMsg.java

@@ -1,137 +0,0 @@
-package cc.winboll.studio.libgitsion.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")
-        );
-    }
-}
-

libgitsion/src/main/java/cc/winboll/studio/libgitsion/model/GpsSubscribeResult.java

@@ -1,148 +0,0 @@
-package cc.winboll.studio.libgitsion.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;
-    private final double latitude;
-    private final double longitude;
-    private final long locationTime;
-
-    public GpsSubscribeResult(String subscribeUniqueId,
-                              int resultCode,
-                              String resultDesc,
-                              int gpsRunningState,
-                              long realEffectiveInterval,
-                              long currentTimeStamp,
-                              double latitude,
-                              double longitude,
-                              long locationTime) {
-        this.subscribeUniqueId = subscribeUniqueId;
-        this.resultCode = resultCode;
-        this.resultDesc = resultDesc;
-        this.gpsRunningState = gpsRunningState;
-        this.realEffectiveInterval = realEffectiveInterval;
-        this.currentTimeStamp = currentTimeStamp;
-        this.latitude = latitude;
-        this.longitude = longitude;
-        this.locationTime = locationTime;
-    }
-
-    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;
-    }
-
-    public double getLatitude() {
-        return latitude;
-    }
-
-    public double getLongitude() {
-        return longitude;
-    }
-
-    public long getLocationTime() {
-        return locationTime;
-    }
-
-    @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);
-        dest.writeDouble(latitude);
-        dest.writeDouble(longitude);
-        dest.writeLong(locationTime);
-    }
-
-    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(),
-				in.readDouble(),
-				in.readDouble(),
-				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);
-        bundle.putDouble("lat", latitude);
-        bundle.putDouble("lng", longitude);
-        bundle.putLong("locTime", locationTime);
-        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"),
-			bundle.getDouble("lat"),
-			bundle.getDouble("lng"),
-			bundle.getLong("locTime")
-        );
-    }
-}
-

libgitsion/src/main/java/cc/winboll/studio/libgitsion/model/LocationPoint.java

@@ -1,37 +0,0 @@
-package cc.winboll.studio.libgitsion.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;
-    }
-}
-

libgitsion/src/main/java/cc/winboll/studio/libgitsion/receiver/GpsSubscribeObserverReceiver.java

@@ -1,42 +0,0 @@
-package cc.winboll.studio.libgitsion.receiver;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:27
- */
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import cc.winboll.studio.libgitsion.model.GpsSubscribeConst;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeResult;
-
-public final class GpsSubscribeObserverReceiver extends BroadcastReceiver {
-
-    private OnSubscribeResultListener listener;
-
-    public void setOnSubscribeResultListener(OnSubscribeResultListener listener){
-        this.listener = listener;
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        String action = intent.getAction();
-        if(GpsSubscribeConst.ACTION_SUBSCRIBE_CALLBACK.equals(action)){
-            GpsSubscribeResult result = intent.getParcelableExtra(GpsSubscribeConst.EXTRA_SUBSCRIBE_RESULT);
-            if(listener != null && result != null){
-                listener.onResultBack(result);
-            }
-        }
-    }
-
-    public interface OnSubscribeResultListener{
-        void onResultBack(GpsSubscribeResult result);
-    }
-}
-

libgitsion/src/main/java/cc/winboll/studio/libgitsion/service/GpsSubscribeReceiverService.java

@@ -1,94 +0,0 @@
-package cc.winboll.studio.libgitsion.service;
-
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.IBinder;
-
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libgitsion.manager.SubscribeLocationManager;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeConst;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeResult;
-import cc.winboll.studio.libgitsion.model.LocationPoint;
-
-/**
- * 全局消息接收父类服务
- * 所有应用内接收服务全部继承此类
- */
-public abstract class GpsSubscribeReceiverService extends Service {
-
-    public static final String TAG_PARENT = "GpsSubscribeReceiverService";
-
-    //当前绑定的视图订阅SID
-    protected String bindViewSid;
-
-    private BroadcastReceiver mCallbackReceiver;
-
-    public void bindControlSid(String sid){
-        this.bindViewSid = sid;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        LogUtils.d(TAG_PARENT, "Service onCreate, 注册广播接收器");
-        mCallbackReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                if (GpsSubscribeConst.ACTION_SUBSCRIBE_CALLBACK.equals(intent.getAction())) {
-                    GpsSubscribeResult result = intent.getParcelableExtra(GpsSubscribeConst.EXTRA_SUBSCRIBE_RESULT);
-                    if (result != null && bindViewSid != null
-                        && bindViewSid.equals(result.getSubscribeUniqueId())) {
-                        LocationPoint point = new LocationPoint(
-                            result.getLatitude(),
-                            result.getLongitude(),
-                            result.getLocationTime()
-                        );
-                        GpsSubscribeMsg config = SubscribeLocationManager.getInstance()
-                            .getSubscribeConfig(bindViewSid);
-                        LogUtils.d(TAG_PARENT, "收到GPS推送，转发至 onReceiveGpsData，SID：" + bindViewSid);
-                        onReceiveGpsData(point, config);
-                    }
-                }
-            }
-        };
-        registerReceiver(mCallbackReceiver, new IntentFilter(GpsSubscribeConst.ACTION_SUBSCRIBE_CALLBACK));
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        if (intent != null && intent.hasExtra(GpsSubscribeConst.EXTRA_SUBSCRIBE_SID)) {
-            String sid = intent.getStringExtra(GpsSubscribeConst.EXTRA_SUBSCRIBE_SID);
-            bindControlSid(sid);
-            LogUtils.d(TAG_PARENT, "绑定SID：" + sid);
-        }
-        return START_NOT_STICKY;
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (mCallbackReceiver != null) {
-            unregisterReceiver(mCallbackReceiver);
-            mCallbackReceiver = null;
-            LogUtils.d(TAG_PARENT, "广播接收器已注销");
-        }
-    }
-
-    /**
-     * 统一接收GPS推送入口
-     */
-    public void onReceiveGpsData(LocationPoint point, GpsSubscribeMsg config){
-        //父类统一日志溯源
-        LogUtils.d(TAG_PARENT,"【消息溯源】接收视图SID：" + bindViewSid);
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-}
-

libgitsion/src/main/java/cc/winboll/studio/libgitsion/util/TimeCountUtil.java

@@ -1,51 +0,0 @@
-package cc.winboll.studio.libgitsion.util;
-
-/**
- * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
- * @Date 2026/05/07 10:26
- */
-
-import android.os.Handler;
-import android.os.Message;
-
-public final class TimeCountUtil {
-
-    private final Handler mHandler;
-    private long totalTime;
-    private boolean isRunning;
-    public static final int COUNT_FINISH = 1001;
-
-    public TimeCountUtil(final OnCountListener listener) {
-        mHandler = new Handler() {
-            @Override
-            public void handleMessage(Message msg) {
-                super.handleMessage(msg);
-                if(msg.what == COUNT_FINISH){
-                    isRunning = false;
-                    if(listener != null){
-                        listener.onTimeOut();
-                    }
-                }
-            }
-        };
-    }
-
-    public void start(long time){
-        if(isRunning){
-            return;
-        }
-        totalTime = time;
-        isRunning = true;
-        mHandler.sendEmptyMessageDelayed(COUNT_FINISH,totalTime);
-    }
-
-    public void cancel(){
-        mHandler.removeMessages(COUNT_FINISH);
-        isRunning = false;
-    }
-
-    public interface OnCountListener{
-        void onTimeOut();
-    }
-}
-

libgitsion/src/main/java/cc/winboll/studio/libgitsion/view/GpsSubscribeControlView.java

@@ -1,227 +0,0 @@
-package cc.winboll.studio.libgitsion.view;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import cc.winboll.studio.libgitsion.R;
-import cc.winboll.studio.libgitsion.manager.GpsSubscribeManager;
-import cc.winboll.studio.libgitsion.manager.SubscribeLocationManager;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeConst;
-import cc.winboll.studio.libgitsion.model.GpsSubscribeMsg;
-import cc.winboll.studio.libgitsion.model.LocationPoint;
-
-import java.util.UUID;
-
-public final class GpsSubscribeControlView extends LinearLayout {
-
-    //常量抽取
-    private static final long REFRESH_INTERVAL = 600;
-
-    private RadioGroup rgSubscribeMode;
-    private RadioButton rbModeAll;
-    private RadioButton rbModeStep;
-    private EditText etStepMeter;
-    private Switch switchSubscribe;
-    private TextView tvSubscribeSid;
-    private TextView tvSubscribeRecord;
-
-    private String currentSubscribeSid;
-    //一对一专属绑定的接收服务
-    private Class<?> mBindReceiverServiceClazz;
-
-    //final管理器 构造器初始化
-    private final GpsSubscribeManager mSubscribeManager;
-    private final SubscribeLocationManager mLocationManager;
-
-    private final Handler mRefreshHandler = new Handler(Looper.getMainLooper());
-
-
-    public GpsSubscribeControlView(Context context) {
-        super(context);
-        mSubscribeManager = GpsSubscribeManager.getInstance();
-        mLocationManager = SubscribeLocationManager.getInstance();
-        initView(context);
-    }
-
-    public GpsSubscribeControlView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mSubscribeManager = GpsSubscribeManager.getInstance();
-        mLocationManager = SubscribeLocationManager.getInstance();
-        initView(context);
-    }
-
-    private void initView(Context context) {
-        LayoutInflater.from(context).inflate(R.layout.view_gps_subscribe_control, this, true);
-
-        rgSubscribeMode = findViewById(R.id.rg_subscribe_mode);
-        rbModeAll = findViewById(R.id.rb_mode_all);
-        rbModeStep = findViewById(R.id.rb_mode_step);
-        etStepMeter = findViewById(R.id.et_step_meter);
-        switchSubscribe = findViewById(R.id.switch_subscribe);
-        tvSubscribeSid = findViewById(R.id.tv_subscribe_sid);
-        tvSubscribeRecord = findViewById(R.id.tv_subscribe_record);
-
-        initDefaultConfig();
-        initModeSwitch();
-        initSubscribeSwitch();
-        startAutoRefreshRecord();
-    }
-
-    private void initDefaultConfig() {
-        currentSubscribeSid = UUID.randomUUID().toString().substring(0, 16);
-        tvSubscribeSid.setText("订阅SID：" + currentSubscribeSid);
-        rbModeAll.setChecked(true);
-        etStepMeter.setText("10");
-    }
-
-    /**
-     * 外部绑定当前视图专属的接收服务Class
-     */
-    public void bindReceiverService(Class<?> serviceClazz){
-        this.mBindReceiverServiceClazz = serviceClazz;
-    }
-
-    private void initModeSwitch() {
-        rgSubscribeMode.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-				@Override
-				public void onCheckedChanged(RadioGroup group, int checkedId) {
-					etStepMeter.setVisibility(checkedId == R.id.rb_mode_step ? VISIBLE : GONE);
-				}
-			});
-    }
-
-    private void initSubscribeSwitch() {
-        switchSubscribe.setOnCheckedChangeListener(new android.widget.CompoundButton.OnCheckedChangeListener() {
-				@Override
-				public void onCheckedChanged(android.widget.CompoundButton buttonView, boolean isChecked) {
-					if (isChecked) {
-						startSubscribe();
-					} else {
-						stopSubscribe();
-					}
-				}
-			});
-    }
-
-    private void startSubscribe() {
-        int subMode = GpsSubscribeConst.SUB_TYPE_ALL;
-        float stepVal = 10f;
-
-        if (rbModeStep.isChecked()) {
-            subMode = GpsSubscribeConst.SUB_TYPE_STEP_DISTANCE;
-            try {
-                stepVal = Float.parseFloat(etStepMeter.getText().toString().trim());
-            } catch (Exception ignored) {}
-        }
-
-        GpsSubscribeMsg subscribeMsg = new GpsSubscribeMsg(
-			getContext().getPackageName(),
-			subMode,
-			stepVal,
-			GpsSubscribeConst.SUBSCRIBE_TYPE_LOCATION,
-			1000,
-			1f,
-			true,
-			currentSubscribeSid
-        );
-
-        mSubscribeManager.addSubscribe(subscribeMsg);
-        mLocationManager.putSubscribeConfig(currentSubscribeSid, subscribeMsg);
-        mLocationManager.clearPushCount(currentSubscribeSid);
-
-        //开启订阅自动启动专属接收服务（携带SID）
-        if(mBindReceiverServiceClazz != null){
-            Intent startServiceIntent = new Intent(getContext(), mBindReceiverServiceClazz);
-            startServiceIntent.putExtra(GpsSubscribeConst.EXTRA_SUBSCRIBE_SID, currentSubscribeSid);
-            getContext().startService(startServiceIntent);
-        }
-    }
-
-    private void stopSubscribe() {
-        mSubscribeManager.removeSubscribe(currentSubscribeSid);
-        mLocationManager.removeSubscribe(currentSubscribeSid);
-        tvSubscribeRecord.setText("状态：未订阅");
-
-        //关闭订阅 同步停止专属接收服务
-        if(mBindReceiverServiceClazz != null){
-            Intent stopServiceIntent = new Intent(getContext(), mBindReceiverServiceClazz);
-            getContext().stopService(stopServiceIntent);
-        }
-    }
-
-    private void startAutoRefreshRecord() {
-        mRefreshHandler.postDelayed(new Runnable() {
-				@Override
-				public void run() {
-					refreshRecordInfo();
-					mRefreshHandler.postDelayed(this, REFRESH_INTERVAL);
-				}
-			}, REFRESH_INTERVAL);
-    }
-
-    private void refreshRecordInfo() {
-        if (!switchSubscribe.isChecked()) {
-            tvSubscribeRecord.setText("状态：空闲未订阅");
-            return;
-        }
-
-        GpsSubscribeMsg config = mLocationManager.getSubscribeConfig(currentSubscribeSid);
-        LocationPoint lastPoint = mLocationManager.getLastPoint(currentSubscribeSid);
-
-        if (config == null) {
-            tvSubscribeRecord.setText("状态：已订阅｜等待管理器加载");
-            return;
-        }
-
-        String modeText = config.getSubscribeMode() == GpsSubscribeConst.SUB_TYPE_ALL
-			? "全量订阅" : "步长订阅";
-
-        int realPushCount = mLocationManager.getPushCount(currentSubscribeSid);
-
-        StringBuilder record = new StringBuilder();
-        record.append("【订阅实时数据表】\n");
-        record.append("订阅模式：").append(modeText).append("\n");
-        record.append("步长阈值：").append(config.getStepDistanceM()).append(" 米\n");
-
-        if(lastPoint != null){
-            record.append("基准定点：").append(lastPoint.getLatitude()).append(" , ").append(lastPoint.getLongitude()).append("\n");
-        }else{
-            record.append("基准定点：等待首次定位建立\n");
-        }
-
-        record.append("真实推送次数：").append(realPushCount).append(" 次");
-
-        tvSubscribeRecord.setText(record);
-    }
-
-    public String getCurrentSid() {
-        return currentSubscribeSid;
-    }
-
-    public boolean isSubscribeOpen() {
-        return switchSubscribe.isChecked();
-    }
-
-    /**
-     * 视图销毁：强制停止订阅 + 停止服务 + 清空刷新任务
-     */
-    @Override
-    protected void onDetachedFromWindow() {
-        if(switchSubscribe.isChecked()){
-            switchSubscribe.setChecked(false);
-        }
-        mRefreshHandler.removeCallbacksAndMessages(null);
-        super.onDetachedFromWindow();
-    }
-}
-

libgitsion/src/main/res/layout/view_gps_subscribe_control.xml

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="14dp"
-    android:layout_marginVertical="6dp"
-    android:background="#282828"
-    android:clipToPadding="false">
-
-    <!-- SID标识 -->
-    <TextView
-        android:id="@+id/tv_subscribe_sid"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="#999999"
-        android:textSize="11sp"/>
-
-    <!-- 订阅模式选择 -->
-    <RadioGroup
-        android:id="@+id/rg_subscribe_mode"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="8dp">
-
-        <RadioButton
-            android:id="@+id/rb_mode_all"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="全量订阅"
-            android:textColor="#FFFFFF"/>
-
-        <RadioButton
-            android:id="@+id/rb_mode_step"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="步长订阅"
-            android:layout_marginStart="18dp"
-            android:textColor="#FFFFFF"/>
-    </RadioGroup>
-
-    <!-- 步长输入 -->
-    <EditText
-        android:id="@+id/et_step_meter"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="移动阈值(米)"
-        android:inputType="numberDecimal"
-        android:text="10"
-        android:visibility="gone"
-        android:textColor="#ffffff"
-        android:textColorHint="#666666"
-        android:layout_marginTop="8dp"/>
-
-    <!-- 订阅开关 -->
-    <Switch
-        android:id="@+id/switch_subscribe"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="开启独立订阅"
-        android:textColor="#EEEEEE"
-        android:layout_marginTop="10dp"/>
-
-    <!-- 分割线 -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="#444444"
-        android:layout_marginTop="12dp"/>
-
-    <!-- 订阅数据记录表【ID完全对应源码 tv_subscribe_record】 -->
-    <TextView
-        android:id="@+id/tv_subscribe_record"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="#88EE88"
-        android:textSize="10sp"
-        android:layout_marginTop="10dp"
-        android:gravity="start"/>
-
-</LinearLayout>
-

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

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

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

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

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

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

libwinboll/build.gradle

@@ -45,11 +45,11 @@ dependencies {
 	
 	// WinBoLL库 nexus.winboll.cc 地址
     //api 'cc.winboll.studio:libappbase:15.20.22'
-    //api 'cc.winboll.studio:libaes:15.20.12'
+    //api 'cc.winboll.studio:libaes:15.20.11'
 	
 	// 备用库 jitpack.io 地址
 	api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.22'
-	api 'com.github.ZhanGSKen:libaes:aes-v15.20.12'
+	api 'com.github.ZhanGSKen:libaes:aes-v15.20.11'
 	
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

libwinboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Jun 02 20:00:52 HKT 2026
+#Tue Jun 02 03:18:21 HKT 2026
-stageCount=7
+stageCount=6
 libraryProject=libwinboll
 baseVersion=15.20
-publishVersion=15.20.6
+publishVersion=15.20.5
 buildCount=0
-baseBetaVersion=15.20.7
+baseBetaVersion=15.20.6

settings.gradle-demo

@@ -96,8 +96,3 @@
 // AutoNFC 项目编译设置
 //include ':autonfc'
 //rootProject.name = "autonfc"
-
-// Gitsion 项目编译设置
-//include ':gitsion'
-//include ':libgitsion'
-//rootProject.name = "gitsion"

winboll/build.gradle

@@ -103,17 +103,14 @@ dependencies {
 	implementation 'com.termux:terminal-emulator:0.118.0'
 	implementation 'com.termux:terminal-view:0.118.0'
 	implementation 'com.termux:termux-shared:0.118.0'
-
-	// Biometric (指纹识别)
-	implementation 'androidx.biometric:biometric:1.1.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
     //api 'cc.winboll.studio:libappbase:15.20.22'
-    //api 'cc.winboll.studio:libaes:15.20.12'
+    //api 'cc.winboll.studio:libaes:15.20.11'
 	
 	// 备用库 jitpack.io 地址
 	api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.22'
-	api 'com.github.ZhanGSKen:libaes:aes-v15.20.12'
+	api 'com.github.ZhanGSKen:libaes:aes-v15.20.11'
 	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }

winboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Jun 02 20:00:52 HKT 2026
+#Tue Jun 02 03:18:21 HKT 2026
-stageCount=7
+stageCount=6
 libraryProject=libwinboll
 baseVersion=15.20
-publishVersion=15.20.6
+publishVersion=15.20.5
 buildCount=0
-baseBetaVersion=15.20.7
+baseBetaVersion=15.20.6

winboll/src/main/AndroidManifest.xml

@@ -11,9 +11,6 @@
     <!-- 发送持久广播 -->
     <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
 
-    <!-- 创建桌面快捷方式（Android 8.0 以下兼容） -->
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
-
     <!-- 对正在运行的应用重新排序 -->
     <uses-permission android:name="android.permission.REORDER_TASKS"/>
 
@@ -333,20 +330,9 @@
 
         </activity>
 
-        <activity android:name="cc.winboll.studio.winboll.termux.MyTermuxActivity"
+        <activity android:name="cc.winboll.studio.winboll.applications.MyTermuxActivity"
             android:label="@string/my_termux_activity"
-            android:exported="true"
+            android:exported="true"/>
-            android:launchMode="singleTask">
-
-            <intent-filter>
-
-                <action android:name="cc.winboll.studio.winboll.action.EXECUTE_TERMUX_BUTTON"/>
-
-                <category android:name="android.intent.category.DEFAULT"/>
-
-            </intent-filter>
-
-        </activity>
 
     </application>
 

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

@@ -17,7 +17,7 @@ import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.winboll.R;
 import cc.winboll.studio.winboll.activities.AboutActivity;
 import cc.winboll.studio.winboll.activities.SettingsActivity;
-import cc.winboll.studio.winboll.termux.MyTermuxActivity;
+import cc.winboll.studio.winboll.applications.MyTermuxActivity;
 import cc.winboll.studio.winboll.fragments.BrowserFragment;
 import cc.winboll.studio.winboll.unittest.TermuxEnvTestActivity;
 import java.util.ArrayList;
@@ -150,12 +150,11 @@ public class MainActivity extends DrawerFragmentActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-		super.onCreateOptionsMenu(menu);
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
 		if (App.isDebugging()) {
 			getMenuInflater().inflate(R.menu.toolbar_test, menu);
 		}
-        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        return super.onCreateOptionsMenu(menu);
-		return true;
     }
 
     @Override

winboll/src/main/java/cc/winboll/studio/winboll/models/TermuxButtonModel.java

@@ -16,7 +16,6 @@ public class TermuxButtonModel extends BaseBean {
     String buttonName;
     String exeCommand;
     String workDir;
-    String iconPath;
 
     // 已修改：isCommit 改为规范过去式命名 isCommitted
     boolean isCommitted;
@@ -27,7 +26,6 @@ public class TermuxButtonModel extends BaseBean {
         this.buttonName = "";
         this.exeCommand = "";
         this.workDir = "";
-        this.iconPath = "";
         // 默认初始化
         this.isCommitted = false;
         this.commitTitle = "";
@@ -58,14 +56,6 @@ public class TermuxButtonModel extends BaseBean {
         return workDir;
     }
 
-    public void setIconPath(String iconPath) {
-        this.iconPath = iconPath;
-    }
-
-    public String getIconPath() {
-        return iconPath;
-    }
-
     // ========== 已修改 对应 isCommitted 完整 Get & Set ==========
     public boolean isCommitted() {
         return isCommitted;
@@ -102,7 +92,6 @@ public class TermuxButtonModel extends BaseBean {
         jsonWriter.name("buttonName").value(getButtonName());
         jsonWriter.name("exeCommand").value(getExeCommand());
         jsonWriter.name("workDir").value(getWorkDir());
-        jsonWriter.name("iconPath").value(getIconPath() != null ? getIconPath() : "");
 
         // JSON写入同步修改
         jsonWriter.name("isCommitted").value(isCommitted());
@@ -121,8 +110,6 @@ public class TermuxButtonModel extends BaseBean {
                 setExeCommand(jsonReader.nextString());
             } else if (name.equals("workDir")) {
                 setWorkDir(jsonReader.nextString());
-            } else if (name.equals("iconPath")) {
-                setIconPath(jsonReader.nextString());
             }
             // JSON解析字段同步修改
             else if (name.equals("isCommitted")) {

winboll/src/main/java/cc/winboll/studio/winboll/termux/MyTermuxActivity.java

@@ -1,554 +0,0 @@
-package cc.winboll.studio.winboll.termux;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ShortcutManager;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.graphics.Typeface;
-import android.graphics.drawable.Icon;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.StyleSpan;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.winboll.R;
-import cc.winboll.studio.winboll.models.TermuxButtonManager;
-import cc.winboll.studio.winboll.models.TermuxButtonModel;
-import cc.winboll.studio.winboll.termux.TermuxCommandExecutor;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-
-public class MyTermuxActivity extends AppCompatActivity {
-
-    public static final String TAG = "MyTermuxActivity";
-    public static final String EXTRA_BUTTON_NAME = "extra_button_name";
-    public static final String ACTION_EXECUTE_SHORTCUT =
-        "cc.winboll.studio.winboll.action.EXECUTE_TERMUX_BUTTON";
-
-    private Toolbar mToolbar;
-    private ListView mListView;
-    private Button mBtnAdd;
-    private ButtonAdapter mAdapter;
-    private ArrayList<TermuxButtonModel> mButtonList;
-
-    private static final int REQUEST_PICK_ICON = 100;
-    private String mDialogIconPath = "";
-    private ImageView mDialogIconView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_my_termux);
-
-        initToolbar();
-        initListView();
-        initAddButton();
-        refreshList();
-        handleShortcutIntent();
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        setIntent(intent);
-        handleShortcutIntent();
-    }
-
-    private void handleShortcutIntent() {
-        Intent intent = getIntent();
-        if (intent != null && ACTION_EXECUTE_SHORTCUT.equals(intent.getAction())) {
-            String buttonName = intent.getStringExtra(EXTRA_BUTTON_NAME);
-            if (buttonName != null && buttonName.length() > 0) {
-                TermuxButtonModel model = findButtonByName(buttonName);
-                if (model != null) {
-                    TermuxCommandExecutor.openTermuxBash(this,
-                        model.getButtonName(), model.getExeCommand(),
-                        model.getWorkDir(), true);
-                } else {
-                    Toast.makeText(this, R.string.toast_shortcut_not_found,
-                        Toast.LENGTH_SHORT).show();
-                }
-            }
-        }
-    }
-
-    private TermuxButtonModel findButtonByName(String name) {
-        for (int i = 0; i < mButtonList.size(); i++) {
-            if (name.equals(mButtonList.get(i).getButtonName())) {
-                return mButtonList.get(i);
-            }
-        }
-        return null;
-    }
-
-    private void initToolbar() {
-        mToolbar = findViewById(R.id.toolbar);
-        if (mToolbar != null) {
-            setSupportActionBar(mToolbar);
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    finish();
-                }
-            });
-        }
-    }
-
-    private void initListView() {
-        mListView = findViewById(R.id.list_termux_buttons);
-        mButtonList = new ArrayList<TermuxButtonModel>();
-        mAdapter = new ButtonAdapter();
-        mListView.setAdapter(mAdapter);
-
-        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                TermuxButtonModel model = mButtonList.get(position);
-                TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this,
-                    model.getButtonName(), model.getExeCommand(),
-                    model.getWorkDir(), true);
-            }
-        });
-
-        mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
-            @Override
-            public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-                showContextMenu(position);
-                return true;
-            }
-        });
-    }
-
-    private void initAddButton() {
-        mBtnAdd = findViewById(R.id.btn_add_termux_button);
-        mBtnAdd.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showButtonDialog(-1, null);
-            }
-        });
-    }
-
-    private void refreshList() {
-        mButtonList.clear();
-        ArrayList<TermuxButtonModel> loaded = TermuxButtonManager.loadButtons(this);
-        if (loaded != null) {
-            mButtonList.addAll(loaded);
-        }
-        mAdapter.notifyDataSetChanged();
-    }
-
-    private void showContextMenu(final int position) {
-        final TermuxButtonModel model = mButtonList.get(position);
-        final String[] items = new String[]{
-            getString(R.string.menu_execute),
-            getString(R.string.menu_edit),
-            getString(R.string.menu_delete),
-            getString(R.string.menu_create_shortcut),
-            getString(R.string.menu_cancel)
-        };
-        new AlertDialog.Builder(this)
-            .setTitle(model.getButtonName())
-            .setItems(items, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    if (which == 0) {
-                        TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this,
-                            model.getButtonName(), model.getExeCommand(),
-                            model.getWorkDir(), true);
-                    } else if (which == 1) {
-                        showButtonDialog(position, model);
-                    } else if (which == 2) {
-                        showDeleteConfirmDialog(position);
-                    } else if (which == 3) {
-                        createDesktopShortcut(model);
-                    }
-                }
-            })
-            .show();
-    }
-
-    private Bitmap loadButtonIcon(TermuxButtonModel model) {
-        String iconPath = model.getIconPath();
-        if (iconPath == null || iconPath.length() == 0) return null;
-        File iconFile = getIconFile(iconPath);
-        if (!iconFile.exists()) return null;
-        return BitmapFactory.decodeFile(iconFile.getAbsolutePath());
-    }
-
-    private void createDesktopShortcut(TermuxButtonModel model) {
-        Intent shortcutIntent = new Intent(this, MyTermuxActivity.class);
-        shortcutIntent.setAction(ACTION_EXECUTE_SHORTCUT);
-        shortcutIntent.putExtra(EXTRA_BUTTON_NAME, model.getButtonName());
-        shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-            | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            try {
-                ShortcutManager manager = getSystemService(ShortcutManager.class);
-                if (manager == null || !manager.isRequestPinShortcutSupported()) {
-                    Toast.makeText(this, R.string.toast_shortcut_not_supported,
-                        Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                Icon icon;
-                Bitmap bmp = loadButtonIcon(model);
-                if (bmp != null) {
-                    icon = Icon.createWithBitmap(bmp);
-                } else {
-                    icon = Icon.createWithResource(this,
-                        android.R.drawable.ic_menu_manage);
-                }
-                String shortcutId = "termux_" + model.getButtonName();
-                android.content.pm.ShortcutInfo info =
-                    new android.content.pm.ShortcutInfo.Builder(this, shortcutId)
-                    .setShortLabel(model.getButtonName())
-                    .setLongLabel(model.getButtonName())
-                    .setIcon(icon)
-                    .setIntent(shortcutIntent)
-                    .build();
-                manager.requestPinShortcut(info, null);
-            } catch (Exception e) {
-                LogUtils.e(TAG, "createDesktopShortcut error: " + e.getMessage());
-                Toast.makeText(this, R.string.toast_shortcut_failed,
-                    Toast.LENGTH_SHORT).show();
-            }
-        } else {
-            try {
-                Intent installIntent =
-                    new Intent("com.android.launcher.action.INSTALL_SHORTCUT");
-                installIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
-                installIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME,
-                    model.getButtonName());
-                Bitmap bmp = loadButtonIcon(model);
-                if (bmp != null) {
-                    installIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON, bmp);
-                } else {
-                    installIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
-                        Intent.ShortcutIconResource.fromContext(this,
-                            android.R.drawable.ic_menu_manage));
-                }
-                installIntent.putExtra("duplicate", false);
-                sendBroadcast(installIntent);
-            } catch (Exception e) {
-                LogUtils.e(TAG, "createDesktopShortcut error: " + e.getMessage());
-                Toast.makeText(this, R.string.toast_shortcut_failed,
-                    Toast.LENGTH_SHORT).show();
-            }
-        }
-    }
-
-    private void showDeleteConfirmDialog(final int position) {
-        new AlertDialog.Builder(this)
-            .setTitle(getString(R.string.dialog_delete_title))
-            .setMessage(getString(R.string.dialog_delete_message) + mButtonList.get(position).getButtonName())
-            .setPositiveButton(getString(R.string.dialog_confirm), new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    TermuxButtonManager.deleteButton(MyTermuxActivity.this, mButtonList, position);
-                    refreshList();
-                    Toast.makeText(MyTermuxActivity.this, R.string.toast_deleted, Toast.LENGTH_SHORT).show();
-                }
-            })
-            .setNegativeButton(getString(R.string.dialog_cancel), null)
-            .show();
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == REQUEST_PICK_ICON && resultCode == RESULT_OK
-            && data != null && data.getData() != null) {
-            Uri uri = data.getData();
-            String fileName = copyIconToAppStorage(uri);
-            if (fileName != null) {
-                mDialogIconPath = fileName;
-                File iconFile = getIconFile(fileName);
-                if (iconFile.exists() && mDialogIconView != null) {
-                    Bitmap bitmap = BitmapFactory.decodeFile(
-                        iconFile.getAbsolutePath());
-                    if (bitmap != null) {
-                        mDialogIconView.setImageBitmap(bitmap);
-                    }
-                }
-            } else {
-                Toast.makeText(this, R.string.toast_icon_copy_failed,
-                    Toast.LENGTH_SHORT).show();
-            }
-        }
-    }
-
-    private String copyIconToAppStorage(Uri uri) {
-        try {
-            File iconDir = new File(getFilesDir(), "termux_icons");
-            if (!iconDir.exists()) {
-                iconDir.mkdirs();
-            }
-            String fileName = System.currentTimeMillis() + ".png";
-            File destFile = new File(iconDir, fileName);
-            InputStream in = null;
-            FileOutputStream out = null;
-            try {
-                in = getContentResolver().openInputStream(uri);
-                out = new FileOutputStream(destFile);
-                byte[] buffer = new byte[8192];
-                int count;
-                while ((count = in.read(buffer)) > 0) {
-                    out.write(buffer, 0, count);
-                }
-            } finally {
-                if (in != null) {
-                    try { in.close(); } catch (Exception ignored) {}
-                }
-                if (out != null) {
-                    try { out.close(); } catch (Exception ignored) {}
-                }
-            }
-            return fileName;
-        } catch (Exception e) {
-            LogUtils.e(TAG, "copyIconToAppStorage error: " + e.getMessage());
-            return null;
-        }
-    }
-
-    private File getIconFile(String iconPath) {
-        return new File(getFilesDir(), "termux_icons/" + iconPath);
-    }
-
-    private void showButtonDialog(final int index, final TermuxButtonModel model) {
-        final boolean isEdit = (model != null);
-        mDialogIconPath = (model != null && model.getIconPath() != null)
-            ? model.getIconPath() : "";
-
-        LinearLayout layout = new LinearLayout(this);
-        layout.setOrientation(LinearLayout.VERTICAL);
-        layout.setPadding(40, 20, 40, 20);
-
-        final EditText etName = new EditText(this);
-        etName.setHint(R.string.hint_button_name);
-        if (model != null) {
-            etName.setText(model.getButtonName());
-        }
-        layout.addView(etName);
-
-        final EditText etCommand = new EditText(this);
-        etCommand.setHint(R.string.hint_exe_command);
-        if (model != null) {
-            etCommand.setText(model.getExeCommand());
-        }
-        layout.addView(etCommand);
-
-        final EditText etWorkDir = new EditText(this);
-        etWorkDir.setHint(R.string.hint_work_dir);
-        if (model != null) {
-            etWorkDir.setText(model.getWorkDir());
-        }
-        layout.addView(etWorkDir);
-
-        // Icon section
-        final TextView tvIconLabel = new TextView(this);
-        tvIconLabel.setText(R.string.label_icon);
-        tvIconLabel.setTextSize(14);
-        tvIconLabel.setTextColor(Color.GRAY);
-        layout.addView(tvIconLabel);
-
-        LinearLayout iconRow = new LinearLayout(this);
-        iconRow.setOrientation(LinearLayout.HORIZONTAL);
-
-        final ImageView ivIcon = new ImageView(this);
-        LinearLayout.LayoutParams iconLp = new LinearLayout.LayoutParams(100, 100);
-        iconLp.setMargins(0, 8, 16, 8);
-        ivIcon.setLayoutParams(iconLp);
-        ivIcon.setScaleType(ImageView.ScaleType.FIT_CENTER);
-        if (mDialogIconPath.length() > 0) {
-            File iconFile = getIconFile(mDialogIconPath);
-            if (iconFile.exists()) {
-                ivIcon.setImageBitmap(BitmapFactory.decodeFile(
-                    iconFile.getAbsolutePath()));
-            }
-        }
-        iconRow.addView(ivIcon);
-        mDialogIconView = ivIcon;
-
-        LinearLayout iconBtnLayout = new LinearLayout(this);
-        iconBtnLayout.setOrientation(LinearLayout.VERTICAL);
-
-        Button btnSelectIcon = new Button(this);
-        btnSelectIcon.setText(R.string.btn_select_icon);
-        btnSelectIcon.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-                intent.setType("image/*");
-                startActivityForResult(intent, REQUEST_PICK_ICON);
-            }
-        });
-        iconBtnLayout.addView(btnSelectIcon);
-
-        Button btnClearIcon = new Button(this);
-        btnClearIcon.setText(R.string.btn_clear_icon);
-        btnClearIcon.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mDialogIconPath = "";
-                mDialogIconView.setImageDrawable(null);
-            }
-        });
-        iconBtnLayout.addView(btnClearIcon);
-
-        iconRow.addView(iconBtnLayout);
-        layout.addView(iconRow);
-
-        int titleResId = isEdit ? R.string.dialog_edit_title : R.string.dialog_add_title;
-        new AlertDialog.Builder(this)
-            .setTitle(titleResId)
-            .setView(layout)
-            .setPositiveButton(getString(R.string.dialog_save), new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    String name = etName.getText().toString().trim();
-                    String command = etCommand.getText().toString().trim();
-                    String workDir = etWorkDir.getText().toString().trim();
-                    if (name.isEmpty() || command.isEmpty()) {
-                        Toast.makeText(MyTermuxActivity.this, R.string.toast_fields_required, Toast.LENGTH_SHORT).show();
-                        return;
-                    }
-                    TermuxButtonModel newModel = new TermuxButtonModel();
-                    newModel.setButtonName(name);
-                    newModel.setExeCommand(command);
-                    newModel.setWorkDir(workDir);
-                    newModel.setIconPath(mDialogIconPath);
-                    if (isEdit) {
-                        TermuxButtonManager.updateButton(MyTermuxActivity.this, mButtonList, index, newModel);
-                    } else {
-                        TermuxButtonManager.addButton(MyTermuxActivity.this, mButtonList, newModel);
-                    }
-                    refreshList();
-                }
-            })
-            .setNegativeButton(getString(R.string.dialog_cancel), null)
-            .show();
-    }
-
-    private class ButtonAdapter extends BaseAdapter {
-        @Override
-        public int getCount() {
-            return mButtonList.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mButtonList.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            ImageView ivIcon;
-            TextView tv;
-
-            if (convertView instanceof LinearLayout) {
-                LinearLayout ll = (LinearLayout) convertView;
-                ivIcon = (ImageView) ll.getChildAt(0);
-                tv = (TextView) ll.getChildAt(1);
-            } else {
-                LinearLayout ll = new LinearLayout(MyTermuxActivity.this);
-                ll.setOrientation(LinearLayout.HORIZONTAL);
-                ll.setGravity(Gravity.CENTER_VERTICAL);
-                ll.setPadding(30, 16, 30, 16);
-
-                ivIcon = new ImageView(MyTermuxActivity.this);
-                ivIcon.setScaleType(ImageView.ScaleType.FIT_CENTER);
-                ivIcon.setVisibility(View.GONE);
-                ll.addView(ivIcon);
-
-                tv = new TextView(MyTermuxActivity.this);
-                tv.setTextSize(16);
-                tv.setMinHeight(80);
-                tv.setGravity(Gravity.CENTER_VERTICAL);
-                tv.setPadding(16, 0, 0, 0);
-                ll.addView(tv);
-
-                convertView = ll;
-            }
-
-            TermuxButtonModel model = mButtonList.get(position);
-            String name = model.getButtonName();
-            String cmd = model.getExeCommand();
-            String fullText = name + "\n" + cmd;
-            SpannableString sp = new SpannableString(fullText);
-            sp.setSpan(new StyleSpan(Typeface.BOLD), 0, name.length(),
-                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            sp.setSpan(new ForegroundColorSpan(Color.BLUE), 0, name.length(),
-                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            tv.setText(sp);
-
-            String iconPath = model.getIconPath();
-            if (iconPath != null && iconPath.length() > 0) {
-                File iconFile = getIconFile(iconPath);
-                if (iconFile.exists()) {
-                    Bitmap bitmap = BitmapFactory.decodeFile(
-                        iconFile.getAbsolutePath());
-                    if (bitmap != null) {
-                        float density = getResources()
-                            .getDisplayMetrics().density;
-                        int marginPx = (int) (5 * density + 0.5f);
-                        int estHeight = tv.getMinHeight();
-                        int iconWidth = estHeight * bitmap.getWidth()
-                            / bitmap.getHeight();
-                        iconWidth = Math.max(iconWidth, (int)(32*density));
-                        iconWidth = Math.min(iconWidth, (int)(120*density));
-                        ivIcon.setImageBitmap(bitmap);
-                        ivIcon.setScaleType(
-                            ImageView.ScaleType.FIT_CENTER);
-                        LinearLayout.LayoutParams lp =
-                            new LinearLayout.LayoutParams(iconWidth,
-                                LinearLayout.LayoutParams.MATCH_PARENT);
-                        lp.setMargins(marginPx, marginPx,
-                            marginPx, marginPx);
-                        ivIcon.setLayoutParams(lp);
-                        ivIcon.setVisibility(View.VISIBLE);
-                    } else {
-                        ivIcon.setImageDrawable(null);
-                        ivIcon.setVisibility(View.GONE);
-                    }
-                } else {
-                    ivIcon.setImageDrawable(null);
-                    ivIcon.setVisibility(View.GONE);
-                }
-            } else {
-                ivIcon.setImageDrawable(null);
-                ivIcon.setVisibility(View.GONE);
-            }
-
-            return convertView;
-        }
-    }
-}

winboll/src/main/java/cc/winboll/studio/winboll/termux/TermuxCommandExecutor.java

@@ -1,27 +1,12 @@
 package cc.winboll.studio.winboll.termux;
 
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.graphics.Color;
-import android.graphics.Typeface;
 import android.os.Build;
-import android.text.SpannableString;
+import cc.winboll.studio.libappbase.LogUtils; // 替换 Log 为 LogUtils（与 Activity 一致）
-import android.text.Spanned;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.StyleSpan;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.biometric.BiometricPrompt;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.FragmentActivity;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.winboll.R;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.shell.command.ExecutionCommand.Runner;
-import java.util.concurrent.Executor;
 
 /**
  * Termux 命令调用工具类（基于 RunCommandService 原型封装）
@@ -92,12 +77,7 @@ public class TermuxCommandExecutor {
             LogUtils.d(TAG, "结果输出目录：" + resultDir);
         }
 
-        // 7. 强制创建新终端会话（而非复用已有会话），避免第二次点击直接弹出旧窗口
+        // 7. 允许替换参数中的逗号替代字符
-        if (!isBackground) {
-            intent.putExtra("com.termux.RUN_COMMAND_SESSION_ACTION", 0);
-        }
-
-        // 8. 允许替换参数中的逗号替代字符
         intent.putExtra(TermuxConstants.TERMUX_APP.RUN_COMMAND_SERVICE.EXTRA_REPLACE_COMMA_ALTERNATIVE_CHARS_IN_ARGUMENTS, true);
 
         // 8. 发送请求（区分 Android O 及以上的前台服务）
@@ -195,23 +175,11 @@ public class TermuxCommandExecutor {
         return tip;
     }
 
-    private static String pendingTargetCmd;
+	public static boolean openTermuxBash(Context context, String command) {
-    private static String pendingDisplayCmd;
+		return openTermuxBash(context, command, "~");
-    private static String pendingDisplayName;
+	}
 
-    public static boolean openTermuxBash(Context context, String command) {
+	public static boolean openTermuxBash(Context context, String command, String workDir) {
-        return openTermuxBash(context, null, command, "~", true);
-    }
-
-    public static boolean openTermuxBash(Context context, String command, String workDir) {
-        return openTermuxBash(context, null, command, workDir, true);
-    }
-
-    public static boolean openTermuxBash(Context context, String command, String workDir, boolean keepAlive) {
-        return openTermuxBash(context, null, command, workDir, keepAlive);
-    }
-
-    public static boolean openTermuxBash(Context context, String displayName, String command, String workDir, boolean keepAlive) {
         LogUtils.d(TAG, "openTermuxBash() 按钮点击，执行Gradle命令（实时输出）");
 
         // 1. 校验Termux是否安装
@@ -221,10 +189,10 @@ public class TermuxCommandExecutor {
         }
 
         // 2. 定义核心路径（确保路径与Termux中一致）
-        String projectPath = TERMUX_HOME_PATH;
+		String projectPath = TERMUX_HOME_PATH;
-        if (workDir.startsWith("~") || workDir.startsWith(".")) {
+		if (workDir.startsWith("~") || workDir.startsWith(".")) {
-            projectPath = TERMUX_HOME_PATH + "/" + workDir.substring(1);
+			projectPath = TERMUX_HOME_PATH + "/" + workDir.substring(1);
-        }
+		}
 
         // 3. 构造命令（核心：用stdbuf禁用缓冲，实现实时输出）
         String targetCmd = "";
@@ -234,121 +202,21 @@ public class TermuxCommandExecutor {
         targetCmd += "source ~/.bashrc && ";
         // 步骤3：显式配置PATH
         targetCmd += "export PATH=/data/data/com.termux/files/usr/bin:$PATH && ";
-        // 步骤4：将用户输入的字面\n转换为shell命令分隔符，
+        // 步骤4：用stdbuf禁用stdout/stderr缓冲（关键！），执行Gradle命令
-        //         确保"cd ~/Sources\npwd"这类输入能分段执行
+        // -o0：stdout无缓冲；-e0：stderr无缓冲；-i0：stdin无缓冲
-        String execCommand = command.replace("\\n", "; ");
+        //targetCmd += "stdbuf -o0 -e0 -i0 " + gradleFullPath + " task --all | grep assemble && ";
-        // 步骤5：执行设定的命令（直接由外层bash解释，避免stdbuf对shell内置命令无效）
+        //targetCmd += "stdbuf -o0 -e0 -i0 " + gradleFullPath + " -Pandroid.aapt2FromMavenOverride=/data/data/com.termux/files/home/android-sdk/build-tools/34.0.4/aapt2 assembleBetaDebug && ";
-        targetCmd += execCommand;
+        targetCmd += "stdbuf -o0 -e0 -i0 bash && ";
-        // 步骤6：需要保持终端可见时追加交互式bash
+        // 步骤5：执行成功提示
-        if (keepAlive) {
+        targetCmd += "echo '\n✅ 命令执行完成！' && echo '\n📌 当前目录：" + projectPath + "' && read -p '按回车键关闭终端...'";
-            targetCmd += "; stdbuf -o0 -e0 -i0 bash";
-        }
 
-        // 步骤7：指纹验证后执行命令
+
-        if (context instanceof FragmentActivity) {
+        // 4. 执行命令（终端会话模式，唤起Termux窗口）
-            pendingTargetCmd = targetCmd;
+        boolean cmdSuccess = TermuxCommandExecutor.executeTerminalCommand(context, targetCmd);
-            pendingDisplayCmd = execCommand;
+        if (!cmdSuccess) {
-            pendingDisplayName = displayName;
-            showFingerprintAndExecute((FragmentActivity) context);
             return true;
-        } else {
-            return TermuxCommandExecutor.executeTerminalCommand(context, targetCmd);
         }
-    }
+		return false;
-
-    private static void showFingerprintAndExecute(final FragmentActivity activity) {
-        String displayName = pendingDisplayName != null
-            ? pendingDisplayName : "";
-        final StringBuilder sb = new StringBuilder();
-        if (pendingDisplayCmd != null) {
-            sb.append(pendingDisplayCmd);
-        }
-        final String cmdText = sb.toString();
-
-        SpannableString message = new SpannableString(
-            activity.getString(R.string.biometric_description,
-                displayName, cmdText));
-        int nameIdx = message.toString().indexOf(displayName);
-        if (nameIdx >= 0 && displayName.length() > 0) {
-            message.setSpan(new StyleSpan(Typeface.BOLD), nameIdx,
-                nameIdx + displayName.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            message.setSpan(new ForegroundColorSpan(Color.BLUE), nameIdx,
-                nameIdx + displayName.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        }
-
-        final AlertDialog dialog = new AlertDialog.Builder(activity)
-            .setTitle(R.string.biometric_title)
-            .setMessage(message)
-            .setPositiveButton(R.string.biometric_start,
-                new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    startBiometricAuth(activity);
-                }
-            })
-            .setNegativeButton(R.string.dialog_cancel,
-                new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    clearPending();
-                }
-            })
-            .setCancelable(false)
-            .show();
-
-        TextView tv = (TextView) dialog.findViewById(android.R.id.message);
-        if (tv != null) {
-            tv.setText(message);
-        }
-    }
-
-    private static void startBiometricAuth(final FragmentActivity activity) {
-        Executor executor = ContextCompat.getMainExecutor(activity);
-        final BiometricPrompt biometricPrompt = new BiometricPrompt(activity,
-            executor, new BiometricPrompt.AuthenticationCallback() {
-            @Override
-            public void onAuthenticationSucceeded(
-                    BiometricPrompt.AuthenticationResult result) {
-                super.onAuthenticationSucceeded(result);
-                executePendingCommand(activity);
-            }
-
-            @Override
-            public void onAuthenticationError(int errorCode,
-                    CharSequence errString) {
-                super.onAuthenticationError(errorCode, errString);
-                clearPending();
-                Toast.makeText(activity, R.string.toast_auth_failed,
-                    Toast.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void onAuthenticationFailed() {
-                super.onAuthenticationFailed();
-            }
-        });
-
-        BiometricPrompt.PromptInfo promptInfo =
-            new BiometricPrompt.PromptInfo.Builder()
-            .setTitle(activity.getString(R.string.biometric_title))
-            .setNegativeButtonText(activity.getString(R.string.dialog_cancel))
-            .setConfirmationRequired(false)
-            .build();
-
-        biometricPrompt.authenticate(promptInfo);
-    }
-
-    private static void executePendingCommand(Context context) {
-        if (pendingTargetCmd != null) {
-            String cmd = pendingTargetCmd;
-            clearPending();
-            executeTerminalCommand(context, cmd);
-        }
-    }
-
-    private static void clearPending() {
-        pendingTargetCmd = null;
-        pendingDisplayCmd = null;
     }
 }
 

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

@@ -1,15 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="menu_create_shortcut">创建桌面快捷方式</string>
-    <string name="toast_shortcut_not_supported">系统不支持创建桌面快捷方式</string>
-    <string name="toast_shortcut_failed">创建桌面快捷方式失败</string>
-    <string name="toast_shortcut_not_found">未找到对应的按钮，请先打开MyTermuxActivity</string>
-    <string name="toast_auth_failed">指纹验证失败</string>
-    <string name="biometric_title">指纹验证</string>
-    <string name="biometric_description">名称：%1$s\n命令：%2$s</string>
-    <string name="biometric_start">开始指纹验证</string>
-    <string name="label_icon">图标</string>
-    <string name="btn_select_icon">选择图标</string>
-    <string name="btn_clear_icon">清除图标</string>
-    <string name="toast_icon_copy_failed">图标导入失败</string>
 </resources>