Merge branch 'projects-keeper' into winboll

更新输出提示，区分合并的项目类型
添加推送命令
2026-05-16 15:36:36 +08:00 · 2026-05-16 11:17:41 +08:00 · 2026-05-16 10:44:24 +08:00 · 2026-05-16 10:23:40 +08:00 · 2026-05-16 10:23:40 +08:00 · 2026-05-16 10:23:05 +08:00
188 changed files with 10719 additions and 364 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -100,10 +100,11 @@ lint-results.html
 /settings.gradle
 /gradle.properties

-## WinBoLL-Demo 项目配置
+## WinBoLL 项目配置
 #.git
 #.gitignore
 #.gitmodules
+#.gradle
 #.winboll
 #GenKeyStore
 #LICENSE
@@ -112,25 +113,31 @@ lint-results.html
 #README.md
 #aes
 #appbase
+appkey.jks
+appkey.keystore
 autonfc
 #build.gradle
 contacts
-#debugtemp
+debugtemp
 gallery
 gpsrelaysentinel
 #gradle
+gradle.properties
 #gradle.properties-android-demo
 #gradle.properties-androidx-demo
 #gradlew
 #libaes
 #libappbase
-#libdebugtemp
+libdebugtemp
 libgpsrelaysentinel
-libwinboll
+#libwinboll
+local.properties
 #local.properties-demo
 mymessagemanager
 positions
 powerbell
+settings.gradle
 #settings.gradle-demo
-winboll
+#winboll
+winboll.properties
 #winboll.properties-demo
--- a/.winboll/bashMergeProjects-to-Projects_Keeper.sh
+++ b/.winboll/bashMergeProjects-to-Projects_Keeper.sh
@@ -0,0 +1,192 @@
+#!/system/bin/sh
+## 合并其他项目分支的模块源码到projects-keeper分支。
+
+# ====================== 0. 进入目标目录 ======================
+TARGET_DIR="/sdcard/AppProjects/Projects_Keeper"
+
+echo "切换工作目录到：$TARGET_DIR"
+if ! cd "$TARGET_DIR"; then
+    echo "=============================================="
+    echo "错误：无法进入目标目录 $TARGET_DIR"
+    echo "=============================================="
+    exit 1
+fi
+
+# ====================== 1. 拉取远程最新源码(失败直接退出) ======================
+echo "=============================================="
+echo "正在拉取远程最新源码..."
+echo "=============================================="
+if ! git pull; then
+    echo "=============================================="
+    echo "错误：拉取远程源码失败！"
+    echo "请检查网络、仓库冲突或手动处理 git 状态后再执行脚本。"
+    echo "=============================================="
+    exit 1
+fi
+echo "✅ 源码已拉取为最新状态"
+echo ""
+
+# ====================== 2. 目录路径检查 ======================
+CUR_DIR=$(pwd)
+if [ "$CUR_DIR" != "$TARGET_DIR" ]; then
+    echo "错误：当前目录不是项目根目录！"
+    echo "请先进入目录：$TARGET_DIR"
+    exit 1
+fi
+
+# ====================== 3. Git 分支检查 ======================
+CUR_BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null)
+TARGET_BRANCH="projects-keeper"
+
+if [ "$CUR_BRANCH" != "$TARGET_BRANCH" ]; then
+    echo "错误：当前不在 $TARGET_BRANCH 分支！"
+    echo "当前分支：$CUR_BRANCH"
+    echo "请先执行：git checkout $TARGET_BRANCH"
+    exit 1
+fi
+
+# ====================== 4. 预设标准模块列表 ======================
+MERGE_OBJECTS_LIST=(
+.git
+.gitignore
+.gitmodules
+.winboll
+GenKeyStore
+LICENSE
+LICENSE-Private-Demo
+LICENSE-Private-Demo_docs
+README.md
+aes
+appbase
+autonfc
+build.gradle
+contacts
+debugtemp
+gallery
+gpsrelaysentinel
+gradle
+gradle.properties-android-demo
+gradle.properties-androidx-demo
+gradlew
+libaes
+libappbase
+libdebugtemp
+libgpsrelaysentinel
+libwinboll
+local.properties-demo
+mymessagemanager
+positions
+powerbell
+settings.gradle-demo
+winboll
+winboll.properties-demo
+)
+
+# ====================== 5. 获取当前目录真实文件列表 ======================
+REAL_ITEMS=()
+while IFS= read -r line; do
+    if [[ "$line" != "." && "$line" != ".." ]]; then
+        REAL_ITEMS+=("$line")
+    fi
+done < <(ls -a)
+
+# ====================== 6. 差异比对函数 ======================
+check_diff() {
+    local missing=()
+    local extra=()
+
+    for item in "${MERGE_OBJECTS_LIST[@]}"; do
+        local found=0
+        for r in "${REAL_ITEMS[@]}"; do
+            if [[ "$item" == "$r" ]]; then
+                found=1
+                break
+            fi
+        done
+        if (( found == 0 )); then
+            missing+=("$item")
+        fi
+    done
+
+    for r in "${REAL_ITEMS[@]}"; do
+        local found=0
+        for item in "${MERGE_OBJECTS_LIST[@]}"; do
+            if [[ "$item" == "$r" ]]; then
+                found=1
+                break
+            fi
+        done
+        if (( found == 0 )); then
+            extra+=("$r")
+        fi
+    done
+
+    if [[ ${#missing[@]} -gt 0 || ${#extra[@]} -gt 0 ]]; then
+        echo "=============================================="
+        echo "【错误】合并环境与脚本预设列表不匹配！"
+        echo "请手动核对并修改合并脚本。"
+        echo "=============================================="
+
+        if [[ ${#missing[@]} -gt 0 ]]; then
+            echo -e "\n👉 本地缺失项目："
+            for m in "${missing[@]}"; do echo "  $m"; done
+        fi
+
+        if [[ ${#extra[@]} -gt 0 ]]; then
+            echo -e "\n👉 本地多余项目："
+            for e in "${extra[@]}"; do echo "  $e"; done
+        fi
+
+        echo -e "\n=============================================="
+        exit 1
+    fi
+}
+
+# 执行差异校验
+check_diff
+
+# ====================== 全部校验通过，继续执行合并 ======================
+echo -e "#@@@ 开始合并模块源码 @@@#
+## 目标合并对象列表："
+
+for item in "${MERGE_OBJECTS_LIST[@]}"; do
+    echo "$item"
+done
+
+echo -e "## 对象列表结束
+"
+
+## 合并 APP 项目
+MERGE_APP_PROJECT_LIST=(
+DemoAPP
+)
+echo -e "#@@@ 开始合并应用型模块源码 @@@#
+## 目标合并对象列表："
+
+for item in "${MERGE_APP_PROJECT_LIST[@]}"; do
+    echo "正在合并 $item 项目 ..."
+    item_lower=$(echo "$item" | tr 'A-Z' 'a-z')
+git checkout origin/$item_lower $item_lower
+    git add .
+    git commit -m "合并 $item 项目"
+done
+
+## 合并 LIB 项目
+MERGE_LIB_PROJECT_LIST=(
+WinBoLL
+APPBase
+AES
+)
+echo -e "#@@@ 开始合并类库型模块源码 @@@#
+## 目标合并对象列表："
+
+for item in "${MERGE_LIB_PROJECT_LIST[@]}"; do
+    echo "正在合并 $item 项目 ..."
+    item_lower=$(echo "$item" | tr 'A-Z' 'a-z')
+git checkout origin/$item_lower $item_lower lib$item_lower
+    git add .
+    git commit -m "合并 $item 项目"
+done
+
+echo '正在推送 Projects_Keeper 项目'
+git push
--- a/BaseVersion.flag
+++ b/BaseVersion.flag
@@ -1 +0,0 @@
-15.20
--- a/28
+++ b/28
@@ -6,11 +6,11 @@

 ## 核心声明

-本文档**唯一核心设计目的**: 通过文件标识、分支隔离、操作规范、责任界定四重约束，**从根源规避私有开发分支代码被人为合并、推送、提交至公共开源主流分支的风险**，明确人为操作失误、违规合并的全部责任归属，同时保证私有分支可正常同步、拉取公共主流分支的上游更新。
+本文档**唯一核心设计目的**：通过文件标识、分支隔离、操作规范、责任界定四重约束，**从根源规避私有开发分支代码被人为合并、推送、提交至公共开源主流分支的风险**，明确人为操作失误、违规合并的全部责任归属，同时保证私有分支可正常同步、拉取公共主流分支的上游更新。

 ## 一、文件宗旨与风险防控说明

-本文件为 WinBoLL 项目公共开源分支转为私有独立分支开发的**强制标准化操作手册与责任界定文件**，核心风控目标: 
+本文件为 WinBoLL 项目公共开源分支转为私有独立分支开发的**强制标准化操作手册与责任界定文件**，核心风控目标：

 1. 严格隔离公共开源分支与私有开发分支，通过授权文件标记实现分支属性一眼可辨，杜绝人为操作混淆

@@ -24,7 +24,7 @@

 ### 1. 公共开源分支唯一标识

-**文件名: LICENSE**
+**文件名：LICENSE**

 - 仅允许存在于公共主流分支 `winboll` 及官方公共衍生分支

@@ -34,7 +34,7 @@

 ### 2. 私有开发分支唯一标识

-**文件名: LICENSE-Private**
+**文件名：LICENSE-Private**

 - 仅允许存在于私有开发分支，**绝对禁止出现在公共 ****`winboll`**** 分支**

@@ -44,15 +44,15 @@

 ## 三、分支管理与合并风控规则（强制遵守）

-1. **公共主流分支**: 固定为 `winboll`，为项目唯一开源主线，仅保留 `LICENSE` 文件，**禁止接收任何私有分支的合并、提交、推送请求**。
+1. **公共主流分支**：固定为 `winboll`，为项目唯一开源主线，仅保留 `LICENSE` 文件，**禁止接收任何私有分支的合并、提交、推送请求**。

-2. **私有开发分支**: 统一从 `winboll` 分支检出，命名固定格式为 `private-demo-*`，与公共分支物理隔离。
+2. **私有开发分支**：统一从 `winboll` 分支检出，命名固定格式为 `private-demo-*`，与公共分支物理隔离。

 3. **核心合并风控铁则**

-    - 私有分支 → 公共分支: **永久禁止任何形式的合并、推送、PR 提交、代码回合，人为操作也绝不允许**
+    - 私有分支 → 公共分支：**永久禁止任何形式的合并、推送、PR 提交、代码回合，人为操作也绝不允许**

-    - 公共分支 → 私有分支: 允许正常拉取、同步上游更新，不影响私有开发迭代
+    - 公共分支 → 私有分支：允许正常拉取、同步上游更新，不影响私有开发迭代

 4. 所有仓库提交者、合并操作者，均视为已阅读并完全认可本规则，**人为执行私有分支向公共分支的合并操作，由操作人承担全部代码泄露、合规违约、项目安全风险**。

@@ -68,7 +68,7 @@

 4. 将本规范文件 `LICENSE-Private-Demo` 复制并重命名为 `LICENSE-Private`，作为私有分支生效授权文件。

-5. 将以上所有变更执行一次性 Git 提交，**提交信息必须固定使用以下内容，不可修改**: 
+5. 将以上所有变更执行一次性 Git 提交，**提交信息必须固定使用以下内容，不可修改**：

    > 初始化私有开发分支，已切换私有授权文件，本分支禁止任何人为合并、推送至 winboll 公共分支
    > 
@@ -84,14 +84,14 @@

 3. 仓库管理员需严格校验合并请求的分支标识与授权文件，发现带有 `LICENSE-Private` 标记的分支申请合并至公共分支，一律直接拒绝，并记录操作人信息。

-4. 分支属性校验以根目录授权文件为唯一标准: 只要分支内存在 `LICENSE-Private` 文件，就绝对禁止向公共分支发起任何合并操作。
+4. 分支属性校验以根目录授权文件为唯一标准：只要分支内存在 `LICENSE-Private` 文件，就绝对禁止向公共分支发起任何合并操作。

 ## 六、分支状态校验与异常处理

- 合规公共分支: 仅存在 `LICENSE`，无 `LICENSE-Private`
+- 合规公共分支：仅存在 `LICENSE`，无 `LICENSE-Private`

- 合规私有分支: 仅存在 `LICENSE-Private`，无 `LICENSE`
+- 合规私有分支：仅存在 `LICENSE-Private`，无 `LICENSE`

- 异常状态: 两个文件同时存在 / 均不存在 → 立即停止开发与提交，按本规范重置分支状态，严禁执行任何合并操作
+- 异常状态：两个文件同时存在 / 均不存在 → 立即停止开发与提交，按本规范重置分支状态，严禁执行任何合并操作

-> （注: 文档部分内容可能由 AI 生成）
+> （注：文档部分内容可能由 AI 生成）
--- a/LICENSE-Private-Demo_docs/LICENSE-Private-Demo
+++ b/LICENSE-Private-Demo_docs/LICENSE-Private-Demo
@@ -6,11 +6,11 @@

 ## 核心声明

-本文档**唯一核心设计目的**: 通过文件标识、分支隔离、操作规范、责任界定四重约束，**从根源规避私有开发分支代码被人为合并、推送、提交至公共开源主流分支的风险**，明确人为操作失误、违规合并的全部责任归属，同时保证私有分支可正常同步、拉取公共主流分支的上游更新。
+本文档**唯一核心设计目的**：通过文件标识、分支隔离、操作规范、责任界定四重约束，**从根源规避私有开发分支代码被人为合并、推送、提交至公共开源主流分支的风险**，明确人为操作失误、违规合并的全部责任归属，同时保证私有分支可正常同步、拉取公共主流分支的上游更新。

 ## 一、文件宗旨与风险防控说明

-本文件为 WinBoLL 项目公共开源分支转为私有独立分支开发的**强制标准化操作手册与责任界定文件**，核心风控目标: 
+本文件为 WinBoLL 项目公共开源分支转为私有独立分支开发的**强制标准化操作手册与责任界定文件**，核心风控目标：

 1. 严格隔离公共开源分支与私有开发分支，通过授权文件标记实现分支属性一眼可辨，杜绝人为操作混淆

@@ -24,7 +24,7 @@

 ### 1. 公共开源分支唯一标识

-**文件名: LICENSE**
+**文件名：LICENSE**

 - 仅允许存在于公共主流分支 `winboll` 及官方公共衍生分支

@@ -34,7 +34,7 @@

 ### 2. 私有开发分支唯一标识

-**文件名: LICENSE-Private**
+**文件名：LICENSE-Private**

 - 仅允许存在于私有开发分支，**绝对禁止出现在公共 ****`winboll`**** 分支**

@@ -44,15 +44,15 @@

 ## 三、分支管理与合并风控规则（强制遵守）

-1. **公共主流分支**: 固定为 `winboll`，为项目唯一开源主线，仅保留 `LICENSE` 文件，**禁止接收任何私有分支的合并、提交、推送请求**。
+1. **公共主流分支**：固定为 `winboll`，为项目唯一开源主线，仅保留 `LICENSE` 文件，**禁止接收任何私有分支的合并、提交、推送请求**。

-2. **私有开发分支**: 统一从 `winboll` 分支检出，命名固定格式为 `private-demo-*`，与公共分支物理隔离。
+2. **私有开发分支**：统一从 `winboll` 分支检出，命名固定格式为 `private-demo-*`，与公共分支物理隔离。

 3. **核心合并风控铁则**

-    - 私有分支 → 公共分支: **永久禁止任何形式的合并、推送、PR 提交、代码回合，人为操作也绝不允许**
+    - 私有分支 → 公共分支：**永久禁止任何形式的合并、推送、PR 提交、代码回合，人为操作也绝不允许**

-    - 公共分支 → 私有分支: 允许正常拉取、同步上游更新，不影响私有开发迭代
+    - 公共分支 → 私有分支：允许正常拉取、同步上游更新，不影响私有开发迭代

 4. 所有仓库提交者、合并操作者，均视为已阅读并完全认可本规则，**人为执行私有分支向公共分支的合并操作，由操作人承担全部代码泄露、合规违约、项目安全风险**。

@@ -68,7 +68,7 @@

 4. 将本规范文件 `LICENSE-Private-Demo` 复制并重命名为 `LICENSE-Private`，作为私有分支生效授权文件。

-5. 将以上所有变更执行一次性 Git 提交，**提交信息必须固定使用以下内容，不可修改**: 
+5. 将以上所有变更执行一次性 Git 提交，**提交信息必须固定使用以下内容，不可修改**：

    > 初始化私有开发分支，已切换私有授权文件，本分支禁止任何人为合并、推送至 winboll 公共分支
    > 
@@ -84,14 +84,14 @@

 3. 仓库管理员需严格校验合并请求的分支标识与授权文件，发现带有 `LICENSE-Private` 标记的分支申请合并至公共分支，一律直接拒绝，并记录操作人信息。

-4. 分支属性校验以根目录授权文件为唯一标准: 只要分支内存在 `LICENSE-Private` 文件，就绝对禁止向公共分支发起任何合并操作。
+4. 分支属性校验以根目录授权文件为唯一标准：只要分支内存在 `LICENSE-Private` 文件，就绝对禁止向公共分支发起任何合并操作。

 ## 六、分支状态校验与异常处理

- 合规公共分支: 仅存在 `LICENSE`，无 `LICENSE-Private`
+- 合规公共分支：仅存在 `LICENSE`，无 `LICENSE-Private`

- 合规私有分支: 仅存在 `LICENSE-Private`，无 `LICENSE`
+- 合规私有分支：仅存在 `LICENSE-Private`，无 `LICENSE`

- 异常状态: 两个文件同时存在 / 均不存在 → 立即停止开发与提交，按本规范重置分支状态，严禁执行任何合并操作
+- 异常状态：两个文件同时存在 / 均不存在 → 立即停止开发与提交，按本规范重置分支状态，严禁执行任何合并操作

-> （注: 文档部分内容可能由 AI 生成）
+> （注：文档部分内容可能由 AI 生成）
--- a/README.md
+++ b/README.md
@@ -9,15 +9,15 @@ WinBoLL 手机源码计划，旨在通过核心项目 WinBoLL 构建手机端与
 #### **仓库类型：功能说明**
 ☆ 基础项目分支 WinBoLL：手机端安卓应用开发基础模板。
 ☆ 应用项目分支 APPBase、AES、PowerBell、Positions**：安卓应用单一管理系列项目。
-☆ 源码汇总管理 OriginMaster**：各类分支源码合并存档，不适宜作为开发库使用。
+☆ 源码汇总管理 Projects_Keeper**：各类分支源码合并存档，不适宜作为开发库使用。

 ### 3. 源码合并管理推送路线图
 ⚠️ **注意**：仅仅展示不同应用模块源码的综合管理路线。分支合并操作时，必须具备 Git 管理经验。

-★ WinBoLL → APPBase → OriginMaster
-★ WinBoLL → AES → OriginMaster
-★ WinBoLL → PowerBell → OriginMaster
-★ WinBoLL → Positions → OriginMaster
+★ WinBoLL → APPBase → Projects_Keeper
+★ WinBoLL → AES → Projects_Keeper
+★ WinBoLL → PowerBell → Projects_Keeper
+★ WinBoLL → Positions → Projects_Keeper

 ## 二、WinBoLL 项目核心信息

--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 09:17:15 HKT 2026
+#Sat May 16 03:50:01 CST 2026
 stageCount=10
 libraryProject=libappbase
 baseVersion=15.20
 publishVersion=15.20.9
-buildCount=0
+buildCount=6
 baseBetaVersion=15.20.10
--- a/debugtemp/build.gradle
+++ b/debugtemp/build.gradle
@@ -1,59 +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.debugtemp"
-	    minSdkVersion 26
-		// 适配MIUI12
-        targetSdkVersion 30
-        versionCode 1
-        // versionName 更新后需要手动设置 
-        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
-        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.20"
-        if(true) {
-            versionName = genVersionName("${versionName}")
-        }
-    }
-
-	// 确保 Java 7 兼容性（已适配项目技术栈）
-     compileOptions {
-         sourceCompatibility JavaVersion.VERSION_1_7
-         targetCompatibility JavaVersion.VERSION_1_7
-     }
-}
-
-dependencies {
-	api project(':libdebugtemp')
-	
-	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.20.3'
-    api 'cc.winboll.studio:libappbase:15.20.9'
-	
-	// WinBoLL备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:AES:aes-v15.20.3'
-	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.20.9'
-	
-	api fileTree(dir: 'libs', include: ['*.jar'])
-}
--- a/debugtemp/build.properties
+++ b/debugtemp/build.properties
@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Fri May 01 17:09:11 HKT 2026
-stageCount=0
-libraryProject=libdebugtemp
-baseVersion=15.20
-publishVersion=15.20.0
-buildCount=0
-baseBetaVersion=15.20.1
--- a/debugtemp/src/main/AndroidManifest.xml
+++ b/debugtemp/src/main/AndroidManifest.xml
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.debugtemp">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:label="@string/app_name"
-        android:theme="@style/MyAppTheme"
-        android:resizeableActivity="true"
-        android:name=".App">
-
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name">
-
-            <intent-filter>
-
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-
-            </intent-filter>
-
-        </activity>
-
-        <meta-data
-            android:name="android.max_aspect"
-            android:value="4.0"/>
-
-        <activity android:name=".GlobalApplication$CrashActivity"/>
-
-    </application>
-
-</manifest>
--- a/debugtemp/src/main/java/cc/winboll/studio/debugtemp/MainActivity.java
+++ b/debugtemp/src/main/java/cc/winboll/studio/debugtemp/MainActivity.java
@@ -1,38 +0,0 @@
-package cc.winboll.studio.debugtemp;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.LibraryActivity;
-import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.ToastUtils;
-
-public class MainActivity extends AppCompatActivity {
-
-	LogView mLogView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-		Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
-		setSupportActionBar(toolbar);
-
-        mLogView = findViewById(R.id.logview);
-
-        ToastUtils.show("onCreate");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-
-    public void onLibraryActivity(View view) {
-		startActivity(new Intent(this, LibraryActivity.class));
-    }
-}
--- a/debugtemp/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/debugtemp/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>
--- a/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
--- a/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
--- a/debugtemp/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/debugtemp/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/debugtemp/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/debugtemp/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/debugtemp/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/debugtemp/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/debugtemp/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/debugtemp/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/debugtemp/src/main/res/values/colors.xml
+++ b/debugtemp/src/main/res/values/colors.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#009688</color>
-    <color name="colorPrimaryDark">#00796B</color>
-    <color name="colorAccent">#FF9800</color>
-</resources>
--- a/debugtemp/src/main/res/values/strings.xml
+++ b/debugtemp/src/main/res/values/strings.xml
@@ -1,4 +0,0 @@
-<resources>
-    <string name="app_name">DebugTemp</string>
-    
-</resources>
--- a/debugtemp/src/main/res/values/styles.xml
+++ b/debugtemp/src/main/res/values/styles.xml
@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -25,14 +25,5 @@ android {
 }

 dependencies {
-	// 网络连接类库
-    api 'com.squareup.okhttp3:okhttp:4.4.1'
-	// Gson
-	api 'com.google.code.gson:gson:2.8.9'
-    // Html 解析
-    api 'org.jsoup:jsoup:1.13.1'
-	// 添加JSch依赖（SFTP核心，com.jcraft:jsch:0.1.54）
-	api 'com.jcraft:jsch:0.1.54'
-
    api fileTree(dir: 'libs', include: ['*.jar'])
 }
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 09:16:45 HKT 2026
+#Sat May 16 03:50:01 CST 2026
 stageCount=10
 libraryProject=libappbase
 baseVersion=15.20
 publishVersion=15.20.9
-buildCount=0
+buildCount=6
 baseBetaVersion=15.20.10
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -3,18 +3,6 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    package="cc.winboll.studio.libappbase">

-    <!-- 拥有完全的网络访问权限 -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-
-    <!-- 读取您共享存储空间中的内容 -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-
-    <!-- 修改或删除您共享存储空间中的内容 -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <!-- MANAGE_EXTERNAL_STORAGE -->
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
-
    <application
        android:requestLegacyExternalStorage="true"
        android:networkSecurityConfig="@xml/network_security_config">
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java
@@ -135,8 +135,8 @@ public class LogUtils {
            return;
        }

-        final long MAX_FILE_SIZE = 6291456L;
-        final long KEEP_FILE_SIZE = 3145728L;
+		final long KEEP_FILE_SIZE = 512000L; // 500K
+        final long MAX_FILE_SIZE = 2*KEEP_FILE_SIZE;
        final long fileSize = _mfLogCatchFile.length();

        if (fileSize <= MAX_FILE_SIZE) {
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java
@@ -12,13 +12,11 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.R;
 import cc.winboll.studio.libappbase.ToastUtils;
 import cc.winboll.studio.libappbase.dialogs.DebugHostDialog;
-import cc.winboll.studio.libappbase.dialogs.APPValidationDialog;
 import cc.winboll.studio.libappbase.models.APPInfo;

 /**
@@ -328,14 +326,7 @@ public class AboutView extends LinearLayout {
 					ToastUtils.show("已取消调试状态，重启应用可生效。");
 				}
 			});
-		// 正版校验弹窗
-        ibSigngetDialog.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					LogUtils.d(TAG, "ibSigngetDialog onClick：唤起应用正版校验弹窗");
-					new APPValidationDialog(mContext, mszAppName, mszAppVersionName).show();
-				}
-			});
+        
        // 调试地址配置弹窗
        ibWinBoLLHostDialog.setOnClickListener(new OnClickListener() {
 				@Override
--- a/libdebugtemp/build.gradle
+++ b/libdebugtemp/build.gradle
@@ -1,24 +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
-    }
-	
-    compileOptions {
-         sourceCompatibility JavaVersion.VERSION_1_7
-         targetCompatibility JavaVersion.VERSION_1_7
-     }
-}
-
-dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-}
--- a/libdebugtemp/build.properties
+++ b/libdebugtemp/build.properties
@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Fri May 01 17:09:11 HKT 2026
-stageCount=57
-libraryProject=libdebugtemp
-baseVersion=15.0
-publishVersion=15.0.56
-buildCount=0
-baseBetaVersion=15.0.57
--- a/libdebugtemp/src/main/java/cc/winboll/studio/LibraryActivity.java
+++ b/libdebugtemp/src/main/java/cc/winboll/studio/LibraryActivity.java
@@ -1,12 +0,0 @@
-package cc.winboll.studio;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class LibraryActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.library);
-    }
-}
--- a/libdebugtemp/.gitignore
+++ b/libdebugtemp/.gitignore
--- a/libwinboll/build.gradle
+++ b/libwinboll/build.gradle
@@ -0,0 +1,42 @@
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply from: '../.winboll/winboll_lib_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+android {
+	// 适配MIUI12
+	compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 26
+        targetSdkVersion 30
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+	// 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+	// Gson
+	api 'com.google.code.gson:gson:2.8.9'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+	// 添加JSch依赖（SFTP核心，com.jcraft:jsch:0.1.54）
+	api 'com.jcraft:jsch:0.1.54'
+	
+	// WinBoLL库 nexus.winboll.cc 地址
+	api 'cc.winboll.studio:libaes:15.20.3'
+    api 'cc.winboll.studio:libappbase:15.20.9'
+	
+    api fileTree(dir: 'libs', include: ['*.jar'])
+}
--- a/libwinboll/build.properties
+++ b/libwinboll/build.properties
@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Fri May 15 08:48:45 GMT 2026
+stageCount=2
+libraryProject=libwinboll
+baseVersion=15.20
+publishVersion=15.20.1
+buildCount=7
+baseBetaVersion=15.20.2
--- a/libdebugtemp/proguard-rules.pro
+++ b/libdebugtemp/proguard-rules.pro
--- a/libdebugtemp/src/main/AndroidManifest.xml
+++ b/libdebugtemp/src/main/AndroidManifest.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio" >
+    package="cc.winboll.studio.libwinboll" >

    <application>
        <activity
-            android:name=".LibraryActivity"
-            android:label="@string/lib_name" >
+            android:name=".WinBoLLLibraryActivity">
        </activity>
    </application>

--- a/libwinboll/src/main/java/cc/winboll/studio/libwinboll/WinBoLLLibraryActivity.java
+++ b/libwinboll/src/main/java/cc/winboll/studio/libwinboll/WinBoLLLibraryActivity.java
@@ -0,0 +1,17 @@
+package cc.winboll.studio.libwinboll;
+
+import android.app.Activity;
+import android.os.Bundle;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+public class WinBoLLLibraryActivity extends Activity 
+{
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_winbolllibrary);
+		
+		ToastUtils.show("WinBoLLLibraryActivity onCreate");
+    }
+}
--- a/libdebugtemp/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/libdebugtemp/src/main/res/drawable-hdpi/ic_launcher.png
--- a/libdebugtemp/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/libdebugtemp/src/main/res/drawable-mdpi/ic_launcher.png
--- a/libdebugtemp/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/libdebugtemp/src/main/res/drawable-xhdpi/ic_launcher.png
--- a/libdebugtemp/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/libdebugtemp/src/main/res/drawable-xxhdpi/ic_launcher.png
--- a/libwinboll/src/main/res/layout/activity_winbolllibrary.xml
+++ b/libwinboll/src/main/res/layout/activity_winbolllibrary.xml
@@ -4,8 +4,8 @@
    android:gravity="center">

    <TextView
-        android:text="@string/text_libraryactivity"
        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:text="cc.winboll.studio.libwinboll.WinBoLLLibraryActivity"/>

 </LinearLayout>
--- a/libdebugtemp/src/main/res/values-v21/styles.xml
+++ b/libdebugtemp/src/main/res/values-v21/styles.xml
--- a/libdebugtemp/src/main/res/values/strings.xml
+++ b/libdebugtemp/src/main/res/values/strings.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>

-    <string name="lib_name">libdebugtemp</string>
+    <string name="lib_name">libwinboll</string>
    <string name="hello_world">Hello world!</string>
-    <string name="text_libraryactivity">LibraryActivity</string>

 </resources>
--- a/libdebugtemp/src/main/res/values/styles.xml
+++ b/libdebugtemp/src/main/res/values/styles.xml
--- a/debugtemp/README.md
+++ b/debugtemp/README.md
@@ -1,7 +1,7 @@
 # WinBoLL

 #### 介绍
-WinBoLL 应用编译功能临时调试项目
+WinBoLL 网站浏览器。

 #### 软件架构
 适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
@@ -10,7 +10,7 @@ WinBoLL 应用编译功能临时调试项目

 #### Gradle 编译说明
 调试版编译命令 ：gradle assembleBetaDebug
-阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh debugtemp
+阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh winboll

 #### 使用说明
 3. Termux应用配置：
--- a/debugtemp/app_update_description.txt
+++ b/debugtemp/app_update_description.txt
--- a/winboll/build.gradle
+++ b/winboll/build.gradle
@@ -0,0 +1,108 @@
+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.winboll"
+        minSdkVersion 26
+		// 适配MIUI12
+        targetSdkVersion 30
+        versionCode 1
+        // versionName 更新后需要手动设置 
+        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
+        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
+        versionName "15.20"
+        if(true) {
+            versionName = genVersionName("${versionName}")
+        }
+    }
+
+	// 米盟 SDK
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
+    }
+	
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs'] // 若SO库放在libs目录下
+        }
+    }
+}
+
+dependencies {
+	api project(':libwinboll')
+    api 'com.google.code.gson:gson:2.10.1'
+	
+	// 下拉控件
+    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    
+    // 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'
+     // 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.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'
+	
+	api fileTree(dir: 'libs', include: ['*.jar'])
+}
--- a/winboll/build.properties
+++ b/winboll/build.properties
@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Fri May 15 08:48:45 GMT 2026
+stageCount=2
+libraryProject=libwinboll
+baseVersion=15.20
+publishVersion=15.20.1
+buildCount=7
+baseBetaVersion=15.20.2
--- a/winboll/libs/libWeWorkSpecSDK.so
+++ b/winboll/libs/libWeWorkSpecSDK.so
--- a/debugtemp/proguard-rules.pro
+++ b/debugtemp/proguard-rules.pro
--- a/debugtemp/src/stage/AndroidManifest.xml
+++ b/debugtemp/src/stage/AndroidManifest.xml
@@ -2,7 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools" >

-    <application>
+    <application
+        tools:replace="android:icon"
+        android:icon="@drawable/ic_launcher_beta">

        <!-- Put flavor specific code here -->

--- a/winboll/src/beta/java/cc/winboll/studio/winboll/activities/OllamaWindowActivity.java
+++ b/winboll/src/beta/java/cc/winboll/studio/winboll/activities/OllamaWindowActivity.java
@@ -0,0 +1,32 @@
+package cc.winboll.studio.winboll.activities;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import cc.winboll.studio.winboll.R;
+
+/**
+ * Ollama 模型对话窗口
+ */
+public class OllamaWindowActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_ollama_window);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setTitle("Ollama 窗口");
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_ollama_window, menu);
+        return true;
+    }
+}
--- a/winboll/src/beta/res/layout/activity_ollama_window.xml
+++ b/winboll/src/beta/res/layout/activity_ollama_window.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#1E1E1E"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#333333"
+            android:elevation="4dp"
+            android:theme="@style/ThemeOverlay.MaterialComponents.ActionBar" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="56dp"
+        android:layout_marginBottom="48dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Ollama 模型对话"
+                android:textColor="#FFFFFF"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="系统提示："
+                    android:textColor="#B0B0B0" />
+
+                <EditText
+                    android:id="@+id/etSystemPrompt"
+                    android:layout_width="match_parent"
+                    android:layout_height="100dp"
+                    android:background="#2D2D2D"
+                    android:hint="请输入系统提示"
+                    android:textColor="#FFFFFF"
+                    android:textColorHint="#666666"
+                    android:gravity="top|start"
+                    android:inputType="textMultiLine" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:text="模型名称："
+                    android:textColor="#B0B0B0" />
+
+                <EditText
+                    android:id="@+id/etModelName"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:background="#2D2D2D"
+                    android:hint="llama3"
+                    android:text="llama3"
+                    android:textColor="#FFFFFF"
+                    android:textColorHint="#666666"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="系统消息："
+                    android:textColor="#B0B0B0" />
+
+                <EditText
+                    android:id="@+id/etUserMessage"
+                    android:layout_width="match_parent"
+                    android:layout_height="120dp"
+                    android:background="#2D2D2D"
+                    android:ems="10"
+                    android:gravity="top|start"
+                    android:hint="输入你要发送的消息..."
+                    android:inputType="textMultiLine" />
+
+                <EditText
+                    android:id="@+id/etAssistantMessage"
+                    android:layout_width="match_parent"
+                    android:layout_height="120dp"
+                    android:background="#2D2D2D"
+                    android:gravity="top|start"
+                    android:hint="模型响应将显示在这里..."
+                    android:inputType="textMultiLine" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btnSend"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="3"
+                    android:text="发送"
+                    android:textColor="#FFFFFF" />
+
+                <Button
+                    android:id="@+id/btnStop"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_weight="1"
+                    android:text="停止"
+                    android:textColor="#FF5252" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</LinearLayout>
--- a/winboll/src/beta/res/menu/menu_ollama_window.xml
+++ b/winboll/src/beta/res/menu/menu_ollama_window.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_config"
+        android:title="配置"
+        android:orderInCategory="100"
+        app:showAsAction="always" />
+
+</menu>
--- a/winboll/src/beta/res/values-zh/strings.xml
+++ b/winboll/src/beta/res/values-zh/strings.xml
@@ -1,6 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <string name="app_name">DebugTemp☆</string>
-
 </resources>
--- a/winboll/src/beta/res/values/strings.xml
+++ b/winboll/src/beta/res/values/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">WinBoLL+</string>
+    <string name="app_name_cn1">筋斗云★</string>
+    <string name="app_name_cn2">金抖云☆</string>
+
+</resources>
--- a/winboll/src/beta/res/xml/shortcutsmaincn1.xml
+++ b/winboll/src/beta/res/xml/shortcutsmaincn1.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 切换启动入口的快捷菜单 -->
+	<shortcut
+        android:shortcutId="switchto_en1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_en1"
+        android:shortcutLongLabel="@string/switchto_en1"
+        android:shortcutDisabledMessage="@string/en1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_EN1"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_en1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<!--<shortcut
+	android:shortcutId="switchto_cn1"
+	android:enabled="true"
+	android:icon="@drawable/ic_launcher"
+	android:shortcutShortLabel="@string/switchto_cn1"
+	android:shortcutLongLabel="@string/switchto_cn1"
+	android:shortcutDisabledMessage="@string/cn1_switch_disabled">
+	<intent
+	android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN1"
+	android:targetPackage="cc.winboll.studio.winboll.beta"
+	android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+	android:data="switchto_cn1" />
+	<categories android:name="android.shortcut.conversation" />
+    </shortcut>-->
+	<shortcut
+        android:shortcutId="switchto_cn2"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn2"
+        android:shortcutLongLabel="@string/switchto_cn2"
+        android:shortcutDisabledMessage="@string/cn2_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN2"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_cn2" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>
--- a/winboll/src/beta/res/xml/shortcutsmaincn2.xml
+++ b/winboll/src/beta/res/xml/shortcutsmaincn2.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 切换启动入口的快捷菜单 -->
+	<shortcut
+        android:shortcutId="switchto_en1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_en1"
+        android:shortcutLongLabel="@string/switchto_en1"
+        android:shortcutDisabledMessage="@string/en1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_EN1"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_en1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<shortcut
+        android:shortcutId="switchto_cn1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn1"
+        android:shortcutLongLabel="@string/switchto_cn1"
+        android:shortcutDisabledMessage="@string/cn1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN1"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_cn1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<!--<shortcut
+	android:shortcutId="switchto_cn2"
+	android:enabled="true"
+	android:icon="@drawable/ic_launcher"
+	android:shortcutShortLabel="@string/switchto_cn2"
+	android:shortcutLongLabel="@string/switchto_cn2"
+	android:shortcutDisabledMessage="@string/cn2_switch_disabled">
+	<intent
+	android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN2"
+	android:targetPackage="cc.winboll.studio.winboll.beta"
+	android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+	android:data="switchto_cn2" />
+	<categories android:name="android.shortcut.conversation" />
+    </shortcut>-->
+</shortcuts>
--- a/winboll/src/beta/res/xml/shortcutsmainen1.xml
+++ b/winboll/src/beta/res/xml/shortcutsmainen1.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 切换启动入口的快捷菜单 -->
+	<!--<shortcut
+	android:shortcutId="switchto_en1"
+	android:enabled="true"
+	android:icon="@drawable/ic_launcher"
+	android:shortcutShortLabel="@string/switchto_en1"
+	android:shortcutLongLabel="@string/switchto_en1"
+	android:shortcutDisabledMessage="@string/en1_switch_disabled">
+	<intent
+	android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_EN1"
+	android:targetPackage="cc.winboll.studio.winboll.beta"
+	android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+	android:data="switchto_en1" />
+	<categories android:name="android.shortcut.conversation" />
+    </shortcut>-->
+	<shortcut
+        android:shortcutId="switchto_cn1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn1"
+        android:shortcutLongLabel="@string/switchto_cn1"
+        android:shortcutDisabledMessage="@string/cn1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN1"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_cn1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<shortcut
+        android:shortcutId="switchto_cn2"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn2"
+        android:shortcutLongLabel="@string/switchto_cn2"
+        android:shortcutDisabledMessage="@string/cn2_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN2"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_cn2" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>
--- a/winboll/src/main/AndroidManifest.xml
+++ b/winboll/src/main/AndroidManifest.xml
@@ -0,0 +1,339 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="cc.winboll.studio.winboll"
+    android:sharedUserId="com.termux">
+
+    <!-- 拥有完全的网络访问权限 -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <!-- 发送持久广播 -->
+    <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
+
+    <!-- 对正在运行的应用重新排序 -->
+    <uses-permission android:name="android.permission.REORDER_TASKS"/>
+
+    <!-- 计算应用存储空间 -->
+    <uses-permission
+        android:name="android.permission.GET_PACKAGE_SIZE"/>
+
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission"/>
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:roundIcon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/MyAppTheme"
+        android:resizeableActivity="true"
+        android:name=".App"
+        android:usesCleartextTraffic="true"
+        android:networkSecurityConfig="@xml/network_security_config">
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:exported="true"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data android:scheme="http"/>
+                <data android:scheme="https"/>
+            </intent-filter>
+
+        </activity>
+
+        <activity android:name=".activities.ShortcutActionActivity"/>
+
+        <activity-alias
+            android:name=".MainActivityEN1"
+            android:targetActivity=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:icon="@drawable/ic_launcher"
+            android:enabled="true">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcutsmainen1"/>
+
+        </activity-alias>
+
+        <activity-alias
+            android:name=".MainActivityCN1"
+            android:targetActivity=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name_cn1"
+            android:icon="@drawable/ic_winboll_jindouyun1"
+            android:enabled="false">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcutsmaincn1"/>
+
+        </activity-alias>
+
+        <activity-alias
+            android:name=".MainActivityCN2"
+            android:targetActivity=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name_cn2"
+            android:icon="@drawable/ic_winboll_jindouyun2"
+            android:enabled="false">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcutsmaincn2"/>
+
+        </activity-alias>
+
+        <activity
+            android:name=".activities.WinBoLLUnitTestActivity"
+            android:label="@string/app_name"
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
+
+            <intent-filter>
+
+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <activity
+            android:name=".activities.NewActivity"
+            android:label="NewActivity"
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
+
+        <activity
+            android:name=".activities.New2Activity"
+            android:label="New2Activity"
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
+
+        <service
+            android:name=".MyTileService"
+            android:exported="true"
+            android:label="@string/tileservice_name"
+            android:icon="@drawable/ic_launcher"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+
+            <intent-filter>
+
+                <action android:name="android.service.quicksettings.action.QS_TILE"/>
+
+            </intent-filter>
+
+        </service>
+
+        <service
+            android:name=".services.MainService"
+            android:exported="true"/>
+
+        <service
+            android:name="cc.winboll.studio.appbase.services.TestDemoBindService"
+            android:exported="true"/>
+
+        <service
+            android:name="cc.winboll.studio.appbase.services.TestDemoService"
+            android:exported="true"/>
+
+        <service android:name=".services.AssistantService"/>
+
+        <receiver
+            android:name="cc.winboll.studio.appbase.receivers.MainReceiver"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.appbase.receivers.MainReceiver"/>
+
+            </intent-filter>
+
+        </receiver>
+
+        <receiver
+            android:name=".widgets.APPNewsWidget"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.appbase.widgets.APPNewsWidget.ACTION_WAKEUP_SERVICE"/>
+
+                <action android:name="cc.winboll.studio.appbase.widgets.APPNewsWidget.ACTION_RELOAD_REPORT"/>
+
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_provider_info_sos"/>
+
+        </receiver>
+
+        <receiver
+            android:name=".receivers.APPNewsWidgetClickListener"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.appbase.receivers.APPNewsWidgetClickListener.ACTION_PRE"/>
+
+                <action android:name="cc.winboll.studio.appbase.receivers.APPNewsWidgetClickListener.ACTION_NEXT"/>
+
+            </intent-filter>
+
+        </receiver>
+
+        <service
+            android:name=".SimpleOperateSignalCenterService"
+            android:exported="true">
+
+        </service>
+
+        <service
+            android:name=".services.TestService"
+            android:exported="true"/>
+
+        <receiver
+            android:name=".receiver.MyBroadcastReceiver"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.libappbase.action.SOS"/>
+
+            </intent-filter>
+
+        </receiver>
+
+        <receiver
+            android:name=".widgets.StatusWidget"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+
+                <action android:name="cc.winboll.studio.libappbase.widgets.StatusWidget.ACTION_STATUS_UPDATE"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_provider_info_status"/>
+
+        </receiver>
+
+        <receiver
+            android:name=".widgets.StatusWidgetClickListener"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.libappbase.widgets.StatusWidgetClickListener.ACTION_IVAPP"/>
+
+            </intent-filter>
+
+        </receiver>
+
+        <service android:name="cc.winboll.studio.libappbase.sos.SOSCenter"/>
+
+        <receiver
+            android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"/>
+
+            </intent-filter>
+
+        </receiver>
+
+        <activity android:name="cc.winboll.studio.libappbase.activities.YunActivity"/>
+
+        <activity android:name="cc.winboll.studio.libappbase.activities.LogonActivity"/>
+
+        <activity android:name="cc.winboll.studio.winboll.activities.AboutActivity"/>
+
+        <activity android:name="cc.winboll.studio.winboll.activities.SettingsActivity"/>
+
+        <activity android:name="cc.winboll.studio.winboll.unittest.TestWeWorkSpecSDK"/>
+
+        <activity android:name="cc.winboll.studio.winboll.activities.WXPayActivity"/>
+
+        <activity android:name="cc.winboll.studio.winboll.activities.PatternLockActivity"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.winboll.activities.PatternLockActivity.ACTION_OPEN_PATTERN"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <activity android:name="cc.winboll.studio.winboll.unittest.TermuxEnvTestActivity"/>
+
+        <activity
+            android:name=".termux.NfcTermuxBridgeActivity"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.winboll.termux.NfcTermuxBridgeActivity.ACTION_BUILD"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <activity android:name="cc.winboll.studio.winboll.applications.MyTermuxActivity"
+            android:label="@string/my_termux_activity"
+            android:exported="true"/>
+
+    </application>
+
+</manifest>
--- a/debugtemp/src/main/java/cc/winboll/studio/debugtemp/App.java
+++ b/debugtemp/src/main/java/cc/winboll/studio/debugtemp/App.java
@@ -1,4 +1,4 @@
-package cc.winboll.studio.debugtemp;
+package cc.winboll.studio.winboll;

 import android.app.Activity;
 import android.content.ClipData;
@@ -40,22 +40,48 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;

 public class App extends GlobalApplication {
-
+	
+	public static final String TAG = "App";
+	
+	public static final String COMPONENT_EN1 = "cc.winboll.studio.winboll.MainActivityEN1";
+	public static final String COMPONENT_CN1 = "cc.winboll.studio.winboll.MainActivityCN1";
+	public static final String COMPONENT_CN2 = "cc.winboll.studio.winboll.MainActivityCN2";
+	public static final String ACTION_SWITCHTO_EN1 = "cc.winboll.studio.winboll.App.ACTION_SWITCHTO_EN1";
+	public static final String ACTION_SWITCHTO_CN1 = "cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN1";
+	public static final String ACTION_SWITCHTO_CN2 = "cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN2";
+	
    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
-
+	
    @Override
    public void onCreate() {
        super.onCreate();
+		setIsDebugging(BuildConfig.DEBUG);
+		//setIsDebugging(false);
+		
+		WinBoLLActivityManager.init(this);
        
        // 初始化 Toast 框架
        ToastUtils.init(this);
-		
+        // 设置 Toast 布局样式
+        //ToastUtils.setView(R.layout.view_toast);
+        //ToastUtils.setStyle(new WhiteToastStyle());
+        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+        
        //CrashHandler.getInstance().registerGlobal(this);
        //CrashHandler.getInstance().registerPart(this);
    }

+	@Override
+	public void onTerminate() {
+		super.onTerminate();
+		ToastUtils.release();
+	}
+	
+	
+
    public static void write(InputStream input, OutputStream output) throws IOException {
        byte[] buf = new byte[1024 * 8];
        int len;
--- a/winboll/src/main/java/cc/winboll/studio/winboll/AssistantService.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/AssistantService.java
@@ -0,0 +1,97 @@
+package cc.winboll.studio.winboll;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/03/28 19:12:12
+ * @Describe 应用主要服务组件类守护进程服务组件类
+ */
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import cc.winboll.studio.libaes.models.WinBoLLClientServiceBean;
+import cc.winboll.studio.winboll.WinBoLLClientService;
+import cc.winboll.studio.winboll.utils.ServiceUtils;
+
+public class AssistantService extends Service {
+
+    public final static String TAG = "AssistantService";
+
+    WinBoLLClientServiceBean mWinBoLLServiceBean;
+    MyServiceConnection mMyServiceConnection;
+    volatile boolean mIsServiceRunning;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
+        if (mMyServiceConnection == null) {
+            mMyServiceConnection = new MyServiceConnection();
+        }
+        // 设置运行参数
+        mIsServiceRunning = false;
+        run();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        run();
+        return START_STICKY;
+    }
+
+    @Override
+    public void onDestroy() {
+        mIsServiceRunning = false;
+        super.onDestroy();
+    }
+
+    //
+    // 运行服务内容
+    //
+    void run() {
+        mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
+        if (mWinBoLLServiceBean.isEnable()) {
+            if (mIsServiceRunning == false) {
+                // 设置运行状态
+                mIsServiceRunning = true;
+                // 唤醒和绑定主进程
+                wakeupAndBindMain();
+            }
+        }
+    }
+
+    //
+    // 唤醒和绑定主进程
+    //
+    void wakeupAndBindMain() {
+        if (ServiceUtils.isServiceAlive(getApplicationContext(), WinBoLLClientService.class.getName()) == false) {
+            startForegroundService(new Intent(AssistantService.this, WinBoLLClientService.class));
+        }
+
+        bindService(new Intent(AssistantService.this, WinBoLLClientService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
+    }
+
+    //
+    // 主进程与守护进程连接时需要用到此类
+    //
+    class MyServiceConnection implements ServiceConnection {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(AssistantService.this);
+            if (mWinBoLLServiceBean.isEnable()) {
+                wakeupAndBindMain();
+            }
+        }
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/EWUIStatusIconDrawable.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/EWUIStatusIconDrawable.java
@@ -0,0 +1,35 @@
+package cc.winboll.studio.winboll;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/03/28 19:11:27
+ * @Describe WinBoLL UI 状态图标枚举
+ */
+import cc.winboll.studio.libaes.R;
+
+public enum EWUIStatusIconDrawable {
+    NORMAL(0),
+    NEWS(1)
+    ;
+
+    static final String TAG = "WUIStatusIconDrawable";
+
+    static String[] _mlistCNName = { "正常", "新的消息" };
+
+    private int value = 0;
+    private EWUIStatusIconDrawable(int value) {    //必须是private的，否则编译错误
+        this.value = value;
+    }
+
+    public static int getIconDrawableId(EWUIStatusIconDrawable drawableId) {
+        int res;
+        switch(drawableId){
+            case NEWS :
+                res = R.drawable.ic_winbollbeta;
+                break;
+            default :
+                res = R.drawable.ic_winboll;
+        }
+        return res;
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java
@@ -0,0 +1,221 @@
+package cc.winboll.studio.winboll;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
+import cc.winboll.studio.libaes.models.DrawerMenuBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.winboll.R;
+import cc.winboll.studio.winboll.activities.AboutActivity;
+import cc.winboll.studio.winboll.activities.SettingsActivity;
+import cc.winboll.studio.winboll.applications.MyTermuxActivity;
+import cc.winboll.studio.winboll.fragments.BrowserFragment;
+import cc.winboll.studio.winboll.unittest.TermuxEnvTestActivity;
+import java.util.ArrayList;
+
+public class MainActivity extends DrawerFragmentActivity {
+
+
+    public static final String TAG = "MainActivity";
+
+    BrowserFragment mBrowserFragment;
+
+    // ------------------- 新增：Handler 消息定义（接收URL历史更新消息） -------------------
+    // 消息标识：URL加载历史更新（刷新抽屉菜单的历史列表）
+    public static final int MSG_URLLOADHISTORY_UPDATE = 1002;
+    // 自定义Handler（接收应用内消息，如BrowserFragment发送的历史更新消息）
+    private static Handler _mMainHandler;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(this));
+        super.onCreate(savedInstanceState);
+        initMainHandler();
+        if (mBrowserFragment == null) {
+            String externalUrl = extractExternalUrl(getIntent());
+            if (externalUrl != null) {
+                mBrowserFragment = BrowserFragment.newInstance(externalUrl);
+            } else {
+                mBrowserFragment = BrowserFragment.newInstance();
+            }
+            addFragment(mBrowserFragment);
+        }
+        showFragment(mBrowserFragment);
+    }
+
+//    @Override
+//    protected void onNewIntent(Intent intent) {
+//        super.onNewIntent(intent);
+//        String externalUrl = extractExternalUrl(intent);
+//        if (externalUrl != null && mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
+//            Message msg = Message.obtain();
+//            msg.what = BrowserFragment.MSG_OPEN_URL;
+//            msg.obj = externalUrl;
+//            mBrowserFragment.getBrowserHandler().sendMessage(msg);
+//        }
+//    }
+
+    private String extractExternalUrl(Intent intent) {
+        if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) {
+            Uri uri = intent.getData();
+            if (uri != null) {
+                return uri.toString();
+            }
+        }
+        return null;
+    }
+
+	public static void sendMessage(Message msg) {
+		_mMainHandler.sendMessage(msg);
+	}
+
+    /**
+     * 初始化Handler（接收MSG_URLLOADHISTORY_UPDATE消息，刷新抽屉历史菜单）
+     */
+    private void initMainHandler() {
+		// 清理旧数据
+		if (_mMainHandler != null) {
+            _mMainHandler.removeCallbacksAndMessages(null);
+            _mMainHandler = null;
+        }
+
+        // Java 7 匿名内部类实现Handler（主线程创建，安全更新UI/抽屉菜单）
+        _mMainHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+                switch (msg.what) {
+                    case MSG_URLLOADHISTORY_UPDATE:
+                        // 处理URL历史更新消息：刷新抽屉菜单的历史列表
+                        LogUtils.d(TAG, "收到URL历史更新消息，刷新抽屉菜单");
+                        refreshUrlHistoryDrawerMenu();
+                        break;
+                    default:
+                        break;
+                }
+            }
+        };
+    }
+
+    @Override
+    public void initDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
+        super.initDrawerMenuItemList(listDrawerMenu);
+        //LogUtils.d(TAG, "initDrawerMenuItemList");
+        // 加载URL历史菜单（初始化时加载）
+        refreshUrlHistoryDrawerMenu();
+        notifyDrawerMenuDataChanged();
+    }
+
+    @Override
+    public void reinitDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
+        super.reinitDrawerMenuItemList(listDrawerMenu);
+        //LogUtils.d(TAG, "reinitDrawerMenuItemList");
+        // 重新加载URL历史菜单（菜单重置时加载）
+        refreshUrlHistoryDrawerMenu();
+        notifyDrawerMenuDataChanged();
+    }
+
+	void loadUrlLoadHistotyMenu(ArrayList<DrawerMenuBean> listDrawerMenu) {
+		listDrawerMenu.clear();
+		if (BrowserFragment._mUrlLoadHistory != null) {
+			for (String url : BrowserFragment._mUrlLoadHistory) {
+				listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, url));
+			}
+		}
+	}
+
+    // ------------------- 新增：刷新URL历史抽屉菜单（提取独立方法，复用） -------------------
+    private void refreshUrlHistoryDrawerMenu() {
+        // 获取抽屉菜单列表，重新加载历史数据并刷新
+        ArrayList<DrawerMenuBean> drawerMenuList = super.malDrawerMenuItem; // 假设父类提供获取菜单列表的方法
+        if (drawerMenuList != null) {
+            loadUrlLoadHistotyMenu(drawerMenuList); // 重新加载更新后的历史数据
+            notifyDrawerMenuDataChanged(); // 通知抽屉菜单刷新UI
+        }
+    }
+
+    @Override
+    public DrawerFragmentActivity.ActivityType initActivityType() {
+        return DrawerFragmentActivity.ActivityType.Main;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+		if (App.isDebugging()) {
+			getMenuInflater().inflate(R.menu.toolbar_test, menu);
+		}
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        super.onItemClick(parent, view, position, id);
+		if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
+			Message msg = Message.obtain();
+			msg.what = BrowserFragment.MSG_HISTORY_POSITION;
+			msg.obj = position;
+			mBrowserFragment.getBrowserHandler().sendMessage(msg);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (AESThemeUtil.onWinBoLLThemeItemSelected(this, item)) {
+            recreate();
+        } else {
+            int nItemId = item.getItemId();
+            if (nItemId == R.id.item_home) {
+                if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
+                    Message msg = Message.obtain();
+                    msg.what = BrowserFragment.MSG_HOMEPAGE;
+                    mBrowserFragment.getBrowserHandler().sendMessage(msg);
+                }
+            } else if (nItemId == R.id.item_settings) {
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
+            } else if (nItemId == R.id.item_about) {
+                Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+            } else if (nItemId == R.id.item_mytermux) {
+                Intent intent = new Intent(getApplicationContext(), MyTermuxActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            } else if (nItemId == R.id.item_termux_env_test) {
+                Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class);
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+            } else if (nItemId == R.id.item_library_activity) {
+                Intent intent = new Intent(getApplicationContext(), cc.winboll.studio.libwinboll.WinBoLLLibraryActivity.class);
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+            } else {
+                return super.onOptionsItemSelected(item);
+            }
+        }
+        return true;
+    }
+
+    // ------------------- 新增：对外提供Handler（供其他组件发送消息，如BrowserFragment） -------------------
+    public Handler getMainHandler() {
+        return _mMainHandler;
+    }
+
+    // ------------------- 新增：生命周期管理（防止Handler内存泄漏） -------------------
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        // 清除Handler所有消息和回调，避免内存泄漏
+        if (_mMainHandler != null) {
+            _mMainHandler.removeCallbacksAndMessages(null);
+            _mMainHandler = null;
+        }
+    }
+}
+
--- a/winboll/src/main/java/cc/winboll/studio/winboll/MyTileService.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/MyTileService.java
@@ -0,0 +1,80 @@
+package cc.winboll.studio.winboll;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/02/13 19:30:10
+ */
+import android.content.Context;
+import cc.winboll.studio.winboll.R;
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.TileService;
+import cc.winboll.studio.winboll.models.MainServiceBean;
+import cc.winboll.studio.winboll.services.MainService;
+
+public class MyTileService extends TileService {
+    public static final String TAG = "MyTileService";
+
+    volatile static MyTileService _MyTileService;
+
+    @Override
+    public void onStartListening() {
+        super.onStartListening();
+        _MyTileService = this;
+        Tile tile = getQsTile();
+        MainServiceBean bean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        if (bean != null && bean.isEnable()) {
+            //MainService.startMainService(context);
+            tile.setState(Tile.STATE_ACTIVE);
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(this, R.drawable.ic_cloud));
+        } else {
+            //MainService.stopMainService(context);
+            tile.setState(Tile.STATE_INACTIVE);
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(this, R.drawable.ic_cloud_outline));
+        }
+        tile.updateTile();
+//        Tile tile = getQsTile();
+//        tile.setState(Tile.STATE_INACTIVE);
+//        tile.setLabel(getString(R.string.tileservice_name));
+//        tile.setIcon(android.graphics.drawable.Icon.createWithResource(this, R.drawable.ic_cloud_outline));
+//        tile.updateTile();
+
+    }
+
+    @Override
+    public void onClick() {
+        super.onClick();
+        Tile tile = getQsTile();
+        MainServiceBean bean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        if (bean == null) {
+            bean = new MainServiceBean();
+        }
+
+        if (tile.getState() == Tile.STATE_ACTIVE) {
+            bean.setIsEnable(false);
+            MainServiceBean.saveBean(this, bean);
+            MainService.stopMainService(this);
+        } else if (tile.getState() == Tile.STATE_INACTIVE) {
+            bean.setIsEnable(true);
+            MainServiceBean.saveBean(this, bean);
+            MainService.startMainService(this);
+        }
+        updateServiceIconStatus(this);
+    }
+
+    public static void updateServiceIconStatus(Context context) {
+        if (_MyTileService == null) {
+            return;
+        }
+
+        Tile tile = _MyTileService.getQsTile();
+        MainServiceBean bean = MainServiceBean.loadBean(context, MainServiceBean.class);
+        if (bean != null && bean.isEnable()) {
+            tile.setState(Tile.STATE_ACTIVE);
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(context, R.drawable.ic_cloud));
+        } else {
+            tile.setState(Tile.STATE_INACTIVE);
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(context, R.drawable.ic_cloud_outline));
+        }
+        tile.updateTile();
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/WinBoLL.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/WinBoLL.java
@@ -0,0 +1,40 @@
+package cc.winboll.studio.winboll;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/05/10 10:13
+ * @Describe WinBoLL 系列应用通用管理类
+ */
+import android.content.Context;
+import android.content.Intent;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.winboll.models.WinBoLLModel;
+
+public class WinBoLL {
+
+    public static final String TAG = "WinBoLL";
+
+    public static final String ACTION_BIND = WinBoLL.class.getName() + ".ACTION_BIND";
+    public static final String EXTRA_WINBOLLMODEL = "EXTRA_WINBOLLMODEL";
+
+    public static void bindToAPPBase(Context context, String appMainService) {
+        LogUtils.d(TAG, "bindToAPPBase(...)");
+        String toPackage = "cc.winboll.studio.appbase";
+        startBind(context, toPackage, appMainService);
+    }
+
+    public static void bindToAPPBaseBeta(Context context, String appMainService) {
+        LogUtils.d(TAG, "bindToAPPBaseBeta(...)");
+        String toPackage = "cc.winboll.studio.appbase.beta";
+        startBind(context, toPackage, appMainService);
+    }
+
+    static void startBind(Context context, String toPackage, String appMainService) {
+        Intent intent = new Intent(ACTION_BIND);
+        intent.putExtra(EXTRA_WINBOLLMODEL, (new WinBoLLModel(toPackage, appMainService)).toString());
+        intent.setPackage(toPackage);
+        LogUtils.d(TAG, String.format("ACTION_BIND :\nTo Package : %s\nAPP Main Service : %s", toPackage, appMainService));
+        context.sendBroadcast(intent);
+    }
+
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/WinBoLLClientService.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/WinBoLLClientService.java
@@ -0,0 +1,21 @@
+package cc.winboll.studio.winboll;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/05/03 19:28
+ */
+public class WinBoLLClientService extends Service {
+    
+    public static final String TAG = "WinBoLLClientService";
+    
+    @Override
+    public IBinder onBind(Intent intent) {
+        
+        return null;
+    }
+    
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/WinBoLLServiceStatusView.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/WinBoLLServiceStatusView.java
@@ -0,0 +1,38 @@
+package cc.winboll.studio.winboll;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/05/03 19:14
+ */
+public class WinBoLLServiceStatusView extends LinearLayout {
+    
+    public static final String TAG = "WinBoLLServiceStatusView";
+    
+    public WinBoLLServiceStatusView(Context context) {
+        super(context);
+    }
+
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    
+    
+    void setServerHost(String szWinBoLLServerHost) {
+        
+    }
+    
+    void setAuthInfo(String szDevUserName, String szDevUserPassword) {
+        
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/WxPayConfig.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/WxPayConfig.java
@@ -0,0 +1,28 @@
+package cc.winboll.studio.winboll;
+
+/**
+ * 微信支付配置类
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/07
+ */
+public class WxPayConfig {
+    // ========== 核心修改点：替换为你的服务端地址 ==========
+    // 服务端IP/域名 + 端口（Docker部署的服务端，需确保安卓端可访问）
+    public static final String BASE_URL = "https://wxpay.winboll.cc";
+
+    // 统一下单接口路径（对应服务端的测试接口）
+    public static final String CREATE_ORDER_URL = BASE_URL + "/pay/createOrder";
+
+    // 订单查询接口路径
+    public static final String QUERY_ORDER_URL = BASE_URL + "/pay/queryOrder";
+
+    // ========== 固定支付配置 ==========
+    public static final String ORDER_BODY = "定额测试支付"; // 商品描述
+    public static final int TOTAL_FEE = 1; // 固定金额：1分（沙箱环境推荐）
+    public static final String TRADE_TYPE = "NATIVE"; // 支付类型：二维码
+
+    // ========== 轮询配置 ==========
+    public static final long POLL_INTERVAL = 10000; // 轮询间隔：10秒
+    public static final long POLL_TIMEOUT = 45000; // 轮询超时：45秒
+}
+
--- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java
@@ -0,0 +1,86 @@
+package cc.winboll.studio.winboll.activities;
+
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.models.APPInfo;
+import cc.winboll.studio.libappbase.views.AboutView;
+import cc.winboll.studio.winboll.MainActivity;
+import cc.winboll.studio.winboll.R;
+import android.app.Activity;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/13 11:54
+ * @Describe 应用介绍窗口
+ */
+public class AboutActivity extends BaseWinBoLLActivity {
+
+	@Override
+	public Activity getActivity() {
+		return this;
+	}
+
+
+    public static final String TAG = "AboutActivity";
+	
+	private Toolbar mToolbar;
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about);
+
+		// 设置工具栏
+        initToolbar();
+
+		AboutView aboutView = getActivity().findViewById(R.id.aboutview);
+		aboutView.setAPPInfo(genDefaultAppInfo());
+    }
+
+	private void initToolbar() {
+        LogUtils.d(TAG, "initToolbar() 开始初始化");
+        mToolbar = (Toolbar) findViewById(R.id.toolbar);
+        if (mToolbar == null) {
+            LogUtils.e(TAG, "initToolbar() | Toolbar未找到");
+            return;
+        }
+        setSupportActionBar(mToolbar);
+        mToolbar.setSubtitle(getTag());
+        ((AppCompatActivity)getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "导航栏 点击返回按钮");
+					getActivity().finish();
+				}
+			});
+        LogUtils.d(TAG, "initToolbar() 配置完成");
+    }
+
+	private APPInfo genDefaultAppInfo() {
+        LogUtils.d(TAG, "genDefaultAppInfo() 调用");
+        String branchName = "winboll";
+        APPInfo appInfo = new APPInfo();
+        appInfo.setAppName(getActivity().getString(R.string.app_name));
+        appInfo.setAppIcon(R.drawable.ic_winboll);
+        appInfo.setAppDescription(getActivity().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=WinBoLL");
+        appInfo.setAppAPKName("WinBoLL");
+        appInfo.setAppAPKFolderName("WinBoLL");
+        LogUtils.d(TAG, "genDefaultAppInfo: 应用信息已生成");
+        return appInfo;
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/BaseWinBoLLActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/BaseWinBoLLActivity.java
@@ -0,0 +1,51 @@
+package cc.winboll.studio.winboll.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libaes.models.AESThemeBean;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.winboll.theme.WinBoLLThemeUtil;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/13 16:33
+ * BaseWinBollActivity 【继承AppCompatActivity，保留核心能力，不额外暴露方法】
+ * 继承链路：BaseWinBoLLActivity → AppCompatActivity → FragmentActivity，AppCompat能力天然继承可用
+ */
+public abstract class BaseWinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
+    public static final String TAG = "BaseWinBoLLActivity";
+
+    protected volatile AESThemeBean.ThemeType mThemeType;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        mThemeType = getThemeType();
+        setThemeStyle();
+        super.onCreate(savedInstanceState);
+        WinBoLLActivityManager.getInstance().add(this);
+        //ToastUtils.show(getTag() + ": onCreate");
+    }
+
+    AESThemeBean.ThemeType getThemeType() {
+        return WinBoLLThemeUtil.getThemeStyleType(WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
+    }
+
+    void setThemeStyle() {
+        setTheme(WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
+    }
+
+    @Override
+    protected void onDestroy() {
+        WinBoLLActivityManager.getInstance().registeRemove(this);
+        super.onDestroy();
+    }
+
+    // 子类必须实现getTag()，确保唯一标识
+    @Override
+    public abstract String getTag();
+
+    public abstract Activity  getActivity();
+}
+
--- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/LogonActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/LogonActivity.java
@@ -0,0 +1,150 @@
+package cc.winboll.studio.winboll.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.RadioButton;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.BuildConfig;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.winboll.R;
+import cc.winboll.studio.winboll.models.UserInfoModel;
+import cc.winboll.studio.winboll.utils.RSAUtils;
+import cc.winboll.studio.winboll.utils.YunUtils;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/06/04 13:29
+ * @Describe 用户登录框
+ */
+public class LogonActivity extends Activity implements IWinBoLLActivity {
+
+    public static final String TAG = "LogonActivity";
+
+    public static final String DEBUG_HOST = "http://10.8.0.250:456";
+    public static final String YUN_HOST = "https://yun.winboll.cc";
+    
+    
+    String mHost = "";
+    RadioButton mrbYunHost;
+    RadioButton mrbDebugHost;
+    LogView mLogView;
+    
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_logon);
+        mLogView = findViewById(R.id.logview);
+        mLogView.start();
+
+        mHost = BuildConfig.DEBUG ? DEBUG_HOST: YUN_HOST;
+        if (BuildConfig.DEBUG) {
+            mrbYunHost = findViewById(R.id.rb_yunhost);
+            mrbDebugHost = findViewById(R.id.rb_debughost);
+            mrbYunHost.setChecked(!BuildConfig.DEBUG);
+            mrbDebugHost.setChecked(BuildConfig.DEBUG);
+        } else {
+            findViewById(R.id.ll_hostbar).setVisibility(View.GONE);
+        }
+    }
+    
+    public void onSwitchHost(View view) {
+        if (view.getId() == R.id.rb_yunhost) {
+            mrbDebugHost.setChecked(false);
+            mHost = YUN_HOST;
+        } else if (view.getId() == R.id.rb_debughost) {
+            mrbYunHost.setChecked(false);
+            mHost = DEBUG_HOST;
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+
+    public void onTestLogin(View view) {
+        LogUtils.d(TAG, "onTestLogin");
+        final YunUtils yunUtils = YunUtils.getInstance(this);
+        
+        UserInfoModel userInfoModel = new UserInfoModel();
+        userInfoModel.setUsername("jian");
+        userInfoModel.setPassword("kkiio");
+        userInfoModel.setToken("aaa111");
+        yunUtils.login(mHost, userInfoModel);
+    }
+
+    public void onTestRSA(View view) {
+        LogUtils.d(TAG, "onTestRSA");
+        RSAUtils utils = RSAUtils.getInstance(this);
+        
+        try {
+            // 测试 1：首次生成密钥对
+            LogUtils.d(TAG, "==== 首次生成密钥对 ====");
+            if (utils.keysExist()) {
+                LogUtils.d(TAG, "密钥对已生成");
+            } else {
+                utils.generateAndSaveKeys();
+                LogUtils.d(TAG, "密钥对生成成功。");
+            }
+
+            // 测试 2：获取密钥对（自动读取已生成的文件）
+            KeyPair keyPair = utils.getOrGenerateKeys();
+            PublicKey publicKey = keyPair.getPublic();
+            PrivateKey privateKey = keyPair.getPrivate();
+
+            // 打印密钥信息
+            LogUtils.d(TAG, "\n==== 密钥信息 ====");
+            LogUtils.d(TAG, "公钥算法：" + publicKey.getAlgorithm());
+            LogUtils.d(TAG, "公钥编码长度：" + publicKey.getEncoded().length + "字节");
+            LogUtils.d(TAG, "私钥算法：" + privateKey.getAlgorithm());
+            LogUtils.d(TAG, "私钥编码长度：" + privateKey.getEncoded().length + "字节");
+
+            // 测试 3：重复调用时检查是否复用文件
+            LogUtils.d(TAG, "\n==== 二次调用 ====");
+            KeyPair reusedPair = utils.getOrGenerateKeys();
+            LogUtils.d(TAG, "是否为同一公钥：" + (publicKey.equals(reusedPair.getPublic()))); // true（单例引用）
+            LogUtils.d(TAG, "操作完成");
+
+            String testMessage = "Hello, RSA Encryption!";
+
+            // 1. 获取或生成密钥对
+            PublicKey publicKeyReused = reusedPair.getPublic();
+            PrivateKey privateKeyReused = reusedPair.getPrivate();
+
+            // 2. 公钥加密
+            byte[] encryptedData = utils.encryptWithPublicKey(testMessage, publicKeyReused);
+            LogUtils.d(TAG, "加密后数据（字节长度）：" + encryptedData.length);
+
+            // 3. 私钥解密
+            String decryptedMessage = utils.decryptWithPrivateKey(encryptedData, privateKeyReused);
+            LogUtils.d(TAG, "解密结果: " + decryptedMessage);
+            
+            // 4. 验证解密是否成功
+            if (testMessage.equals(decryptedMessage)) {
+                LogUtils.d(TAG, "加密解密测试通过！");
+            } else {
+                LogUtils.d(TAG, "测试失败：内容不一致");
+            }
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+    
+
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/New2Activity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/New2Activity.java
@@ -0,0 +1,59 @@
+package cc.winboll.studio.winboll.activities;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/03/25 11:46:40
+ * @Describe 测试窗口2
+ */
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.winboll.R;
+import android.app.Activity;
+
+public class New2Activity extends BaseWinBoLLActivity {
+
+	@Override
+	public Activity getActivity() {
+		return this;
+	}
+
+
+    public static final String TAG = "New2Activity";
+
+    Toolbar mToolbar;
+
+	@Override
+	public String getTag() {
+		return TAG;
+	}
+
+    //LogView mLogView;
+	
+	
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new2);
+
+//        mLogView = findViewById(R.id.logview);
+//        mLogView.start();
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        
+    }
+
+
+    public void onCloseThisActivity(View view) {
+        //WinBoLLActivityManager.getInstance().finish(this);
+    }
+
+    public void onCloseAllActivity(View view) {
+        //WinBoLLActivityManager.getInstance().finishAll();
+    }
+
+    public void onNewActivity(View view) {
+        //WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, NewActivity.class);
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/NewActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/NewActivity.java
@@ -0,0 +1,56 @@
+package cc.winboll.studio.winboll.activities;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/03/25 05:04:22
+ * @Describe
+ */
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.winboll.R;
+import android.app.Activity;
+
+public class NewActivity extends BaseWinBoLLActivity {
+
+	@Override
+	public Activity getActivity() {
+		return this;
+	}
+
+
+    public static final String TAG = "NewActivity";
+
+    Toolbar mToolbar;
+    //LogView mLogView;
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new);
+//        mLogView = findViewById(R.id.logview);
+//        mLogView.start();
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        
+    }
+
+
+    public void onCloseThisActivity(View view) {
+        WinBoLLActivityManager.getInstance().finish(this);
+    }
+
+    public void onCloseAllActivity(View view) {
+        WinBoLLActivityManager.getInstance().finishAll();
+    }
+
+    public void onNew2Activity(View view) {
+       // WinBoLLActivityManager.getInstance().startWinBoLLActivity(App.getInstance(), New2Activity.class);
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/PatternLockActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/PatternLockActivity.java
@@ -0,0 +1,308 @@
+package cc.winboll.studio.winboll.activities;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.MotionEvent;
+import android.widget.FrameLayout;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.winboll.R;
+
+public class PatternLockActivity extends BaseWinBoLLActivity {
+
+    public static final String TAG = "PatternLockActivity";
+
+    private static final int DOT_RADIUS = 8;
+    private static final int PATTERN_ERROR_DURATION = 1500;
+
+    private static final String PREFS_NAME = "pattern_lock_prefs";
+    static final String KEY_LOCK_PATTERN = "lock_pattern";
+    static final String KEY_ERROR_STATE = "error_state";
+    private static final String KEY_ERROR_REPEAT_PATTERN = "error_repeat_pattern";
+
+    private boolean mIsInErrorState;
+    private boolean mNeedRestart;
+    private Handler mHandler;
+
+    private FrameLayout mContainer;
+    private PatternView mPatternView;
+
+    public PatternLockActivity() {
+        mHandler = new Handler(Looper.getMainLooper());
+    }
+
+    PatternLockActivity(Context context) {
+        mHandler = new Handler(Looper.getMainLooper());
+    }
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        AESThemeUtil.applyAppTheme(this);
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_pattern_lock);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setSubtitle(TAG);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        toolbar.setNavigationOnClickListener(new android.view.View.OnClickListener() {
+            @Override
+            public void onClick(android.view.View v) {
+                finish();
+            }
+        });
+
+        mContainer = findViewById(R.id.container);
+        mPatternView = new PatternView(this);
+        mContainer.addView(mPatternView);
+        mPatternView.invalidate();
+        
+        mNeedRestart = false;
+        boolean isEnoughPoints = savedInstanceIsEnoughPoints();
+
+        if (savedInstanceState != null) {
+            mIsInErrorState = savedInstanceState.getBoolean(KEY_ERROR_STATE, false);
+            mNeedRestart = savedInstanceState.getBoolean(KEY_ERROR_REPEAT_PATTERN, false);
+        }
+
+        if (mIsInErrorState) {
+            mPatternView.invalidate();
+        }
+    }
+
+    boolean savedInstanceIsEnoughPoints() {
+        int count = 0;
+        if (mPatternView != null) {
+            for (int i = 0; i < 9; i++) {
+                if (mPatternView.mDotState[i] == 1) {
+                    count++;
+                }
+            }
+        }
+        return count >= 4 || count == 0;
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        if (mIsInErrorState) {
+            outState.putBoolean(KEY_ERROR_STATE, mIsInErrorState);
+        }
+        if (mNeedRestart) {
+            outState.putBoolean(KEY_ERROR_REPEAT_PATTERN, mNeedRestart);
+        }
+        super.onSaveInstanceState(outState);
+    }
+
+    private void showErrorState() {
+        mIsInErrorState = true;
+        invalidatePattern();
+        mHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mIsInErrorState = false;
+                SharedPreferences prefs = getSharedPreferences(PREFS_NAME, MODE_PRIVATE);
+                prefs.edit().putBoolean(KEY_ERROR_STATE, false).apply();
+                invalidatePattern();
+                if (mPatternView != null) mPatternView.invalidate();
+            }
+        }, PATTERN_ERROR_DURATION);
+    }
+
+    private void clearErrorState() {
+        mIsInErrorState = false;
+        SharedPreferences prefs = getSharedPreferences(PREFS_NAME, MODE_PRIVATE);
+        prefs.edit().putBoolean(KEY_ERROR_STATE, false).apply();
+        invalidatePattern();
+        if (mPatternView != null) mPatternView.invalidate();
+    }
+
+    private void showErrorToast() {
+        android.widget.Toast.makeText(this, "图案点数不足，请重新绘制", 
+            android.widget.Toast.LENGTH_SHORT).show();
+        mNeedRestart = true;
+    }
+
+    private void showSuccessDialog() {
+        android.app.AlertDialog alertDialog = new android.app.AlertDialog.Builder(this)
+            .setTitle("设置成功")
+            .setMessage("图案密码已设置成功")
+            .setPositiveButton("确定", new android.content.DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(android.content.DialogInterface dialog, int which) {
+                    finish();
+                }
+            })
+            .setCancelable(false)
+            .create();
+        alertDialog.show();
+    }
+
+    void finishWithRestart() {
+        finish();
+    }
+
+    private void invalidatePattern() {
+        if (mPatternView != null) {
+            mPatternView.invalidate();
+        }
+    }
+
+    class PatternView extends FrameLayout {
+        int mPatternSize = 0;
+        int MAX_DOT_COUNT = 9;
+        int[] mDotX = new int[MAX_DOT_COUNT];
+        int[] mDotY = new int[MAX_DOT_COUNT];
+        int[] mDotState = new int[MAX_DOT_COUNT];
+        Bitmap mDotBitmap;
+        Paint mPaintConnector;
+        Paint mPaintErrorBackground;
+        int mDotCount = 0;
+
+        PatternView(Context context) {
+            super(context);
+            setBackgroundColor(Color.WHITE);
+            for (int i = 0; i < MAX_DOT_COUNT; i++) {
+                mDotX[i] = -1;
+                mDotY[i] = -1;
+                mDotState[i] = 0;
+            }
+        }
+
+        @Override
+        protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+            super.onSizeChanged(w, h, oldw, oldh);
+            if (w == 0 || h == 0) return;
+            mPatternSize = w > h ? h : w;
+            int grid = 3;
+            int cell = mPatternSize / grid;
+
+            for (int i = 0; i < MAX_DOT_COUNT; i++) {
+                mDotX[i] = (i % grid) * cell + cell / 2 - cell / 24;
+                mDotY[i] = (i / grid) * cell + cell / 2 - cell / 24;
+                mDotState[i] = 0;
+            }
+
+            if (mDotBitmap == null) {
+                mDotBitmap = BitmapFactory.decodeResource(getResources(), R.drawable.dot_darkgreen_dark);
+            }
+            if (mPaintConnector == null) {
+                mPaintConnector = new Paint(Paint.FILTER_BITMAP_FLAG);
+                mPaintConnector.setColor(-0xFF006400);
+            }
+            if (mPaintErrorBackground == null) {
+                mPaintErrorBackground = new Paint(Paint.ANTI_ALIAS_FLAG);
+                mPaintErrorBackground.setColor(Color.RED);
+            }
+        }
+
+        @Override
+        public boolean onTouchEvent(MotionEvent event) {
+            if (mDotCount > 0) return false;
+
+            switch (event.getActionMasked()) {
+                case MotionEvent.ACTION_DOWN:
+                    invalidate();
+                    return true;
+                case MotionEvent.ACTION_MOVE:
+                    float x = event.getX();
+                    float y = event.getY();
+
+                    for (int i = 0; i < MAX_DOT_COUNT; i++) {
+                        int dx = (int) Math.abs(x - mDotX[i]);
+                        int dy = (int) Math.abs(y - mDotY[i]);
+                        if (dx <= DOT_RADIUS && dy <= DOT_RADIUS && mDotState[i] == 0) {
+                            mDotState[i] = 1;
+                            mDotCount++;
+                        }
+                    }
+
+                    for (int i = 0; i < mDotCount - 1; i++) {
+                        int a = -1, b = -1;
+                        for (int k = 0; k < MAX_DOT_COUNT; k++) {
+                            if (mDotState[k] == 1) {
+                                if (a < 0) a = k;
+                                else b = k;
+                            }
+                        }
+                        if (a >= 0 && b >= 0) {
+                            a = Math.min(a, b);
+                            b = Math.max(a, b);
+                        }
+                        if (mDotState[a] == 1 && mDotState[b] == 1) {
+                            int dx = mDotX[b] - mDotX[a];
+                            int dy = mDotY[b] - mDotY[a];
+                            if ((Math.abs(dx) <= 1 && Math.abs(dy) <= 1) ||
+                                (Math.abs(dx) <= 2 && Math.abs(dy) <= 1)) {
+                                if (mDotState[b] == 1) {
+                                    for (int k = a + 1; k < b; k++) {
+                                        if (mDotState[k] == 0) {
+                                            mDotState[k] = 1;
+                                        }
+                                    }
+                                    mDotCount += (b - a - 1);
+                                }
+                            }
+                        }
+                    }
+                    invalidate();
+                    return true;
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_CANCEL:
+                    if (mDotCount < 4) {
+                        showErrorState();
+                        showErrorToast();
+                    }
+                    break;
+            }
+            return true;
+        }
+
+        @Override
+        public void onDraw(Canvas canvas) {
+            if (mPatternSize == 0) return;
+
+            int activeCount = 0;
+            for (int i = 0; i < MAX_DOT_COUNT; i++) {
+                if (mDotState[i] == 1) activeCount++;
+            }
+
+            if (activeCount == 0) {
+                mPaintErrorBackground.setAlpha(50);
+            } else {
+                mPaintErrorBackground.setAlpha(mIsInErrorState ? 80 : 60);
+            }
+
+            canvas.clipRect(0, 0, mPatternSize * 80 / 100, mPatternSize * 80 / 100);
+
+            canvas.drawRect(0, 0, mPatternSize, mPatternSize, mPaintErrorBackground);
+
+            if (mDotBitmap != null) {
+                for (int i = 0; i < MAX_DOT_COUNT; i++) {
+                    if (mDotState[i] == 1) {
+                        canvas.drawBitmap(mDotBitmap, mDotX[i], mDotY[i], mPaintConnector);
+                    }
+                }
+            }
+        }
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java
@@ -0,0 +1,50 @@
+package cc.winboll.studio.winboll.activities;
+
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.winboll.R;
+import android.app.Activity;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/12/05 18:48
+ * @Describe Settings Activity
+ */
+public class SettingsActivity extends BaseWinBoLLActivity {
+
+	@Override
+	public Activity getActivity() {
+		return this;
+	}
+
+
+    public static final String TAG = "SettingsActivity";
+
+	@Override
+	public String getTag() {
+		return TAG;
+	}
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        AESThemeUtil.applyAppTheme(this);
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+		
+		// 设置工具栏
+        Toolbar toolbar = findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);
+        getSupportActionBar().setSubtitle(TAG);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    finish(); // 点击导航栏返回按钮，触发 finish()
+                }
+            });
+
+    }
+
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/ShortcutActionActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/ShortcutActionActivity.java
@@ -0,0 +1,50 @@
+package cc.winboll.studio.winboll.activities;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.winboll.App;
+import cc.winboll.studio.winboll.R;
+import cc.winboll.studio.winboll.utils.APPPlusUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/27 09:00
+ * @Describe 应用快捷方式活动类
+ */
+public class ShortcutActionActivity extends Activity {
+
+    public static final String TAG = "ShortcutActionActivity";
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		// 处理应用级别的切换请求
+        handleSwitchRequest();
+		finish();
+	}
+
+	/**
+     * 处理应用图标快捷菜单的请求
+     */
+    private void handleSwitchRequest() {
+		//ToastUtils.show("handleSwitchRequest");
+        Intent intent = getIntent();
+        if (intent != null && "switchto_en1".equals(intent.getDataString())) {
+			APPPlusUtils.switchAppLauncherToComponent(this, App.COMPONENT_EN1);
+            ToastUtils.show("切换至" + getString(R.string.app_name) + "图标");
+			//moveTaskToBack(true);
+        }
+		if (intent != null && "switchto_cn1".equals(intent.getDataString())) {
+			APPPlusUtils.switchAppLauncherToComponent(this, App.COMPONENT_CN1);
+            ToastUtils.show("切换至" + getString(R.string.app_name_cn1) + "图标");
+			//moveTaskToBack(true);
+        }
+		if (intent != null && "switchto_cn2".equals(intent.getDataString())) {
+			APPPlusUtils.switchAppLauncherToComponent(this, App.COMPONENT_CN2);
+            ToastUtils.show("切换至" + getString(R.string.app_name_cn2) + "图标");
+			//moveTaskToBack(true);
+        }
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/WinBoLLUnitTestActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/WinBoLLUnitTestActivity.java
@@ -0,0 +1,172 @@
+package cc.winboll.studio.winboll.activities;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.CheckBox;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.CrashHandler;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.GlobalCrashActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.winboll.App;
+import cc.winboll.studio.winboll.R;
+import cc.winboll.studio.winboll.services.MainService;
+import cc.winboll.studio.winboll.services.TestDemoBindService;
+import cc.winboll.studio.winboll.services.TestDemoService;
+import cc.winboll.studio.winboll.sos.SOS;
+import cc.winboll.studio.winboll.widgets.StatusWidget;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+public class WinBoLLUnitTestActivity extends AppCompatActivity {
+
+    public static final String TAG = "MainActivity";
+
+    Toolbar mToolbar;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ToastUtils.show("onCreate");
+        setContentView(R.layout.activity_winbollunittest);
+
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+
+        CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
+        cbIsDebugMode.setChecked(GlobalApplication.isDebugging());
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        //getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+//        if(item.getItemId() == R.id.item_yun) {
+//            WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, cc.winboll.studio.winboll.activities.YunActivity.class);
+//        } else if(item.getItemId() == R.id.item_logon) {
+//            WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, cc.winboll.studio.winboll.activities.LogonActivity.class);
+//        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Intent intentAPPWidget = new Intent(this, StatusWidget.class);
+        intentAPPWidget.setAction(StatusWidget.ACTION_STATUS_UPDATE);
+        sendBroadcast(intentAPPWidget);
+    }
+
+	public void onSwitchDebugMode(View view) {
+        boolean isDebuging = ((CheckBox)view).isChecked();
+        GlobalApplication.setIsDebugging(isDebuging);
+        GlobalApplication.saveDebugStatus((App.getInstance()));
+    }
+
+    public void onPreviewGlobalCrashActivity(View view) {
+        Intent intent = new Intent(this, GlobalCrashActivity.class);
+        intent.putExtra(CrashHandler.EXTRA_CRASH_LOG, "Demo log...");
+        startActivity(intent);
+    }
+
+    public void onStartCenter(View view) {
+        MainService.startMainService(this);
+    }
+
+    public void onStopCenter(View view) {
+        MainService.stopMainService(this);
+    }
+
+    public void onTestStopMainServiceWithoutSettingEnable(View view) {
+        LogUtils.d(TAG, "onTestStopMainServiceWithoutSettingEnable");
+        stopService(new Intent(this, MainService.class));
+    }
+
+    public void onTestUseComponentStartService(View view) {
+        LogUtils.d(TAG, "onTestUseComponentStartService");
+
+        // 目标服务的包名和类名
+        String packageName = this.getPackageName();
+        String serviceClassName = TestDemoService.class.getName();
+
+        // 构建Intent
+        Intent intentService = new Intent();
+        intentService.setComponent(new ComponentName(packageName, serviceClassName));
+
+        startService(intentService);
+    }
+
+    public void onTestDemoServiceSOS(View view) {
+        Intent intent = new Intent(this, TestDemoService.class);
+        stopService(intent);
+        if (App.isDebugging()) {
+            SOS.sosToAppBaseBeta(this, TestDemoService.class.getName());
+        } else {
+            SOS.sosToAppBase(this, TestDemoService.class.getName());
+        }
+    }
+
+    public void onSartTestDemoService(View view) {
+        Intent intent = new Intent(this, TestDemoService.class);
+        intent.setAction(TestDemoService.ACTION_ENABLE);
+        startService(intent);
+
+    }
+
+    public void onStopTestDemoService(View view) {
+        Intent intent = new Intent(this, TestDemoService.class);
+        intent.setAction(TestDemoService.ACTION_DISABLE);
+        startService(intent);
+
+        Intent intentStop = new Intent(this, TestDemoService.class);
+        stopService(intentStop);
+    }
+
+    public void onStopTestDemoServiceNoSettings(View view) {
+        Intent intent = new Intent(this, TestDemoService.class);
+        stopService(intent);
+    }
+
+    public void onSartTestDemoBindService(View view) {
+        Intent intent = new Intent(this, TestDemoBindService.class);
+        intent.setAction(TestDemoBindService.ACTION_ENABLE);
+        startService(intent);
+
+    }
+
+    public void onStopTestDemoBindService(View view) {
+        Intent intent = new Intent(this, TestDemoBindService.class);
+        intent.setAction(TestDemoBindService.ACTION_DISABLE);
+        startService(intent);
+
+        Intent intentStop = new Intent(this, TestDemoBindService.class);
+        stopService(intentStop);
+    }
+
+    public void onStopTestDemoBindServiceNoSettings(View view) {
+        Intent intent = new Intent(this, TestDemoBindService.class);
+        stopService(intent);
+    }
+
+    public void onTestOpenNewActivity(View view) {
+        WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, NewActivity.class);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/YunActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/YunActivity.java
@@ -0,0 +1,126 @@
+package cc.winboll.studio.winboll.activities;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/06/04 11:06
+ * @Describe 云宝云
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.RadioButton;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.BuildConfig;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.winboll.R;
+import java.io.IOException;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public class YunActivity extends Activity implements IWinBoLLActivity {
+
+    public static final String TAG = "YunActivity";
+
+    public static final String DEBUG_HOST = "http://10.8.0.250:456";
+    public static final String YUN_HOST = "https://yun.winboll.cc";
+
+    String mHost = "";
+    RadioButton mrbYunHost;
+    RadioButton mrbDebugHost;
+    LogView mLogView;
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_yun);
+        mLogView = findViewById(R.id.logview);
+        mLogView.start();
+
+        mHost = BuildConfig.DEBUG ? DEBUG_HOST: YUN_HOST;
+        if (BuildConfig.DEBUG) {
+            mrbYunHost = findViewById(R.id.rb_yunhost);
+            mrbDebugHost = findViewById(R.id.rb_debughost);
+            mrbYunHost.setChecked(!BuildConfig.DEBUG);
+            mrbDebugHost.setChecked(BuildConfig.DEBUG);
+        } else {
+            findViewById(R.id.ll_hostbar).setVisibility(View.GONE);
+        }
+    }
+
+    public void onSwitchHost(View view) {
+        if (view.getId() == R.id.rb_yunhost) {
+            mrbDebugHost.setChecked(false);
+            mHost = YUN_HOST;
+        } else if (view.getId() == R.id.rb_debughost) {
+            mrbYunHost.setChecked(false);
+            mHost = DEBUG_HOST;
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+
+    public void onTestYun(View view) {
+        LogUtils.d(TAG, "onTestYun");
+        (new Thread(new Runnable(){
+                @Override
+                public void run() {
+                    testYun();
+                }
+            })).start();
+    }
+
+    void testYun() {
+        OkHttpClient client = new OkHttpClient();
+        Request request = new Request.Builder()
+            .url(mHost + "/backups/")
+            .build();
+
+        Response response = null;
+        try {
+            response = client.newCall(request).execute();
+            if (response.isSuccessful()) {
+                String responseBody = "";
+                if (response.body() != null) {
+                    responseBody = response.body().string();
+                }
+
+                // 正则匹配：任意主机名 -> Test OK（主机名部分匹配非空字符）
+                boolean isMatch = responseBody.matches(".+? -> Test OK");
+
+                if (isMatch) {
+                    LogUtils.d(TAG, responseBody);
+                } else {
+                    LogUtils.d(TAG, "响应内容不匹配，内容：" + responseBody);
+                }
+            } else {
+                LogUtils.d(TAG, "请求失败，状态码：" + response.code());
+            }
+        } catch (IOException e) {
+            LogUtils.d(TAG, "读取响应体失败：" + e.getMessage());
+        } catch (Exception e) {
+            LogUtils.d(TAG, "异常：" + e.getMessage());
+            e.printStackTrace(); // Java 7 需显式打印堆栈
+        } finally {
+            // 手动关闭 Response（Java 7 不支持 try-with-resources）
+            if (response != null && response.body() != null) {
+                response.body().close();
+            }
+        }
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/applications/MyTermuxActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/applications/MyTermuxActivity.java
@@ -0,0 +1,237 @@
+package cc.winboll.studio.winboll.applications;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+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.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.util.ArrayList;
+
+public class MyTermuxActivity extends AppCompatActivity {
+
+    public static final String TAG = "MyTermuxActivity";
+
+    private Toolbar mToolbar;
+    private ListView mListView;
+    private Button mBtnAdd;
+    private ButtonAdapter mAdapter;
+    private ArrayList<TermuxButtonModel> mButtonList;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_my_termux);
+
+        initToolbar();
+        initListView();
+        initAddButton();
+        refreshList();
+    }
+
+    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.getExeCommand(), model.getWorkDir());
+            }
+        });
+
+        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);
+        String[] items = new String[]{
+            getString(R.string.menu_execute),
+            getString(R.string.menu_edit),
+            getString(R.string.menu_delete),
+            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.getExeCommand(), model.getWorkDir());
+                    } else if (which == 1) {
+                        showButtonDialog(position, model);
+                    } else if (which == 2) {
+                        showDeleteConfirmDialog(position);
+                    }
+                }
+            })
+            .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();
+    }
+
+    private void showButtonDialog(final int index, final TermuxButtonModel model) {
+        final boolean isEdit = (model != null);
+
+        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);
+
+        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);
+                    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) {
+            TextView tv;
+            if (convertView == null) {
+                tv = new TextView(MyTermuxActivity.this);
+                tv.setPadding(30, 20, 30, 20);
+                tv.setTextSize(16);
+                tv.setMinHeight(80);
+            } else {
+                tv = (TextView) convertView;
+            }
+
+            TermuxButtonModel model = mButtonList.get(position);
+            tv.setText(model.getButtonName() + "\n" + model.getExeCommand());
+            tv.setTextColor(getResources().getColor(android.R.color.white));
+            return tv;
+        }
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/fragments/BrowserFragment.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/fragments/BrowserFragment.java
@@ -0,0 +1,350 @@
+package cc.winboll.studio.winboll.fragments;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import cc.winboll.studio.winboll.MainActivity;
+import cc.winboll.studio.winboll.R;
+import cc.winboll.studio.winboll.views.WinBoLLView;
+import java.util.ArrayList;
+import android.app.Activity;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/27 11:09
+ * @Describe 浏览器Fragment（Java 7 语法完整版，新增Handler消息接收）
+ * 适配Java 7特性，支持接收应用内消息（如MSG_HOMEPAGE跳转首页）
+ */
+public class BrowserFragment extends Fragment implements View.OnClickListener, WinBoLLView.OnPageStatusListener {
+
+    // 控件声明（Java 7 成员变量显式声明）
+    private EditText mEtUrl;
+    private Button mBtnLoad;
+    private Button mBtnRefresh;
+    private Button mBtnStop;
+    private Button mBtnForward;
+    private Button mBtnBack;
+    private ProgressBar mProgressBar;
+    private WinBoLLView mWinBoLLView;
+	public static ArrayList<String> _mUrlLoadHistory = new ArrayList<String>();
+
+    // ------------------- 新增：Handler 消息定义（应用内通信） -------------------
+    // 消息标识：跳转首页（winboll.cc）
+    public static final int MSG_HOMEPAGE = 1001;
+	// 跳转到历史记录位置
+    public static final int MSG_HISTORY_POSITION = 1002;
+	// 打开外部应用传入的 URL
+	public static final int MSG_OPEN_URL = 1003;
+    // 自定义Handler（接收应用内其他页面发送的消息）
+    private Handler mBrowserHandler;
+
+    // 单例创建方法（Java 7 显式工厂模式）
+    public static BrowserFragment newInstance() {
+        return new BrowserFragment();
+    }
+
+    // 创建带初始URL的实例（供外部应用调用时使用）
+    public static BrowserFragment newInstance(String initialUrl) {
+        BrowserFragment fragment = new BrowserFragment();
+        Bundle args = new Bundle();
+        args.putString("initial_url", initialUrl);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        // 加载布局（Java 7 显式强转，无菱形语法）
+        View view = inflater.inflate(R.layout.fragment_browser, container, false);
+		// 清理旧历史记录
+		_mUrlLoadHistory.clear();
+
+        // 初始化控件
+        initViews(view);
+        // 绑定事件
+        initEvents();
+        // 初始化WinBoLLView
+        initWinBoLLView();
+        // ------------------- 新增：初始化Handler（关键） -------------------
+        initHandler();
+        return view;
+    }
+
+    /**
+     * 初始化控件（Java 7 显式绑定，无Stream简化）
+     */
+    private void initViews(View view) {
+        mEtUrl = (EditText) view.findViewById(R.id.et_url);
+        mBtnLoad = (Button) view.findViewById(R.id.btn_load);
+        mBtnRefresh = (Button) view.findViewById(R.id.btn_refresh);
+        mBtnStop = (Button) view.findViewById(R.id.btn_stop);
+        mBtnForward = (Button) view.findViewById(R.id.btn_forward);
+        mBtnBack = (Button) view.findViewById(R.id.btn_back);
+        mProgressBar = (ProgressBar) view.findViewById(R.id.progress_bar);
+        mWinBoLLView = (WinBoLLView) view.findViewById(R.id.winboll_webview);
+    }
+
+    /**
+     * 绑定点击事件（Java 7 匿名内部类，无Lambda）
+     */
+    private void initEvents() {
+        // 功能按钮点击事件
+        mBtnLoad.setOnClickListener(this);
+        mBtnRefresh.setOnClickListener(this);
+        mBtnStop.setOnClickListener(this);
+        mBtnForward.setOnClickListener(this);
+        mBtnBack.setOnClickListener(this);
+
+        // 输入框软键盘“前往”按钮事件（Java 7 匿名内部类实现）
+        mEtUrl.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+				@Override
+				public boolean onEditorAction(TextView v, int actionId, android.view.KeyEvent event) {
+					// 处理软键盘“前往”点击
+					loadUrlFromInput();
+					return true;
+				}
+			});
+    }
+
+    /**
+     * 初始化WinBoLLView（Java 7 显式调用，无方法引用）
+     */
+    private void initWinBoLLView() {
+        // 绑定进度条
+        mWinBoLLView.setProgressBar(mProgressBar);
+        // 设置页面状态监听（this 实现 OnPageStatusListener）
+        mWinBoLLView.setOnPageStatusListener(this);
+
+        // 检查是否有外部传入的初始 URL
+        String initialUrl = null;
+        if (getArguments() != null) {
+            initialUrl = getArguments().getString("initial_url");
+        }
+
+        if (initialUrl != null && !initialUrl.isEmpty()) {
+            // 使用外部传入的 URL
+            mWinBoLLView.loadUrlSafe(initialUrl);
+            mEtUrl.setText(initialUrl);
+        } else {
+            // 预加载默认页面（winboll.cc 首页）
+            String defaultUrl = "https://www.winboll.cc";
+            mWinBoLLView.loadUrlSafe(defaultUrl);
+            mEtUrl.setText(defaultUrl);
+        }
+    }
+
+    // ------------------- 新增：初始化Handler（接收应用内消息） -------------------
+    private void initHandler() {
+        // Java 7 匿名内部类实现Handler（主线程中创建，用于更新UI）
+        mBrowserHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+                // 根据消息标识处理不同逻辑
+                switch (msg.what) {
+                    case MSG_HOMEPAGE:
+                        // 处理“跳转首页”消息：加载winboll.cc
+                        String homeUrl = "https://www.winboll.cc";
+                        mWinBoLLView.loadUrlSafe(homeUrl);
+                        mEtUrl.setText(homeUrl);
+                        showToast("已跳转至首页");
+                        break;
+					case MSG_HISTORY_POSITION:
+						int position = (int)msg.obj;
+						if(-1 < position && position < _mUrlLoadHistory.size()) {
+							// 处理“跳转首页”消息：加载winboll.cc
+							String historyUrl = _mUrlLoadHistory.get(position);
+							mWinBoLLView.loadUrlSafe(historyUrl);
+							mEtUrl.setText(historyUrl);
+							//showToast("已跳转至" + historyUrl);
+						}
+                        break;
+                    case MSG_OPEN_URL:
+                        String openUrl = (String) msg.obj;
+                        if (openUrl != null && !openUrl.isEmpty()) {
+                            mWinBoLLView.loadUrlSafe(openUrl);
+                            mEtUrl.setText(openUrl);
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+        };
+    }
+
+    /**
+     * 点击事件处理（Java 7 switch-case 语句，无增强switch）
+     */
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+        if (id == R.id.btn_load) {
+            // 加载输入框中的URL
+            loadUrlFromInput();
+        } else if (id == R.id.btn_refresh) {
+            // 刷新当前页面
+            mWinBoLLView.refreshPage();
+        } else if (id == R.id.btn_stop) {
+            // 停止页面加载
+            mWinBoLLView.stopPageLoad();
+        } else if (id == R.id.btn_forward) {
+            // 前进（无历史则提示）
+            if (!mWinBoLLView.goForwardSafe()) {
+                showToast("无前进历史");
+            }
+        } else if (id == R.id.btn_back) {
+            // 后退（无历史则提示）
+            if (!mWinBoLLView.goBackSafe()) {
+                showToast("无后退历史");
+            }
+        }
+    }
+
+    /**
+     * 从输入框获取URL并加载（Java 7 显式空值校验）
+     */
+    private void loadUrlFromInput() {
+        // 空值校验（Java 7 显式判断，无Objects.requireNonNull）
+        if (mEtUrl == null) {
+            showToast("控件初始化失败");
+            return;
+        }
+        String url = mEtUrl.getText().toString().trim();
+        // 调用WinBoLLView安全加载方法
+        mWinBoLLView.loadUrlSafe(url);
+        // 隐藏软键盘
+        hideSoftKeyboard();
+    }
+
+    /**
+     * 隐藏软键盘（Java 7 显式获取系统服务，无Lambda简化）
+     */
+    private void hideSoftKeyboard() {
+        if (getActivity() == null) {
+            return;
+        }
+        // 获取InputMethodManager（Java 7 显式强转）
+        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(android.content.Context.INPUT_METHOD_SERVICE);
+        if (imm != null && getActivity().getCurrentFocus() != null) {
+            imm.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0);
+        }
+    }
+
+    /**
+     * 显示Toast提示（Java 7 简化封装，避免重复代码）
+     */
+    private void showToast(String msg) {
+        if (getActivity() == null || msg == null) {
+            return;
+        }
+        // Java 7 显式创建Toast，无Toast.makeText简化链式调用
+        Toast toast = Toast.makeText(getActivity(), msg, Toast.LENGTH_SHORT);
+        toast.show();
+    }
+
+    // ------------------- WinBoLLView.OnPageStatusListener 实现（Java 7 显式重写） -------------------
+    @Override
+    public void onPageStarted(String url) {
+        // 页面开始加载：更新输入框URL（Java 7 显式非空判断）
+        if (mEtUrl != null && url != null) {
+            mEtUrl.setText(url);
+        }
+    }
+
+    @Override
+    public void onPageFinished(String url) {
+        // 页面加载完成：更新输入框URL
+        if (mEtUrl != null && url != null) {
+            mEtUrl.setText(url);
+			addUrlToHistory(url);
+        }
+    }
+
+    @Override
+    public void onPageError(String errorMsg) {
+        // 页面加载错误：显示错误提示
+        showToast("加载失败：" + errorMsg);
+    }
+
+    // ------------------- 新增：对外提供Handler（供其他页面获取并发送消息） -------------------
+    public Handler getBrowserHandler() {
+        return mBrowserHandler;
+    }
+
+    // ------------------- 生命周期管理（防止内存泄漏，Java 7 显式重写） -------------------
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        // 销毁WinBoLLView（释放资源，避免内存泄漏）
+        if (mWinBoLLView != null) {
+            mWinBoLLView.destroyWebView();
+            mWinBoLLView = null;
+        }
+        // ------------------- 新增：移除Handler消息（关键，防止内存泄漏） -------------------
+        if (mBrowserHandler != null) {
+            mBrowserHandler.removeCallbacksAndMessages(null); // 清除所有消息和回调
+            mBrowserHandler = null;
+        }
+        // 置空控件（帮助GC回收）
+        mEtUrl = null;
+        mBtnLoad = null;
+        mBtnRefresh = null;
+        mBtnStop = null;
+        mBtnForward = null;
+        mBtnBack = null;
+        mProgressBar = null;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        // 彻底释放资源
+        if (mWinBoLLView != null) {
+            mWinBoLLView.destroyWebView();
+            mWinBoLLView = null;
+        }
+        // 再次清除Handler（双重保险）
+        if (mBrowserHandler != null) {
+            mBrowserHandler.removeCallbacksAndMessages(null);
+            mBrowserHandler = null;
+        }
+    }
+
+	// 在 BrowserFragment 中添加以下代码（Java 7 语法）
+	/**
+	 * 发送URL历史更新消息给MainActivity（当历史列表变化时调用）
+	 */
+	private void sendUrlHistoryUpdateMsg() {
+		Message msg = Message.obtain();
+	    msg.what = MainActivity.MSG_URLLOADHISTORY_UPDATE;
+		MainActivity.sendMessage(msg);
+	}
+
+	// 调用时机示例（在BrowserFragment加载URL并更新历史列表后调用）
+	// 假设BrowserFragment中有添加URL到历史的方法：
+	private void addUrlToHistory(String url) {
+		if (_mUrlLoadHistory == null) {
+			_mUrlLoadHistory = new ArrayList<String>();
+		}
+		if (!_mUrlLoadHistory.contains(url)) {
+			_mUrlLoadHistory.add(0, url);
+			// 关键：添加历史后发送更新消息，通知MainActivity刷新抽屉菜单
+			sendUrlHistoryUpdateMsg();
+		}
+	}
+}
+
--- a/winboll/src/main/java/cc/winboll/studio/winboll/fragments/MainFragment.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/fragments/MainFragment.java
@@ -0,0 +1,35 @@
+package cc.winboll.studio.winboll.fragments;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/09/29 13:15
+ * @Describe MainFragment
+ */
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Switch;
+import androidx.fragment.app.Fragment;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.winboll.R;
+
+
+public class MainFragment extends Fragment {
+    
+    public static final String TAG = "MainFragment";
+    
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_main, container, false);
+        Switch swEnablePosition = view.findViewById(R.id.fragmentmainSwitch1);
+        swEnablePosition.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    ToastUtils.show("Position");
+                }
+            });
+        return view;
+    }
+    
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/handlers/MainServiceHandler.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/handlers/MainServiceHandler.java
@@ -0,0 +1,38 @@
+package cc.winboll.studio.winboll.handlers;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/02/14 03:51:40
+ */
+import android.os.Handler;
+import android.os.Message;
+import java.lang.ref.WeakReference;
+import cc.winboll.studio.winboll.services.MainService;
+
+public class MainServiceHandler extends Handler {
+    public static final String TAG = "MainServiceHandler";
+
+    public static final int MSG_REMINDTHREAD = 0;
+
+    WeakReference<MainService> serviceWeakReference;
+    public MainServiceHandler(MainService service) {
+        serviceWeakReference = new WeakReference<MainService>(service);
+    }
+
+    @Override
+    public void handleMessage(Message msg) {
+        switch (msg.what) {
+            case MSG_REMINDTHREAD: // 处理下载完成消息，更新UI
+                {
+                    // 显示提醒消息
+                    //
+                    //LogUtils.d(TAG, "显示提醒消息");
+                    MainService mainService = serviceWeakReference.get();
+                    if (mainService != null) {
+                        mainService.appenMessage((String)msg.obj);
+                    }
+                    break;
+                }
+        }
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/models/MainServiceBean.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/models/MainServiceBean.java
@@ -0,0 +1,67 @@
+package cc.winboll.studio.winboll.models;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/02/13 07:06:13
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class MainServiceBean extends BaseBean {
+
+    public static final String TAG = "MainServiceBean";
+
+    boolean isEnable;
+
+    public MainServiceBean() {
+        this.isEnable = false;
+    }
+
+    public void setIsEnable(boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public boolean isEnable() {
+        return isEnable;
+    }
+
+    @Override
+    public String getName() {
+        return MainServiceBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("isEnable").value(isEnable());
+
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("isEnable")) {
+                setIsEnable(jsonReader.nextBoolean());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/models/NfcTermuxCmd.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/models/NfcTermuxCmd.java
@@ -0,0 +1,14 @@
+package cc.winboll.studio.winboll.models;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/03/15 08:46
+ */
+public class NfcTermuxCmd {
+    public String script;       // 要执行的预制脚本名（如 auth.sh）
+    public String[] args;       // 脚本参数
+    public String workDir;      // 工作目录
+    public boolean background;  // 是否后台执行
+    public String resultDir;    // 结果输出目录（可为 null）
+}
+
--- a/winboll/src/main/java/cc/winboll/studio/winboll/models/ResponseData.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/models/ResponseData.java
@@ -0,0 +1,53 @@
+package cc.winboll.studio.winboll.models;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/06/05 11:26
+ */
+
+public class ResponseData {
+    
+    public static final String STATUS_SUCCESS = "success";
+    public static final String STATUS_ERROR = "error";
+    
+    private String status;
+    private String message;
+    private UserInfoModel data;
+    
+    public ResponseData() {
+        this.status = "";
+        this.message = "";
+        this.data = new UserInfoModel();
+    }
+    
+    public ResponseData(String status, String message, UserInfoModel data) {
+        this.status = status;
+        this.message = message;
+        this.data = data;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setData(UserInfoModel data) {
+        this.data = data;
+    }
+
+    public UserInfoModel getData() {
+        return data;
+    }
+}
+
--- a/winboll/src/main/java/cc/winboll/studio/winboll/models/TermuxButtonManager.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/models/TermuxButtonManager.java
@@ -0,0 +1,37 @@
+package cc.winboll.studio.winboll.models;
+
+import android.content.Context;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.util.ArrayList;
+
+public class TermuxButtonManager {
+
+    public static ArrayList<TermuxButtonModel> loadButtons(Context context) {
+        ArrayList<TermuxButtonModel> list = new ArrayList<TermuxButtonModel>();
+        BaseBean.loadBeanList(context, list, TermuxButtonModel.class);
+        return list;
+    }
+
+    public static boolean saveButtons(Context context, ArrayList<TermuxButtonModel> list) {
+        return BaseBean.saveBeanList(context, list, TermuxButtonModel.class);
+    }
+
+    public static void addButton(Context context, ArrayList<TermuxButtonModel> list, TermuxButtonModel button) {
+        list.add(button);
+        saveButtons(context, list);
+    }
+
+    public static void updateButton(Context context, ArrayList<TermuxButtonModel> list, int index, TermuxButtonModel button) {
+        if (index >= 0 && index < list.size()) {
+            list.set(index, button);
+            saveButtons(context, list);
+        }
+    }
+
+    public static void deleteButton(Context context, ArrayList<TermuxButtonModel> list, int index) {
+        if (index >= 0 && index < list.size()) {
+            list.remove(index);
+            saveButtons(context, list);
+        }
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/models/TermuxButtonModel.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/models/TermuxButtonModel.java
@@ -0,0 +1,142 @@
+package cc.winboll.studio.winboll.models;
+
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/04/30 10:47
+ */
+public class TermuxButtonModel extends BaseBean {
+
+    public static final String TAG = "TermuxButtonModel";
+
+    String buttonName;
+    String exeCommand;
+    String workDir;
+
+    // 已修改：isCommit 改为规范过去式命名 isCommitted
+    boolean isCommitted;
+    String commitTitle;
+    String commitInfo;
+
+    public TermuxButtonModel() {
+        this.buttonName = "";
+        this.exeCommand = "";
+        this.workDir = "";
+        // 默认初始化
+        this.isCommitted = false;
+        this.commitTitle = "";
+        this.commitInfo = "";
+    }
+
+    public void setButtonName(String buttonName) {
+        this.buttonName = buttonName;
+    }
+
+    public String getButtonName() {
+        return buttonName;
+    }
+
+    public void setExeCommand(String exeCommand) {
+        this.exeCommand = exeCommand;
+    }
+
+    public String getExeCommand() {
+        return exeCommand;
+    }
+
+    public void setWorkDir(String workDir) {
+        this.workDir = workDir;
+    }
+
+    public String getWorkDir() {
+        return workDir;
+    }
+
+    // ========== 已修改 对应 isCommitted 完整 Get & Set ==========
+    public boolean isCommitted() {
+        return isCommitted;
+    }
+
+    public void setCommitted(boolean committed) {
+        isCommitted = committed;
+    }
+
+    public String getCommitTitle() {
+        return commitTitle;
+    }
+
+    public void setCommitTitle(String commitTitle) {
+        this.commitTitle = commitTitle;
+    }
+
+    public String getCommitInfo() {
+        return commitInfo;
+    }
+
+    public void setCommitInfo(String commitInfo) {
+        this.commitInfo = commitInfo;
+    }
+
+    @Override
+    public String getName() {
+        return TermuxButtonModel.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("buttonName").value(getButtonName());
+        jsonWriter.name("exeCommand").value(getExeCommand());
+        jsonWriter.name("workDir").value(getWorkDir());
+
+        // JSON写入同步修改
+        jsonWriter.name("isCommitted").value(isCommitted());
+        jsonWriter.name("commitTitle").value(getCommitTitle());
+        jsonWriter.name("commitInfo").value(getCommitInfo());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) {
+            return true;
+        } else {
+            if (name.equals("buttonName")) {
+                setButtonName(jsonReader.nextString());
+            } else if (name.equals("exeCommand")) {
+                setExeCommand(jsonReader.nextString());
+            } else if (name.equals("workDir")) {
+                setWorkDir(jsonReader.nextString());
+            }
+            // JSON解析字段同步修改
+            else if (name.equals("isCommitted")) {
+                setCommitted(jsonReader.nextBoolean());
+            } else if (name.equals("commitTitle")) {
+                setCommitTitle(jsonReader.nextString());
+            } else if (name.equals("commitInfo")) {
+                setCommitInfo(jsonReader.nextString());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        jsonReader.endObject();
+        return this;
+    }
+
+}
+
--- a/winboll/src/main/java/cc/winboll/studio/winboll/models/TestDemoBindServiceBean.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/models/TestDemoBindServiceBean.java
@@ -0,0 +1,67 @@
+package cc.winboll.studio.winboll.models;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/03/07 12:47:22
+ * @Describe TestServiceBean
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class TestDemoBindServiceBean extends BaseBean {
+
+    public static final String TAG = "TestServiceBean";
+
+    boolean isEnable;
+
+    public TestDemoBindServiceBean() {
+        this.isEnable = false;
+    }
+
+    public void setIsEnable(boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public boolean isEnable() {
+        return isEnable;
+    }
+
+    @Override
+    public String getName() {
+        return TestDemoBindServiceBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("isEnable").value(isEnable());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("isEnable")) {
+                setIsEnable(jsonReader.nextBoolean());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/models/TestDemoServiceBean.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/models/TestDemoServiceBean.java
@@ -0,0 +1,68 @@
+package cc.winboll.studio.winboll.models;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/03/07 12:49:21
+ * @Describe TestDemoServiceBean
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class TestDemoServiceBean extends BaseBean {
+
+    public static final String TAG = "TestDemoServiceBean";
+
+    boolean isEnable;
+
+    public TestDemoServiceBean() {
+        this.isEnable = false;
+    }
+
+    public void setIsEnable(boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public boolean isEnable() {
+        return isEnable;
+    }
+
+    @Override
+    public String getName() {
+        return TestDemoServiceBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("isEnable").value(isEnable());
+
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("isEnable")) {
+                setIsEnable(jsonReader.nextBoolean());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/models/UserInfoModel.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/models/UserInfoModel.java
@@ -0,0 +1,92 @@
+package cc.winboll.studio.winboll.models;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/06/04 19:14
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class UserInfoModel extends BaseBean {
+
+    public static final String TAG = "UserInfoModel";
+
+    String username;
+    String password;
+    String token;
+
+    public UserInfoModel() {
+        this.username = "";
+        this.password = "";
+        this.token = "";
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    @Override
+    public String getName() {
+        return UserInfoModel.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("username").value(getUsername());
+        jsonWriter.name("password").value(getPassword());
+        jsonWriter.name("token").value(getToken());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("username")) {
+                setUsername(jsonReader.nextString());
+            } else if (name.equals("password")) {
+                setPassword(jsonReader.nextString());
+            } else if (name.equals("token")) {
+                setToken(jsonReader.nextString());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/models/WinBoLLModel.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/models/WinBoLLModel.java
@@ -0,0 +1,92 @@
+package cc.winboll.studio.winboll.models;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/05/10 10:16
+ * @Describe WinBoLLModel
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+import cc.winboll.studio.libappbase.APPModel;
+
+public class WinBoLLModel extends BaseBean {
+    
+    public static final String TAG = "WinBoLLModel";
+    
+    String appPackageName;
+    String appMainServiveName;
+
+    public WinBoLLModel() {
+        this.appPackageName = "";
+        this.appMainServiveName = "";
+    }
+
+    public WinBoLLModel(boolean isDebuging, String appPackageName, String appMainServiveName) {
+        this.appPackageName = appPackageName;
+        this.appMainServiveName = appMainServiveName;
+    }
+
+    public WinBoLLModel(String appPackageName, String appMainServiveName) {
+        this.appPackageName = appPackageName;
+        this.appMainServiveName = appMainServiveName;
+    }
+
+    public void setAppPackageName(String appPackageName) {
+        this.appPackageName = appPackageName;
+    }
+
+    public String getAppPackageName() {
+        return appPackageName;
+    }
+
+    public void setAppMainServiveName(String appMainServiveName) {
+        this.appMainServiveName = appMainServiveName;
+    }
+
+    public String getAppMainServiveName() {
+        return appMainServiveName;
+    }
+
+    @Override
+    public String getName() {
+        return APPModel.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("appPackageName").value(getAppPackageName());
+        jsonWriter.name("appMainServiveName").value(getAppMainServiveName());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("appPackageName")) {
+                setAppPackageName(jsonReader.nextString());
+            } else if (name.equals("appMainServiveName")) {
+                setAppMainServiveName(jsonReader.nextString());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}
+    
--- a/winboll/src/main/java/cc/winboll/studio/winboll/models/WinBoLLNewsBean.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/models/WinBoLLNewsBean.java
@@ -0,0 +1,71 @@
+package cc.winboll.studio.winboll.models;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/05/10 09:36
+ * @Describe WinBoLL 应用消息数据模型
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class WinBoLLNewsBean extends BaseBean {
+    
+    public static final String TAG = "WinBoLLNewsBean";
+    
+    String message;
+    
+    public WinBoLLNewsBean() {
+        this.message = "";
+    }
+
+    public WinBoLLNewsBean(String message) {
+        this.message = message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    @Override
+    public String getName() {
+        return WinBoLLNewsBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("message").value(getMessage());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("message")) {
+                setMessage(jsonReader.nextString());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/receivers/APPNewsWidgetClickListener.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/receivers/APPNewsWidgetClickListener.java
@@ -0,0 +1,36 @@
+package cc.winboll.studio.winboll.receivers;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/03/24 07:11:44
+ */
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.winboll.widgets.APPNewsWidget;
+
+public class APPNewsWidgetClickListener extends BroadcastReceiver {
+
+    public static final String TAG = "APPNewsWidgetClickListener";
+    public static final String ACTION_PRE = APPNewsWidgetClickListener.class.getName() + ".ACTION_PRE";
+    public static final String ACTION_NEXT = APPNewsWidgetClickListener.class.getName() + ".ACTION_NEXT";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+        if (action == null) {
+            LogUtils.d(TAG, String.format("action %s", action));
+            return;
+        }
+        if (action.equals(ACTION_PRE)) {
+            LogUtils.d(TAG, "ACTION_PRE");
+            APPNewsWidget.prePage(context);
+        } else if (action.equals(ACTION_NEXT)) {
+            LogUtils.d(TAG, "ACTION_NEXT");
+            APPNewsWidget.nextPage(context);
+        } else {
+            LogUtils.d(TAG, String.format("action %s", action));
+        }
+    }
+}
--- a/winboll/src/main/java/cc/winboll/studio/winboll/receivers/MainReceiver.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/receivers/MainReceiver.java
@@ -0,0 +1,117 @@
+package cc.winboll.studio.winboll.receivers;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/02/13 06:58:04
+ * @Describe 主要广播接收器
+ */
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.winboll.WinBoLL;
+import cc.winboll.studio.winboll.models.WinBoLLModel;
+import cc.winboll.studio.winboll.models.WinBoLLNewsBean;
+import cc.winboll.studio.winboll.services.MainService;
+import cc.winboll.studio.winboll.sos.SOS;
+import cc.winboll.studio.winboll.sos.SOSObject;
+import cc.winboll.studio.winboll.widgets.APPNewsWidget;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class MainReceiver extends BroadcastReceiver {
+
+    public static final String TAG = "MainReceiver";
+
+    public static final String ACTION_BOOT_COMPLETED = "android.intent.action.BOOT_COMPLETED";
+
+    WeakReference<MainService> mwrService;
+
+    public MainReceiver(MainService service) {
+        mwrService = new WeakReference<MainService>(service);
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String szAction = intent.getAction();
+        if (szAction.equals(ACTION_BOOT_COMPLETED)) {
+            ToastUtils.show("ACTION_BOOT_COMPLETED");
+        } else if (szAction.equals(IWinBoLLActivity.ACTION_BIND)) {
+            LogUtils.d(TAG, "ACTION_BIND");
+            LogUtils.d(TAG, String.format("context.getPackageName() %s", context.getPackageName()));
+            LogUtils.d(TAG, String.format("intent.getAction() %s", intent.getAction()));
+            String szWinBoLLModel = intent.getStringExtra(WinBoLL.EXTRA_WINBOLLMODEL);
+            LogUtils.d(TAG, String.format("szAPPModel %s", szWinBoLLModel));
+            if (szWinBoLLModel != null && !szWinBoLLModel.equals("")) {
+                try {
+                    WinBoLLModel bean = WinBoLLModel.parseStringToBean(szWinBoLLModel, WinBoLLModel.class);
+                    if (bean != null) {
+                        String szAppPackageName = bean.getAppPackageName();
+                        LogUtils.d(TAG, String.format("szAppPackageName %s", szAppPackageName));
+                        String szAppMainServiveName = bean.getAppMainServiveName();
+                        LogUtils.d(TAG, String.format("szAppMainServiveName %s", szAppMainServiveName));
+                        mwrService.get().bindWinBoLLModelConnection(bean);
+                    }
+                } catch (IOException e) {
+                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                }
+            }
+        } else if (intent.getAction().equals(SOS.ACTION_SOS)) {
+            LogUtils.d(TAG, "ACTION_SOS");
+//            String sos = intent.getStringExtra(SOS.EXTRA_OBJECT);
+//            LogUtils.d(TAG, String.format("SOS %s", sos));
+//            if (sos != null && !sos.equals("")) {
+//                SOSObject bean = SOS.parseSOSObject(sos);
+//                if (bean != null) {
+//                    String szObjectPackageName = bean.getObjectPackageName();
+//                    LogUtils.d(TAG, String.format("szObjectPackageName %s", szObjectPackageName));
+//                    String szObjectServiveName = bean.getObjectServiveName();
+//                    LogUtils.d(TAG, String.format("szObjectServiveName %s", szObjectServiveName));
+//
+//                    Intent intentService = new Intent();
+//                    intentService.setComponent(new ComponentName(szObjectPackageName, szObjectServiveName));
+//                    context.startService(intentService);
+//
+//                    String appName = AppUtils.getAppNameByPackageName(context, szObjectPackageName);
+//                    LogUtils.d(TAG, String.format("appName %s", appName));
+//                    WinBoLLNewsBean appWinBoLLNewsBean = new WinBoLLNewsBean(appName);
+//                    SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+//                    String currentTime = sdf.format(new Date());
+//                    StringBuilder sbLine = new StringBuilder();
+//                    sbLine.append("[");
+//                    sbLine.append(currentTime);
+//                    sbLine.append("] Power to ");
+//                    sbLine.append(appName);
+//                    appWinBoLLNewsBean.setMessage(sbLine.toString());
+//
+//                    APPNewsWidget.addWinBoLLNewsBean(context, appWinBoLLNewsBean);
+//
+//                    Intent intentWidget = new Intent(context, APPNewsWidget.class);
+//                    intentWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT);
+//                    context.sendBroadcast(intentWidget);
+//                }
+//
+//
+//            }
+        } else {
+            ToastUtils.show(szAction);
+        }
+    }
+
+    // 注册 Receiver
+    //
+    public void registerAction(MainService service) {
+        IntentFilter filter=new IntentFilter();
+        filter.addAction(ACTION_BOOT_COMPLETED);
+        filter.addAction(SOS.ACTION_SOS);
+        filter.addAction(WinBoLL.ACTION_BIND);
+        //filter.addAction(Intent.ACTION_BATTERY_CHANGED);
+        service.registerReceiver(this, filter);
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ZhanGSKen	2bf62a510a	Merge branch 'projects-keeper' into winboll	2026-05-16 15:36:36 +08:00
ZhanGSKen	8aaec10d74	更新输出提示，区分合并的项目类型	2026-05-16 11:17:41 +08:00
ZhanGSKen	a3d5031cdc	添加推送命令	2026-05-16 10:44:24 +08:00
ZhanGSKen	9a7f651d80	合并 APPBase 项目	2026-05-16 10:23:40 +08:00
ZhanGSKen	ba3877f3cc	合并 WinBoLL 项目	2026-05-16 10:23:40 +08:00
ZhanGSKen	7e2f48f33a	添加projects-keeper分支项目自动合并脚本。	2026-05-16 10:23:05 +08:00
ZhanGSKen	fcc81c6e1f	Restore the deleted library file	2026-05-15 20:15:27 +08:00
ZhanGSKen	e813afe8b1	中文：进入 WinBoLL 分支开发阶段英文：Entering the development stage of the WinBoLL branch	2026-05-15 20:07:12 +08:00
LaizyBoy	a8b4d31fa6	fix: 补充borderCornerRadius属性定义修复编译资源链接失败在 winboll/src/main/res/values/attrs.xml 中添加缺失的 borderCornerRadius 属性声明，该属性被 bg_container_border.xml 引用但未在当前激活的模块中定义，导致 assembleBetaDebug 编译时 AAPT 报错 resource attr/borderCornerRadius not found。	2026-05-15 14:15:33 +08:00
Transformers	99479ac830	修改文档：将 OriginMaster 重命名为 Projects_Keeper	2026-05-15 13:57:35 +08:00