<aes>APK 15.20.16 release Publish.

- App.java: CrashHandler.CrashActivity → CrashActivity，简化崩溃处理逻辑
- libaes/build.gradle: libappbase依赖版本 15.20.25 → 15.20.26

.gitignore

@@ -97,47 +97,5 @@ lint-results.html
 ## WinBoLL 基础应用(避免上传敏感配置)
 /winboll.properties
 /local.properties
-/settings.gradle
-/gradle.properties
-
-## WinBoLL 项目配置
-#.git
-#.gitignore
-#.gitmodules
-#.gradle
-#.winboll
-#GenKeyStore
-#LICENSE
-#LICENSE-Private-Demo
-#LICENSE-Private-Demo_docs
-#README.md
-#aes
-#appbase
-appkey.jks
-appkey.keystore
-autonfc
-#build.gradle
-contacts
-debugtemp
-gallery
-gpsrelaysentinel
-#gradle
-gradle.properties
-#gradle.properties-android-demo
-#gradle.properties-androidx-demo
-#gradlew
-#libaes
-#libappbase
-libdebugtemp
-libgpsrelaysentinel
-#libwinboll
-local.properties
-#local.properties-demo
-mymessagemanager
-positions
-powerbell
-settings.gradle
-#settings.gradle-demo
-#winboll
-winboll.properties
-#winboll.properties-demo
+#/settings.gradle
+#/gradle.properties

.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

.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh

@@ -0,0 +1,145 @@
+#!/system/bin/sh
+## 逻辑：按时间取最新标签 → 拉取该标签目录合并
+
+# 按创建时间取模块最新标签（最新打的标签排最后）
+get_latest_module_tag(){
+    local mod=$1
+    git for-each-ref --sort=-creatordate --format='%(refname)' refs/tags/${mod}-* \
+    | grep -v '\^{}' \
+    | head -1 \
+    | sed 's/refs\/tags\///'
+}
+
+# 通过标签获取commit
+get_commit_from_tag(){
+    local tag=$1
+    git rev-parse --short "${tag}^{commit}"
+}
+
+# 工作目录
+TARGET_DIR="/sdcard/AppProjects/Projects_Keeper_Tag"
+echo "进入目录：${TARGET_DIR}"
+cd "${TARGET_DIR}" || exit 1
+
+# 同步远程
+echo "========================================"
+echo "同步远程分支与全部版本标签"
+echo "========================================"
+git fetch origin --prune
+git fetch origin --tags
+echo "同步完成"
+echo ""
+
+# 校验目标分支
+NOW_BRANCH=$(git symbolic-ref --short HEAD)
+TARGET_BRANCH="projects_keeper_tag"
+if [ "${NOW_BRANCH}" != "${TARGET_BRANCH}" ];then
+    echo "错误：请先切换到 ${TARGET_BRANCH} 分支"
+    exit 1
+fi
+
+# 目录结构校验
+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
+)
+
+REAL_ITEMS=()
+while IFS= read -r line; do
+    [[ $line != "." && $line != ".." ]] && REAL_ITEMS+=("$line")
+done < <(ls -a)
+
+check_diff(){
+    local miss=() extra=()
+    for i in "${MERGE_OBJECTS_LIST[@]}";do
+        [[ ! " ${REAL_ITEMS[@]} " =~ " ${i} " ]] && miss+=("$i")
+    done
+    for i in "${REAL_ITEMS[@]}";do
+        [[ ! " ${MERGE_OBJECTS_LIST[@]} " =~ " ${i} " ]] && extra+=("$i")
+    done
+    if [[ ${#miss[@]} -gt 0 || ${#extra[@]} -gt 0 ]];then
+        echo "本地目录结构不一致，终止运行"
+        exit 1
+    fi
+}
+check_diff
+
+echo -e "#@@@ 按时间获取最新标签合并模块源码 @@@#"
+
+# 应用型模块
+MERGE_APP_PROJECT_LIST=(DemoAPP)
+echo -e "---------- 应用型模块 ----------"
+for name in "${MERGE_APP_PROJECT_LIST[@]}";do
+    low_name=$(echo "$name" | tr 'A-Z' 'a-z')
+    tag=$(get_latest_module_tag "${low_name}")
+    if [[ -z "${tag}" ]];then
+        echo "跳过 ${low_name}：无远程标签"
+        continue
+    fi
+    commit=$(get_commit_from_tag "${tag}")
+    if [[ -z "${commit}" ]];then
+        echo "跳过 ${low_name}：标签无有效提交点"
+        continue
+    fi
+    echo "模块:${low_name} 最新时间标签:${tag} 提交ID:${commit}"
+    # 强制拉取覆盖
+    git checkout -f "${tag}" -- "${low_name}"
+    git add "${low_name}"
+    git commit -m "合并模块${name} 同步最新时间标签${tag}"
+done
+
+# 类库模块
+MERGE_LIB_PROJECT_LIST=(WinBoLL APPBase AES)
+echo -e "---------- 类库模块 ----------"
+for name in "${MERGE_LIB_PROJECT_LIST[@]}";do
+    low_name=$(echo "$name" | tr 'A-Z' 'a-z')
+    tag=$(get_latest_module_tag "${low_name}")
+    if [[ -z "${tag}" ]];then
+        echo "跳过 ${low_name}：无远程标签"
+        continue
+    fi
+    commit=$(get_commit_from_tag "${tag}")
+    if [[ -z "${commit}" ]];then
+        echo "跳过 ${low_name}：标签无有效提交点"
+        continue
+    fi
+    echo "模块:${low_name} 最新时间标签:${tag} 提交ID:${commit}"
+    git checkout -f "${tag}" -- "${low_name}" "lib${low_name}"
+    git add "${low_name}" "lib${low_name}"
+    git commit -m "合并模块${name} 同步最新时间标签${tag}"
+done
+
+echo "全部模块合并执行完毕"
+echo "执行推送：git push"
+git push

BaseVersion.flag

@@ -0,0 +1 @@
+15.20

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 生成）

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 生成）

README.md

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

aes/README.md

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

aes/build.gradle

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

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 13:11:28 HKT 2026
-stageCount=4
+#Wed Jun 24 04:25:54 CST 2026
+stageCount=17
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.3
+publishVersion=15.20.16
 buildCount=0
-baseBetaVersion=15.20.4
+baseBetaVersion=15.20.17

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

@@ -5,10 +5,14 @@ package cc.winboll.studio.aes;
  * @Date 2024/06/13 19:03:58
  * @Describe AES应用类
  */
-import android.view.Gravity;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.CrashActivity;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 
 
 public class App extends GlobalApplication {
@@ -17,13 +21,25 @@ public class App extends GlobalApplication {
 
     @Override
     public void onCreate() {
-        super.onCreate();
-		setIsDebugging(BuildConfig.DEBUG);
-		//setIsDebugging(false);
-		WinBoLLActivityManager.init(this);
+		try {
+			super.onCreate();
+			ToastUtils.init(this);
+			WinBoLLActivityManager.init(this);
+			AESThemeUtil.init(null);
+		} catch (Throwable e) {
+			StringWriter sw = new StringWriter();
+			PrintWriter pw = new PrintWriter(sw);
+			e.printStackTrace(pw);
+			pw.close();
+			String stackTraceStr = sw.toString();
+			CrashHandleNotifyUtils.handleUncaughtException(
+				this,
+				getPackageName(),
+				stackTraceStr,
+				CrashActivity.class
+			);
+		}
 
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
     }
 
 	@Override

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

@@ -84,11 +84,12 @@ public class MainActivity extends DrawerFragmentActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
+		super.onCreateOptionsMenu(menu);
         getMenuInflater().inflate(R.menu.toolbar_main, menu);
 //        if(App.isDebugging()) {
 //            getMenuInflater().inflate(cc.winboll.studio.libaes.R.menu.toolbar_studio_debug, menu);
 //        }
-        return super.onCreateOptionsMenu(menu);
+        return true;
     }
 
     @Override

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

@@ -1,11 +1,7 @@
 package cc.winboll.studio.aes;
 
 import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import cc.winboll.studio.libaes.views.ADsControlView;
 
 /**
  * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
@@ -20,7 +16,7 @@ public class SettingsActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
-        ADsControlView adsControlView = (ADsControlView) findViewById(R.id.ads_control_view);
+        //ADsControlView adsControlView = (ADsControlView) findViewById(R.id.ads_control_view);
 		
 //		adsControlView.setOnAdsModeSelectedListener(new ADsControlView.OnAdsModeSelectedListener() {
 //				@Override

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

@@ -6,12 +6,5 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent" android:background="@drawable/bg_container_border">
 
-	<cc.winboll.studio.libaes.views.ADsControlView
-		android:id="@+id/ads_control_view"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="@drawable/bg_frame"
-		android:padding="10dp"/>
-
 </LinearLayout>
 

appbase/README.md

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

appbase/build.gradle

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

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 09:17:15 HKT 2026
-stageCount=10
+#Wed May 27 14:51:29 HKT 2026
+stageCount=23
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.9
+publishVersion=15.20.22
 buildCount=0
-baseBetaVersion=15.20.10
+baseBetaVersion=15.20.23

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

@@ -37,7 +37,7 @@ public class AboutActivity extends Activity {
         appInfo.setAppName("APPBase");
         appInfo.setAppIcon(R.drawable.ic_winboll);
         appInfo.setAppDescription(getString(R.string.app_description));
-        appInfo.setAppGitName("WinBoLL");
+        appInfo.setAppGitName("APPBase");
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(branchName);
         appInfo.setAppGitAPPSubProjectFolder(branchName);

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

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

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

@@ -2,8 +2,8 @@ package cc.winboll.studio.appbase.model;
 
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
 import java.io.IOException;
 
 /**

gradle.properties

@@ -0,0 +1,21 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+# 保持与旧版Gradle插件的兼容
+android.disableAutomaticComponentCreation=true

libaes/build.gradle

@@ -20,10 +20,11 @@ android {
         }
     }
 	
-    // 米盟 SDK
-    packagingOptions {
-         doNotStrip "*/*/libmimo_1011.so"
-    }
+     compileOptions {
+         sourceCompatibility JavaVersion.VERSION_1_7
+         targetCompatibility JavaVersion.VERSION_1_7
+     }
+
 }
 
 dependencies {
@@ -52,7 +53,7 @@ dependencies {
     //api 'androidx.fragment:fragment:1.1.0'
 	
 	// 米盟
-	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+	//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'
@@ -61,9 +62,9 @@ dependencies {
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    api 'cc.winboll.studio:libappbase:15.20.9'
+    api 'cc.winboll.studio:libappbase:15.20.33'
 	// 备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'
-	
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
+
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 13:11:09 HKT 2026
-stageCount=4
+#Wed Jun 24 04:25:54 CST 2026
+stageCount=17
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.3
+publishVersion=15.20.16
 buildCount=0
-baseBetaVersion=15.20.4
+baseBetaVersion=15.20.17

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

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

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

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

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

@@ -7,7 +7,7 @@ package cc.winboll.studio.libaes.models;
 import android.content.Context;
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
+import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
 import java.io.IOException;
 
 public class WinBoLLClientServiceBean extends BaseBean {

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

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

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

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

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

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

libaes/src/main/java/cc/winboll/studio/libaes/views/ADsBannerView.java

@@ -1,491 +0,0 @@
-package cc.winboll.studio.libaes.views;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libaes.enums.ADsMode;
-import cc.winboll.studio.libaes.utils.MimoUtils;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogUtils;
-import com.miui.zeus.mimo.sdk.ADParams;
-import com.miui.zeus.mimo.sdk.BannerAd;
-import com.miui.zeus.mimo.sdk.MimoCustomController;
-import com.miui.zeus.mimo.sdk.MimoLocation;
-import com.miui.zeus.mimo.sdk.MimoSdk;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/18 14:41
- * @Describe WinBoLL 横幅广告类
- */
-public class ADsBannerView extends LinearLayout {
-
-    public static final String TAG = "ADsBannerView";
-
-
-	private String BANNER_POS_ID = "802e356f1726f9ff39c69308bfd6f06a";
-    private String BANNER_POS_ID_WINBOLL_BETA = "d129ee5a263911f981a6dc7a9802e3e7";
-    private String BANNER_POS_ID_WINBOLL = "4ec30efdb32271765b9a4efac902828b";
-
-	/*
-	 private String BANNER_POS_ID = "802e356f1726f9ff39c69308bfd6f06a";
-	 private String BANNER_POS_ID_WINBOLL_BETA = "802e356f1726f9ff39c69308bfd6f06a";
-	 private String BANNER_POS_ID_WINBOLL = "802e356f1726f9ff39c69308bfd6f06a";
-	 */
-
-	Context mContext;
-	View mMianView;
-	SharedPreferences mSharedPreferences;
-	ViewGroup mContainer;
-	BannerAd mBannerAd;
-	List<BannerAd> mAllBanners = new ArrayList<>();
-	// 新增：主线程Handler，确保广告操作在主线程执行
-    private Handler mMainHandler;
-
-    public ADsBannerView(Context context) {
-		super(context);
-		initView(context);
-	}
-
-	public ADsBannerView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		initView(context);
-	}
-
-	public ADsBannerView(Context context, AttributeSet attrs, int defStyleAttr) {
-		super(context, attrs, defStyleAttr);
-		initView(context);
-	}
-
-	public ADsBannerView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-		super(context, attrs, defStyleAttr, defStyleRes);
-		initView(context);
-	}
-
-	void initView(Context context) {
-		this.mContext = context;
-		initMimoSdk(this.mContext);
-
-		// 初始化主线程Handler（关键：确保广告操作在主线程执行）
-		mMainHandler = new Handler(Looper.getMainLooper());
-
-		this.mMianView = inflate(this.mContext, R.layout.view_adsbanner, null);
-		mContainer = this.mMianView.findViewById(R.id.ads_container);
-		addView(this.mMianView);
-	}
-
-	public void resumeADs(final Activity activity) {
-		// 没有设置米盟广告支持就退出
-		if (ADsControlView.getAdsModeFromStatic(this.mContext) != ADsMode.MIMO_SDK) {
-			// 2. 释放之前的广告资源
-			if (mBannerAd != null) {
-				mBannerAd.destroy();
-			}
-			return;
-		}
-
-		// 修复：优化广告请求逻辑（添加生命周期判断 + 主线程执行）
-		if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) {
-			if (ADsControlView.getAdsModeFromStatic(this.mContext) == ADsMode.MIMO_SDK) {
-				LogUtils.i(TAG, "已设置播放米盟广告，正在播放...");
-				mMainHandler.postDelayed(new Runnable() {
-						@Override
-						public void run() {
-							// 再次校验生命周期，避免延迟执行时Activity已销毁
-							if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) {
-								fetchAd(activity);
-							}
-						}
-					}, 1000); // 延迟1秒请求广告，提升页面加载体验
-			}
-		}
-	}
-
-    /**
-     * 释放广告资源（关键：避免内存泄漏和空Context调用）
-     */
-    public void releaseAdResources() {
-		// 没有设置米盟广告支持就退出
-		if (ADsControlView.getAdsModeFromStatic(this.mContext) != ADsMode.MIMO_SDK) {
-			return;
-		}
-
-        LogUtils.d(TAG, "releaseAdResources()");
-
-        // 移除Handler回调
-        if (mMainHandler != null) {
-            mMainHandler.removeCallbacksAndMessages(null);
-        }
-
-        // 销毁所有广告实例
-        if (mAllBanners != null && !mAllBanners.isEmpty()) {
-            for (BannerAd ad : mAllBanners) {
-                if (ad != null) {
-                    ad.destroy();
-                }
-            }
-            mAllBanners.clear();
-        }
-        // 置空当前广告引用
-        mBannerAd = null;
-        // 移除广告容器中的视图
-        if (mContainer != null) {
-            mContainer.removeAllViews();
-        }
-    }
-
-    /**
-     * 显示广告（核心修复：传递安全的Context + 生命周期校验）
-     */
-    private void showAd(final Activity activity) {
-		// 没有设置米盟广告支持就退出
-		if (ADsControlView.getAdsModeFromStatic(this.mContext) != ADsMode.MIMO_SDK) {
-			return;
-		}
-
-        LogUtils.d(TAG, "showAd()");
-        // 1. 生命周期校验：避免Activity已销毁时操作UI
-        if (activity == null || activity.isFinishing() || activity.isDestroyed()) {
-            LogUtils.e(TAG, "showAd: Activity is finishing or destroyed");
-            return;
-        }
-        // 2. 非空校验：广告实例和容器
-        if (mBannerAd == null || mContainer == null) {
-            LogUtils.e(TAG, "showAd: BannerAd or Container is null");
-            return;
-        }
-        // 3. 创建广告容器（使用ApplicationContext避免内存泄漏）
-        final FrameLayout container = new FrameLayout(activity.getApplicationContext());
-        container.setPadding(0, 0, 0, MimoUtils.dpToPx(activity, 10));
-        mContainer.addView(container, new FrameLayout.LayoutParams(
-							   FrameLayout.LayoutParams.MATCH_PARENT,
-							   FrameLayout.LayoutParams.WRAP_CONTENT
-						   ));
-
-//        if (mIsBiddingWin) {
-//            mBannerAd.setPrice(getPrice());
-//        }
-        // 4. 显示广告：传递ApplicationContext，避免Activity Context失效
-        mBannerAd.showAd(activity, container, new BannerAd.BannerInteractionListener() {
-				@Override
-				public void onAdClick() {
-					LogUtils.d(TAG, "onAdClick");
-				}
-
-				@Override
-				public void onAdShow() {
-					LogUtils.d(TAG, "onAdShow");
-				}
-
-				@Override
-				public void onAdDismiss() {
-					LogUtils.d(TAG, "onAdDismiss");
-					// 修复：移除容器时校验Activity状态
-					if (activity != null && !activity.isFinishing() && !activity.isDestroyed() && mContainer != null) {
-						mContainer.removeView(container);
-					}
-				}
-
-				@Override
-				public void onRenderSuccess() {
-					LogUtils.d(TAG, "onRenderSuccess");
-				}
-
-				@Override
-				public void onRenderFail(int code, String msg) {
-					LogUtils.e(TAG, "onRenderFail errorCode " + code + " errorMsg " + msg);
-					// 修复：渲染失败时移除容器
-					if (activity != null && !activity.isFinishing() && !activity.isDestroyed() && mContainer != null) {
-						mContainer.removeView(container);
-					}
-				}
-			});
-    }
-
-    /**
-     * 请求广告（核心修复：Context安全校验 + 异常捕获 + 资源管理）
-     */
-    private void fetchAd(final Activity activity) {
-		// 没有设置米盟广告支持就退出
-		if (ADsControlView.getAdsModeFromStatic(this.mContext) != ADsMode.MIMO_SDK) {
-			return;
-		}
-
-        LogUtils.d(TAG, "fetchAd()");
-        // 1. 双重校验：Activity未销毁 + Context非空
-        if (activity == null || activity.isFinishing() || activity.isDestroyed() || activity.getApplicationContext() == null) {
-            LogUtils.e(TAG, "fetchAd: Invalid Context or Activity state");
-            return;
-        }
-        // 2. 释放之前的广告资源，避免内存泄漏
-        if (mBannerAd != null) {
-            mBannerAd.destroy();
-        }
-        // 3. 初始化广告（使用ApplicationContext，避免Activity Context失效）
-        try {
-            mBannerAd = new BannerAd();
-            mAllBanners.add(mBannerAd);
-        } catch (Exception e) {
-            LogUtils.e(TAG, "fetchAd: Init BannerAd failed", e);
-            return;
-        }
-        // 4. 设置下载监听
-        mBannerAd.setDownLoadListener(new BannerAd.BannerDownloadListener() {
-				@Override
-				public void onDownloadStarted() {
-					LogUtils.d(TAG, "onDownloadStarted");
-				}
-
-				@Override
-				public void onDownloadPaused() {
-					LogUtils.d(TAG, "onDownloadPaused");
-				}
-
-				@Override
-				public void onDownloadFailed(int errorCode) {
-					String msg = "onDownloadFailed, errorCode = " + errorCode;
-					LogUtils.d(TAG, msg);
-					//ToastUtils.show(msg);
-				}
-
-				@Override
-				public void onDownloadFinished() {
-					LogUtils.d(TAG, "onDownloadFinished");
-				}
-
-				@Override
-				public void onDownloadProgressUpdated(int progress) {
-					LogUtils.d(TAG, "onDownloadProgressUpdated " + progress + "%");
-				}
-
-				@Override
-				public void onInstallFailed(int errorCode) {
-					LogUtils.d(TAG, "onInstallFailed, errorCode = " + errorCode);
-				}
-
-				@Override
-				public void onInstallStart() {
-					LogUtils.d(TAG, "onInstallStart");
-				}
-
-				@Override
-				public void onInstallSuccess() {
-					LogUtils.d(TAG, "onInstallSuccess");
-				}
-
-				@Override
-				public void onDownloadCancel() {
-					LogUtils.d(TAG, "onDownloadCancel");
-				}
-			});
-
-        // 5. 构建广告参数并请求
-        String currentAD_ID = getAD_ID();
-        LogUtils.d(TAG, String.format("currentAD_ID = %s", currentAD_ID));
-        ADParams params = new ADParams.Builder().setUpId(currentAD_ID).build();
-        mBannerAd.loadAd(params, new BannerAd.BannerLoadListener() {
-				@Override
-				public void onBannerAdLoadSuccess() {
-					LogUtils.d(TAG, "onBannerAdLoadSuccess()");
-					// 修复：广告加载成功后校验Activity状态
-					if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) {
-						showAd(activity);
-						//ToastUtils.show("showAd()");
-					}
-				}
-
-				@Override
-				public void onAdLoadFailed(int errorCode, String errorMsg) {
-					String msg = "onAdLoadFailed: errorCode = " + errorCode + ", errorMsg = " + errorMsg;
-					LogUtils.d(TAG, msg);
-					removeAllBanners();
-				}
-			});
-    }
-
-	void removeAllBanners() {
-		// 没有设置米盟广告支持就退出
-		if (ADsControlView.getAdsModeFromStatic(this.mContext) != ADsMode.MIMO_SDK) {
-			return;
-		}
-
-		// 修复：加载失败时移除当前广告实例
-		if (mAllBanners.contains(mBannerAd)) {
-			mAllBanners.remove(mBannerAd);
-		}
-		mBannerAd.destroy();
-		mBannerAd = null;
-	}
-
-    /**
-     * 根据当前秒数获取广告ID（原逻辑保留）
-     */
-    private String getAD_ID() {
-        long currentSecond = System.currentTimeMillis() / 1000;
-        return (currentSecond % 2 == 0) ? BANNER_POS_ID :
-			(GlobalApplication.isDebugging() ? BANNER_POS_ID_WINBOLL_BETA : BANNER_POS_ID_WINBOLL);
-    }
-
-    /**
-     * 获取广告价格（原逻辑保留，添加空指针校验）
-     */
-//    private long getPrice() {
-//        if (mBannerAd == null) {
-//            return 0;
-//        }
-//        Map<String, Object> map = mBannerAd.getMediaExtraInfo();
-//        if (map == null || map.isEmpty() || !map.containsKey("price")) {
-//            LogUtils.w(TAG, "getPrice: media extra info is null or no price key");
-//            return 0;
-//        }
-//        Object priceObj = map.get("price");
-//        if (priceObj instanceof Long) {
-//            return (Long) priceObj;
-//        } else if (priceObj instanceof Integer) {
-//            return ((Integer) priceObj).longValue();
-//        } else {
-//            LogUtils.e(TAG, "getPrice: price type is invalid");
-//            return 0;
-//        }
-//    }
-
-    /**
-     * 显示隐私协议弹窗（原逻辑保留，优化Context使用）
-     */
-//    private void showPrivacy() {
-//        // 校验Activity状态，避免弹窗泄露
-//        if (getActivity() == null || getActivity().isFinishing() || getActivity().isDestroyed()) {
-//            return;
-//        }
-//        ADsMode adsMode = ADsControlView.getAdsModeFromStatic(this.mContext);
-//        if (adsMode == ADsMode.STANDALONE) {
-//			ADsControlView.updateAdsModeByStatic(this.mContext, ADsMode.STANDALONE);
-//            LogUtils.i(TAG, "单机模式，广告已处于不可用状态...");
-//            Toast.makeText(getActivity().getApplicationContext(), "单机模式，广告已处于不可用状态...", Toast.LENGTH_SHORT).show();
-//            return;
-//        } else if (adsMode == ADsMode.MIMO_SDK) {
-//			ADsControlView.updateAdsModeByStatic(this.mContext, ADsMode.MIMO_SDK);
-//            LogUtils.i(TAG, "米盟广告SDK支持模式，现在初始化SDK...");
-//            initMimoSdk();
-//            return;
-//        } 
-//		else {
-//			LogUtils.i(TAG, "开始弹出隐私协议...");
-//			AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-//			builder.setTitle("用户须知");
-//			builder.setMessage("小米广告SDK隐私政策: https://dev.mi.com/distribute/doc/details?pId=1688, 请复制到浏览器查看");
-//			builder.setIcon(R.drawable.ic_launcher);
-//			builder.setCancelable(false); // 点击对话框以外的区域不消失
-//			builder.setPositiveButton("同意", new DialogInterface.OnClickListener() {
-//					@Override
-//					public void onClick(DialogInterface dialog, int which) {
-//						getSharedPreferences().edit()
-//							.putString(PRIVACY_VALUE, String.valueOf(1))
-//							.apply();
-//						initMimoSdk();
-//						dialog.dismiss();
-//					}
-//				});
-//			builder.setNegativeButton("拒绝", new DialogInterface.OnClickListener() {
-//					@Override
-//					public void onClick(DialogInterface dialog, int which) {
-//						getSharedPreferences().edit()
-//							.putString(PRIVACY_VALUE, String.valueOf(0))
-//							.apply();
-//						dialog.dismiss();
-//					}
-//				});
-//			AlertDialog dialog = builder.create();
-//
-//			// 配置弹窗位置（底部全屏）
-//			Window window = dialog.getWindow();
-//			if (window != null) {
-//				window.setGravity(Gravity.BOTTOM);
-//				WindowManager m = getActivity().getWindowManager();
-//				Display d = m.getDefaultDisplay();
-//				WindowManager.LayoutParams p = window.getAttributes();
-//				p.width = d.getWidth();
-//				window.setAttributes(p);
-//			}
-//			dialog.show();
-//		}
-//    }
-
-    /**
-     * 初始化米盟SDK（核心修复：传递ApplicationContext + 异常捕获）
-     */
-    private void initMimoSdk(Context context) {
-        // 1. 安全获取ApplicationContext，避免Activity Context失效
-        Context appContext = context.getApplicationContext();
-        if (appContext == null) {
-            LogUtils.e(TAG, "initMimoSdk: ApplicationContext is null");
-            return;
-        }
-        // 2. 初始化SDK，捕获异常避免崩溃
-        try {
-            MimoSdk.init(appContext, new MimoCustomController() {
-					@Override
-					public boolean isCanUseLocation() {
-						return true;
-					}
-
-					@Override
-					public MimoLocation getMimoLocation() {
-						return null;
-					}
-
-					@Override
-					public boolean isCanUseWifiState() {
-						return true;
-					}
-
-					@Override
-					public boolean alist() {
-						return true;
-					}
-				}, new MimoSdk.InitCallback() {
-					@Override
-					public void success() {
-						LogUtils.d(TAG, "MimoSdk init success");
-					}
-
-					@Override
-					public void fail(int code, String msg) {
-						LogUtils.e(TAG, "MimoSdk init fail, code=" + code + ",msg=" + msg);
-					}
-				});
-            MimoSdk.setDebugOn(true);
-        } catch (Exception e) {
-            LogUtils.e(TAG, "initMimoSdk: init failed", e);
-        }
-    }
-
-
-    /**
-     * 获取SharedPreferences实例（原逻辑保留，添加空指针校验）
-     */
-//    SharedPreferences getSharedPreferences() {
-////        if (mSharedPreferences == null) {
-////            // 修复：使用ApplicationContext获取SharedPreferences，避免Activity Context泄露
-////            Context appContext = getActivity().getApplicationContext();
-////            if (appContext != null) {
-////                mSharedPreferences = appContext.getSharedPreferences(PRIVACY_FILE, Context.MODE_PRIVATE);
-////            } else {
-////                LogUtils.e(TAG, "getSharedPreferences: ApplicationContext is null");
-////                // 降级方案：若ApplicationContext为空，使用Activity Context（仅作兼容）
-////                mSharedPreferences = getActivity().getSharedPreferences(PRIVACY_FILE, Context.MODE_PRIVATE);
-////            }
-////        }
-//        return mSharedPreferences;
-//    }
-}

libaes/src/main/java/cc/winboll/studio/libaes/views/ADsControlView.java

@@ -1,633 +0,0 @@
-package cc.winboll.studio.libaes.views;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-import android.text.Html;
-import android.util.AttributeSet;
-import android.view.Display;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
-import android.widget.PopupWindow;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.appcompat.app.AlertDialog;
-import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libaes.enums.ADsMode;
-import cc.winboll.studio.libaes.enums.PrivacyAgreeStatus;
-import cc.winboll.studio.libaes.utils.WebUtils;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.ToastUtils;
-import com.miui.zeus.mimo.sdk.MimoCustomController;
-import com.miui.zeus.mimo.sdk.MimoLocation;
-import com.miui.zeus.mimo.sdk.MimoSdk;
-import java.lang.reflect.Field;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/26 17:51
- * @LastEditTime 2026/01/08 11:00:00 HKT
- * @Describe 广告模式控制控件（Java 7 兼容，云宝物语模式）
- * 核心修改：将PopupMenu锚点绑定到view_popmenu_anchor_point控件，菜单精准显示在锚点位置
- */
-public class ADsControlView extends LinearLayout {
-    public static final String TAG = "ADsControlView";
-
-    // SP存储配置
-    private static final String SP_NAME = "ads_control_config";
-    private static final String KEY_SELECTED_MODE = "selected_ads_mode";
-    ADsMode mADsMode;
-    private static final String PRIVACY_VALUE = "privacy_value";
-    PrivacyAgreeStatus mPrivacyAgreeStatus;
-
-    // Handler消息标识
-    private static final int MSG_UPDATE_MODE = 1001;
-
-    // 控件引用
-    private RadioGroup rgADsMode;
-    private RadioButton rbStandalone;
-    private RadioButton rbMimoSDK;
-    private RadioButton rbStoreQrcode;
-    private RelativeLayout rlWinbollStore;
-    private ImageView ivWinbollStoreQrcode;
-    // 新增：锚点控件引用
-    private TextView viewPopmenuAnchorPoint;
-
-    // 外部监听、SP实例、Handler实例
-    private OnAdsModeSelectedListener listener;
-    private SharedPreferences sharedPreferences;
-    private InternalHandler mHandler;
-    private Context mContext;
-
-    // 静态列表：存储所有已创建的控件实例
-    private static final java.util.List<ADsControlView> sControlViews = new java.util.ArrayList<ADsControlView>();
-
-    // 常量定义
-    private static final String WECHAT_STORE_URL = "https://store.weixin.qq.com/shop/b/XhrPkZgoeHo4zug";
-    private static final int MENU_ITEM_OPEN_STORE = 1001;
-
-    // 构造方法（Java 7 兼容）
-    public ADsControlView(Context context) {
-        super(context);
-        initView(context);
-    }
-
-    public ADsControlView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initView(context);
-    }
-
-    @SuppressWarnings("deprecation")
-    public ADsControlView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initView(context);
-    }
-
-    public void setPrivacyAgreeStatus(PrivacyAgreeStatus privacyAgreeStatus) {
-        this.mPrivacyAgreeStatus = privacyAgreeStatus;
-        sharedPreferences.edit().putString(PRIVACY_VALUE, this.mPrivacyAgreeStatus.name()).apply();
-    }
-
-    public PrivacyAgreeStatus getPrivacyAgreeStatus() {
-        String privacyAgreeStatusStr = sharedPreferences.getString(PRIVACY_VALUE, PrivacyAgreeStatus.UN_SIGNED.name());
-        PrivacyAgreeStatus privacyAgreeStatus = PrivacyAgreeStatus.fromString(privacyAgreeStatusStr);
-        return privacyAgreeStatus;
-    }
-
-    public void setADsMode(ADsMode mADsMode) {
-        this.mADsMode = mADsMode;
-        sharedPreferences.edit().putString(KEY_SELECTED_MODE, this.mADsMode.name()).apply();
-        updateStoreQrcodeLayoutVisibility(mADsMode);
-    }
-
-    public ADsMode getADsMode() {
-        String savedModeStr = sharedPreferences.getString(KEY_SELECTED_MODE, ADsMode.STANDALONE.name());
-        mADsMode = ADsMode.fromValue(savedModeStr);
-        return mADsMode;
-    }
-
-    /**
-     * 初始化视图、SP、Handler
-     */
-    private void initView(final Context context) {
-        this.mContext = context;
-
-        // 加载布局
-        LayoutInflater.from(context).inflate(R.layout.view_adscontrol, this, true);
-
-        // 初始化SP
-        sharedPreferences = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
-
-        // 绑定控件
-        rgADsMode = (RadioGroup) findViewById(R.id.rg_ads_mode);
-        rbStandalone = (RadioButton) findViewById(R.id.rb_standalone);
-        rbMimoSDK = (RadioButton) findViewById(R.id.rb_mimo_sdk);
-        rbStoreQrcode = (RadioButton) findViewById(R.id.rb_store_qrcode);
-        rlWinbollStore = (RelativeLayout) findViewById(R.id.rl_winboll_store);
-        ivWinbollStoreQrcode = (ImageView) findViewById(R.id.iv_winboll_store);
-        // 绑定锚点控件
-        viewPopmenuAnchorPoint = (TextView) findViewById(R.id.view_popmenu_anchor_point);
-
-        // 初始化Handler
-        mHandler = new InternalHandler(Looper.getMainLooper());
-
-        // 核心修改：初始化图片的点击和长按事件（锚点改为view_popmenu_anchor_point）
-        initImageViewClickAndLongClick();
-
-        // 注册控件实例
-        registerControlView(this);
-
-        // 从SP读取初始模式
-        setSelectedMode(getADsMode());
-
-        // 单选组选择事件监听
-        rgADsMode.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-				@Override
-				public void onCheckedChanged(RadioGroup group, int checkedId) {
-					if (checkedId == R.id.rb_standalone) {
-						setADsMode(ADsMode.STANDALONE);
-						if (listener != null) listener.onModeSelected(ADsMode.STANDALONE);
-					} else if (checkedId == R.id.rb_mimo_sdk) {
-						handlePrivacyLogic((Activity) context, PrivacyAgreeStatus.UN_SIGNED, new OnPrivacyChangeListener() {
-								@Override
-								public void onAgreePrivacy() {
-									setADsMode(ADsMode.MIMO_SDK);
-									if (listener != null) listener.onModeSelected(ADsMode.MIMO_SDK);
-								}
-
-								@Override
-								public void onDisagreePrivacy() {
-									setADsMode(ADsMode.STANDALONE);
-									setSelectedMode(ADsMode.STANDALONE);
-									if (listener != null) listener.onModeSelected(ADsMode.STANDALONE);
-								}
-							});
-					} else if (checkedId == R.id.rb_store_qrcode) {
-						setADsMode(ADsMode.STORE_QRCODE);
-						if (listener != null) listener.onModeSelected(ADsMode.STORE_QRCODE);
-					}
-				}
-			});
-    }
-
-    /**
-     * 初始化图片的点击和长按事件
-     * 核心：将PopupMenu锚点绑定到view_popmenu_anchor_point控件
-     */
-    private void initImageViewClickAndLongClick() {
-        if (ivWinbollStoreQrcode == null || viewPopmenuAnchorPoint == null) {
-            LogUtils.e(TAG, "initImageViewClickAndLongClick: 控件引用为空");
-            return;
-        }
-
-        // 1. 点击事件：简化为提示信息
-        ivWinbollStoreQrcode.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					ToastUtils.show("长按图片可打开微信小店");
-					LogUtils.d(TAG, "图片点击：提示用户长按打开微信小店");
-				}
-			});
-
-        // 2. 长按事件：锚点改为view_popmenu_anchor_point
-        ivWinbollStoreQrcode.setOnLongClickListener(new OnLongClickListener() {
-				@Override
-				public boolean onLongClick(View v) {
-					// 计算锚点控件的屏幕坐标（用于菜单位置微调）
-					int[] anchorLocation = new int[2];
-					viewPopmenuAnchorPoint.getLocationOnScreen(anchorLocation);
-					final int anchorX = anchorLocation[0];
-					final int anchorY = anchorLocation[1];
-
-					// 创建PopupMenu，锚点绑定到view_popmenu_anchor_point
-					PopupMenu popupMenu = new PopupMenu(mContext, viewPopmenuAnchorPoint);
-					// 设置菜单重力：相对锚点居中显示
-					popupMenu.setGravity(Gravity.CENTER);
-
-					Menu menu = popupMenu.getMenu();
-					menu.add(Menu.NONE, MENU_ITEM_OPEN_STORE, Menu.NONE, "打开微信小店");
-
-					// 设置菜单点击事件
-					popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-							@Override
-							public boolean onMenuItemClick(MenuItem item) {
-								if (item.getItemId() == MENU_ITEM_OPEN_STORE) {
-									WebUtils.openUrlInBrowser(mContext, WECHAT_STORE_URL);
-									return true;
-								}
-								return false;
-							}
-						});
-
-					try {
-						// 反射获取PopupWindow，微调菜单位置（可选）
-						Field popupField = PopupMenu.class.getDeclaredField("mPopup");
-						popupField.setAccessible(true);
-						Object popupObject = popupField.get(popupMenu);
-						if (popupObject instanceof PopupWindow) {
-							final PopupWindow popupWindow = (PopupWindow) popupObject;
-							popupWindow.setAnimationStyle(0); // 关闭默认动画
-
-							// 延迟微调菜单位置（确保布局测量完成）
-							new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
-									@Override
-									public void run() {
-										int menuX = anchorX + viewPopmenuAnchorPoint.getWidth() / 2 - popupWindow.getWidth() / 2;
-										int menuY = anchorY + viewPopmenuAnchorPoint.getHeight() / 2 - popupWindow.getHeight() / 2;
-										if (!popupWindow.isShowing()) {
-											popupWindow.showAtLocation(viewPopmenuAnchorPoint, Gravity.NO_GRAVITY, menuX, menuY);
-										}
-									}
-								}, 30);
-						}
-					} catch (NoSuchFieldException | IllegalAccessException e) {
-						LogUtils.e(TAG, "反射获取PopupWindow失败", e);
-					}
-
-					// 显示菜单
-					popupMenu.show();
-					LogUtils.d(TAG, "长按图片，菜单锚点为view_popmenu_anchor_point");
-					return true;
-				}
-			});
-
-        // 设置控件可交互标识
-        ivWinbollStoreQrcode.setClickable(true);
-        ivWinbollStoreQrcode.setFocusable(true);
-        ivWinbollStoreQrcode.setLongClickable(true);
-        viewPopmenuAnchorPoint.setClickable(false); // 锚点控件不可点击
-        viewPopmenuAnchorPoint.setLongClickable(false);
-    }
-
-    /**
-     * 从ImageView中提取Bitmap（保留方法，无实际调用）
-     */
-    private Bitmap getBitmapFromImageView(ImageView imageView) {
-        Drawable drawable = imageView.getDrawable();
-        if (drawable instanceof BitmapDrawable) {
-            return ((BitmapDrawable) drawable).getBitmap();
-        }
-        return null;
-    }
-
-    /**
-     * 压缩Bitmap（备用方法，无实际调用）
-     */
-    private Bitmap compressBitmapBySize(Bitmap src, int maxWidth, int maxHeight) {
-        if (src == null) return null;
-        int width = src.getWidth();
-        int height = src.getHeight();
-        float scale = Math.min((float) maxWidth / width, (float) maxHeight / height);
-        int newWidth = (int) (width * scale);
-        int newHeight = (int) (height * scale);
-        return Bitmap.createScaledBitmap(src, newWidth, newHeight, true);
-    }
-
-    /**
-     * 计算Bitmap采样率（备用方法，无实际调用）
-     */
-    private int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
-        final int height = options.outHeight;
-        final int width = options.outWidth;
-        int inSampleSize = 1;
-        if (height > reqHeight || width > reqWidth) {
-            final int halfHeight = height / 2;
-            final int halfWidth = width / 2;
-            while ((halfHeight / inSampleSize) >= reqHeight && (halfWidth / inSampleSize) >= reqWidth) {
-                inSampleSize *= 2;
-            }
-        }
-        return inSampleSize;
-    }
-
-    /**
-     * 从ImageView反射获取资源ID（备用方法，无实际调用）
-     */
-    private int getResIdFromImageView(ImageView imageView) {
-        try {
-            Field field = ImageView.class.getDeclaredField("mSrcResource");
-            field.setAccessible(true);
-            return field.getInt(imageView);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            LogUtils.e(TAG, "getResIdFromImageView: 反射失败", e);
-            return 0;
-        }
-    }
-
-    /**
-     * 更新二维码布局显示状态
-     */
-    private void updateStoreQrcodeLayoutVisibility(ADsMode mode) {
-        if (rlWinbollStore == null) return;
-        rlWinbollStore.setVisibility(mode == ADsMode.STORE_QRCODE ? View.VISIBLE : View.GONE);
-    }
-
-    /**
-     * 清理SP中的隐私协议状态
-     */
-    public static void cleanPrivacyStatus(Context context) {
-        if (context == null) {
-            LogUtils.e(TAG, "cleanPrivacyStatus: Context is null");
-            return;
-        }
-        SharedPreferences sp = getPrivacySharedPreferences(context);
-        sp.edit().remove(PRIVACY_VALUE).apply();
-        LogUtils.i(TAG, "隐私协议状态清理成功");
-        ToastUtils.show("隐私协议状态已清理");
-    }
-
-    /**
-     * 获取隐私协议SP实例
-     */
-    private static SharedPreferences getPrivacySharedPreferences(Context context) {
-        Context appContext = context.getApplicationContext();
-        if (appContext != null) {
-            return appContext.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
-        }
-        return context.getSharedPreferences(PRIVACY_VALUE, Context.MODE_PRIVATE);
-    }
-
-    /**
-     * 处理隐私协议逻辑
-     */
-    private static void handlePrivacyLogic(final Activity activity, PrivacyAgreeStatus privacyAgreeStatus, final OnPrivacyChangeListener onPrivacyChangeListener) {
-        if (privacyAgreeStatus == PrivacyAgreeStatus.REJECTED) {
-            Toast.makeText(activity.getApplicationContext(), "已拒绝隐私协议，广告已处于不可用状态", Toast.LENGTH_SHORT).show();
-            return;
-        } else if (privacyAgreeStatus == PrivacyAgreeStatus.AGREED) {
-            initMimoSdkStatic(activity.getApplicationContext());
-            return;
-        } else {
-            AlertDialog dialog = createPrivacyDialog(activity, onPrivacyChangeListener);
-            Window window = dialog.getWindow();
-            if (window != null) {
-                window.setGravity(Gravity.BOTTOM);
-                WindowManager m = activity.getWindowManager();
-                Display d = m.getDefaultDisplay();
-                WindowManager.LayoutParams p = window.getAttributes();
-                p.width = d.getWidth();
-                window.setAttributes(p);
-            }
-            dialog.show();
-        }
-    }
-
-    /**
-     * 初始化米盟SDK
-     */
-    private static void initMimoSdkStatic(Context appContext) {
-        if (appContext == null) return;
-        try {
-            MimoSdk.init(appContext, new MimoCustomController() {
-					@Override
-					public boolean isCanUseLocation() {
-						return true;
-					}
-
-					@Override
-					public MimoLocation getMimoLocation() {
-						return null;
-					}
-
-					@Override
-					public boolean isCanUseWifiState() {
-						return true;
-					}
-
-					@Override
-					public boolean alist() {
-						return true;
-					}
-				}, new MimoSdk.InitCallback() {
-					@Override
-					public void success() {
-						LogUtils.d(TAG, "米盟SDK初始化成功");
-					}
-
-					@Override
-					public void fail(int code, String msg) {
-						LogUtils.e(TAG, "米盟SDK初始化失败：" + code + ", " + msg);
-					}
-				});
-            MimoSdk.setDebugOn(true);
-        } catch (Exception e) {
-            LogUtils.e(TAG, "米盟SDK初始化异常", e);
-        }
-    }
-
-    /**
-     * 静态方法：更新SP中的模式
-     */
-    public static void updateAdsModeByStatic(Context context, ADsMode mode) {
-        if (context == null || mode == null) return;
-        SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
-        sp.edit().putString(KEY_SELECTED_MODE, mode.name()).apply();
-        InternalHandler.sendUpdateModeMessage(mode);
-    }
-
-    /**
-     * 静态方法：读取SP中的模式
-     */
-    public static ADsMode getAdsModeFromStatic(Context context) {
-        if (context == null) return ADsMode.STANDALONE;
-        SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
-        String savedModeStr = sp.getString(KEY_SELECTED_MODE, ADsMode.STANDALONE.name());
-        return ADsMode.fromValue(savedModeStr);
-    }
-
-    /**
-     * 注册控件实例
-     */
-    private static void registerControlView(ADsControlView view) {
-        synchronized (sControlViews) {
-            if (!sControlViews.contains(view)) {
-                sControlViews.add(view);
-            }
-        }
-    }
-
-    /**
-     * 移除控件实例
-     */
-    private static void unregisterControlView(ADsControlView view) {
-        synchronized (sControlViews) {
-            sControlViews.remove(view);
-        }
-    }
-
-    /**
-     * 设置选中模式
-     */
-    private void setSelectedMode(final ADsMode mode) {
-        final ADsMode mode2 = (mode == null) ? ADsMode.STANDALONE : mode;
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            if (mode2 == ADsMode.STANDALONE) {
-                rbStandalone.setChecked(true);
-            } else if (mode2 == ADsMode.MIMO_SDK) {
-                rbMimoSDK.setChecked(true);
-            } else if (mode2 == ADsMode.STORE_QRCODE) {
-                rbStoreQrcode.setChecked(true);
-            }
-            updateStoreQrcodeLayoutVisibility(mode2);
-        } else {
-            mHandler.post(new Runnable() {
-					@Override
-					public void run() {
-						setSelectedMode(mode2);
-					}
-				});
-        }
-    }
-
-    /**
-     * 获取选中模式
-     */
-    public ADsMode getSelectedMode() {
-        int checkedId = rgADsMode.getCheckedRadioButtonId();
-        if (checkedId == R.id.rb_mimo_sdk) {
-            return ADsMode.MIMO_SDK;
-        } else if (checkedId == R.id.rb_store_qrcode) {
-            return ADsMode.STORE_QRCODE;
-        } else {
-            return ADsMode.STANDALONE;
-        }
-    }
-
-    /**
-     * 设置外部监听
-     */
-    public void setOnAdsModeSelectedListener(OnAdsModeSelectedListener listener) {
-        this.listener = listener;
-    }
-
-    /**
-     * 内部Handler类
-     */
-    private static class InternalHandler extends Handler {
-        static volatile InternalHandler _InternalHandler;
-
-        public InternalHandler(Looper looper) {
-            super(looper);
-            _InternalHandler = this;
-        }
-
-        public static void sendUpdateModeMessage(ADsMode mode) {
-            if (mode == null || _InternalHandler == null) return;
-            Message msg = _InternalHandler.obtainMessage();
-            msg.what = MSG_UPDATE_MODE;
-            msg.obj = mode;
-            _InternalHandler.sendMessage(msg);
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-            if (msg.what == MSG_UPDATE_MODE) {
-                ADsMode mode = (ADsMode) msg.obj;
-                if (mode == null) return;
-                synchronized (sControlViews) {
-                    for (ADsControlView view : sControlViews) {
-                        if (view != null && view.isShown() && view.isAttachedToWindow()) {
-                            view.setSelectedMode(mode);
-                            view.updateStoreQrcodeLayoutVisibility(mode);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 生命周期：控件销毁
-     */
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        if (mHandler != null) {
-            mHandler.removeCallbacksAndMessages(null);
-        }
-        unregisterControlView(this);
-    }
-
-    /**
-     * 外部监听接口
-     */
-    public interface OnAdsModeSelectedListener {
-        void onModeSelected(ADsMode selectedMode);
-    }
-
-    /**
-     * 隐私协议监听接口
-     */
-    public interface OnPrivacyChangeListener {
-        void onAgreePrivacy();
-        void onDisagreePrivacy();
-    }
-
-    /**
-     * 创建隐私协议对话框
-     */
-    private static AlertDialog createPrivacyDialog(final Activity activity, final OnPrivacyChangeListener onPrivacyChangeListener) {
-        View dialogView = LayoutInflater.from(activity).inflate(R.layout.dialog_privacy_agreement, null);
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-        builder.setView(dialogView).setCancelable(false);
-        final AlertDialog dialog = builder.create();
-
-        final TextView tvPrivacyUrl = (TextView) dialogView.findViewById(R.id.tv_privacy_url);
-        Button btnAgree = (Button) dialogView.findViewById(R.id.btn_agree);
-        Button btnDisagree = (Button) dialogView.findViewById(R.id.btn_disagree);
-
-        tvPrivacyUrl.setText(Html.fromHtml("<u>" + tvPrivacyUrl.getText().toString() + "</u>"));
-        tvPrivacyUrl.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					String url = tvPrivacyUrl.getText().toString().trim();
-					ToastUtils.show("隐私协议链接：" + url);
-				}
-			});
-        tvPrivacyUrl.setClickable(true);
-        tvPrivacyUrl.setFocusable(true);
-
-        btnAgree.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					if (onPrivacyChangeListener != null) {
-						onPrivacyChangeListener.onAgreePrivacy();
-					}
-					dialog.dismiss();
-				}
-			});
-
-        btnDisagree.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					if (onPrivacyChangeListener != null) {
-						onPrivacyChangeListener.onDisagreePrivacy();
-					}
-					dialog.dismiss();
-				}
-			});
-
-        return dialog;
-    }
-}
-

libaes/src/main/res/layout/activity_drawerfragment.xml

@@ -56,10 +56,5 @@
 		
 	</LinearLayout>
 
-	<cc.winboll.studio.libaes.views.ADsBannerView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:id="@+id/adsbanner"/>
-
 </LinearLayout>
 

libaes/src/main/res/layout/view_adscontrol.xml

@@ -50,7 +50,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        android:layout_marginTop="0dp"> <!-- 移除顶部多余间距 -- android:background="@drawable/bg_container_border">
+        android:layout_marginTop="0dp"> <!-- 移除顶部多余间距 - android:background="@drawable/bg_container_border" -->
 
         <ImageView
             android:id="@+id/iv_winboll_store"

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

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

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

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

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

@@ -28,6 +28,6 @@
     <color name="toolbarTextColor">#FFFFFFFF</color>
     <color name="mainWindowBackgroundColor">#FFFFFFFF</color>
     <color name="mainWindowTextColor">#FF000000</color>
-    <color name="debugTextColor">#FFFF0000</color>
+    <color name="debugTextColor">#FF808080</color>
 
 </resources>

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

@@ -2,6 +2,9 @@
 <resources>
 
     <style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">#FF03AB4E</item>
+        <item name="colorPrimaryDark">#FF027C39</item>
+        <item name="colorAccent">#FF3DDC84</item>
         <item name="themeDebug">@style/DebugActivityTheme</item>
         <item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
         <item name="aboutViewTextColor">@color/mainWindowTextColor</item>
@@ -40,16 +43,16 @@
 
     <style name="AESAToolbar">
         <item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">@color/colorPrimary</item>
-        <item name="attrAToolbarEndColor">@color/colorAccent</item>
+        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
     </style>
 
     <style name="AESASupportToolbar">
         <item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">@color/colorAccent</item>
+        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
     </style>
 
     <style name="DepthAESTheme" parent="AESTheme">
@@ -83,9 +86,9 @@
     </style>
 
     <style name="TaoAESTheme" parent="AESTheme">
-        <item name="colorPrimary">#FFACACAC</item>
-        <item name="colorPrimaryDark">#FF898989</item>
-        <item name="colorAccent">#FFD8D8D8</item>
+        <item name="colorPrimary">#FF7E7E7E</item>
+        <item name="colorPrimaryDark">#FF000000</item>
+        <item name="colorAccent">#FFE2E2E2</item>
     </style>
 
     <style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog">
@@ -109,4 +112,4 @@
         <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item>
     </style>
 
-</resources>
+</resources>

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

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 09:16:45 HKT 2026
-stageCount=10
+#Wed May 27 14:51:29 HKT 2026
+stageCount=23
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.9
+publishVersion=15.20.22
 buildCount=0
-baseBetaVersion=15.20.10
+baseBetaVersion=15.20.23

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

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

@@ -2,6 +2,7 @@ package cc.winboll.studio.libappbase;
 
 import android.util.JsonReader;
 import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
 import java.io.IOException;
 
 /**

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

@@ -129,11 +129,10 @@ public class GlobalApplication extends Application {
         // 初始化单例实例（确保在所有初始化操作前完成）
         sInstance = this;
 
+        restoreDebugStatus();
         // 初始化基础组件（日志、崩溃处理、Toast）
         initCoreComponents();
-        // 恢复/初始化调试模式状态（从本地文件读取，无文件则默认关闭调试）
-        restoreDebugStatus();
-        // 新增：初始化服务器地址（从 SP 读取到内存，提高后续访问效率）
+        // 初始化服务器地址（从 SP 读取到内存，提高后续访问效率）
         initWinbollHost();
 
         LogUtils.d(TAG, "GlobalApplication 初始化完成，单例实例已创建");
@@ -144,7 +143,11 @@ public class GlobalApplication extends Application {
      */
     private void initCoreComponents() {
         // 初始化日志工具（传入 Application 上下文）
-        LogUtils.init(this);
+		
+		// 调试状态下初始化日志工具
+		if (GlobalApplication.isDebugging()) {
+			LogUtils.init(this);
+		}
         // 初始化全局异常处理器（捕获应用崩溃信息，用于调试或上报）
         CrashHandler.init(this);
         // 初始化 Toast 工具（统一 Toast 样式、避免内存泄漏等）

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

@@ -27,6 +27,11 @@ public class LogActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+		if(!GlobalApplication.isDebugging()) {
+			ToastUtils.show("非调试状态日志功能不可用");
+			finish();
+		}
+		
         // 设置布局文件（包含 LogView 控件）
         setContentView(R.layout.activity_log);
 

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

@@ -67,45 +67,29 @@ public class LogUtils {
 
     // ====================== 初始化入口 ======================
     public static void init(final Context context) {
-        init(context, LOG_LEVEL.Off);
+		init(context, LOG_LEVEL.Off);
     }
 
     public static void init(final Context context, final LOG_LEVEL logLevel) {
-        Log.d(TAG, "init 执行日志工具初始化");
-        _mContext = context;
+		if (!GlobalApplication.isDebugging()) {
+			return;
+		}
+		Log.d(TAG, "init 执行日志工具初始化");
+		_mContext = context;
 
-        if (GlobalApplication.isDebugging()) {
-            initDebugDir();
-        } else {
-            initReleaseDir();
-        }
+		initLogUtilsDir();
 
-        initLogConfigBean();
-        addClassTAGList();
-        loadTAGBeanSettings();
-        checkAndTrimLogFileSize();
+		initLogConfigBean();
+		addClassTAGList();
+		loadTAGBeanSettings();
+		checkAndTrimLogFileSize();
 
-        _IsInited = true;
-        Log.d(TAG, "init 日志工具初始化完成");
+		_IsInited = true;
+		Log.d(TAG, "init 执行日志工具初始化完成");
     }
 
     // ====================== 目录初始化 ======================
-    private static void initDebugDir() {
-        final Context appContext = _mContext.getApplicationContext();
-        _mfLogCacheDir = new File(appContext.getExternalCacheDir(), TAG);
-        if (!_mfLogCacheDir.exists()) {
-            _mfLogCacheDir.mkdirs();
-        }
-        _mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
-
-        _mfLogDataDir = appContext.getExternalFilesDir(TAG);
-        if (!_mfLogDataDir.exists()) {
-            _mfLogDataDir.mkdirs();
-        }
-        _mfLogUtilsBeanFile = new File(_mfLogDataDir, TAG + ".json");
-    }
-
-    private static void initReleaseDir() {
+    private static void initLogUtilsDir() {
         final Context appContext = _mContext.getApplicationContext();
         _mfLogCacheDir = new File(appContext.getCacheDir(), TAG);
         if (!_mfLogCacheDir.exists()) {
@@ -113,7 +97,7 @@ public class LogUtils {
         }
         _mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
 
-        _mfLogDataDir = new File(appContext.getFilesDir(), TAG);
+        _mfLogDataDir = appContext.getExternalFilesDir(TAG);
         if (!_mfLogDataDir.exists()) {
             _mfLogDataDir.mkdirs();
         }
@@ -135,8 +119,8 @@ public class LogUtils {
             return;
         }
 
-        final long MAX_FILE_SIZE = 6291456L;
-        final long KEEP_FILE_SIZE = 3145728L;
+		final long KEEP_FILE_SIZE = 25000L; // ~25KB 确保剪贴板可完整复制
+        final long MAX_FILE_SIZE = 2 * KEEP_FILE_SIZE;
         final long fileSize = _mfLogCatchFile.length();
 
         if (fileSize <= MAX_FILE_SIZE) {
@@ -266,6 +250,9 @@ public class LogUtils {
     }
 
     public static void setTAGListEnable(final String tag, final boolean isEnable) {
+        if (!_IsInited) {
+            return;
+        }
         final Iterator<Map.Entry<String, Boolean>> iterator = mapTAGList.entrySet().iterator();
         while (iterator.hasNext()) {
             final Map.Entry<String, Boolean> entry = iterator.next();
@@ -279,6 +266,9 @@ public class LogUtils {
     }
 
     public static void setALlTAGListEnable(final boolean isEnable) {
+        if (!_IsInited) {
+            return;
+        }
         for (final Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
             entry.setValue(isEnable);
         }
@@ -288,15 +278,22 @@ public class LogUtils {
 
     // ====================== 日志级别控制 ======================
     public static void setLogLevel(final LOG_LEVEL logLevel) {
+        if (_mLogUtilsBean == null) {
+            Log.d(TAG, "setLogLevel LogUtils未初始化，忽略设置日志级别");
+            return;
+        }
         _mLogUtilsBean.setLogLevel(logLevel);
         _mLogUtilsBean.saveBeanToFile(_mfLogUtilsBeanFile.getPath(), _mLogUtilsBean);
     }
 
     public static LOG_LEVEL getLogLevel() {
-        return _mLogUtilsBean.getLogLevel();
+        return _mLogUtilsBean == null ?LOG_LEVEL.Off: _mLogUtilsBean.getLogLevel();
     }
 
     private static boolean isLoggable(final String tag, final LOG_LEVEL logLevel) {
+		if (!GlobalApplication.isDebugging()) {
+			return false;
+		}
         if (!_IsInited) {
             return false;
         }

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

@@ -2,6 +2,7 @@ package cc.winboll.studio.libappbase;
 
 import android.util.JsonReader;
 import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
 import java.io.IOException;
 
 /**

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

@@ -2,6 +2,7 @@ package cc.winboll.studio.libappbase;
 
 import android.util.JsonReader;
 import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
 import java.io.IOException;
 
 /**

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

@@ -1,6 +1,7 @@
 package cc.winboll.studio.libappbase;
 
 import android.os.FileObserver;
+import java.io.File;
 import java.lang.ref.WeakReference;
 
 /**
@@ -51,30 +52,38 @@ public class LogViewThread extends Thread {
      */
     @Override
     public void run() {
-        // 获取日志缓存目录路径（从 LogUtils 统一获取，确保路径一致性）
-        String logDirPath = LogUtils.getLogCacheDir().getPath();
-        LogUtils.d(TAG, "启动日志文件监听，监听目录：" + logDirPath);
+		// 调试状态进行日志输出任务
+		if (GlobalApplication.isDebugging()) {
+			// 获取日志缓存目录路径（从 LogUtils 统一获取，确保路径一致性）
+			File logDir = LogUtils.getLogCacheDir();
+			if (logDir == null) {
+				LogUtils.d(TAG, "日志缓存目录未初始化，线程退出");
+				return;
+			}
+			String logDirPath = logDir.getPath();
+			LogUtils.d(TAG, "启动日志文件监听，监听目录：" + logDirPath);
 
-        // 初始化日志文件监听器（监听目标目录的文件事件）
-        mLogListener = new LogListener(logDirPath);
-        // 开始监听文件事件（非阻塞，内部通过 Native 层实现）
-        mLogListener.startWatching();
+			// 初始化日志文件监听器（监听目标目录的文件事件）
+			mLogListener = new LogListener(logDirPath);
+			// 开始监听文件事件（非阻塞，内部通过 Native 层实现）
+			mLogListener.startWatching();
 
-        // 循环等待退出标志（每 1 秒检查一次，降低 CPU 占用）
-        while (!isExit()) {
-            try {
-                Thread.sleep(1000); // 休眠 1 秒，避免忙等
-            } catch (InterruptedException e) {
-                // 线程被中断时，恢复中断标志并退出循环（避免无限阻塞）
-                Thread.currentThread().interrupt();
-                LogUtils.d(TAG, "日志监听线程被中断，准备退出。" + e);
-                break;
-            }
-        }
+			// 循环等待退出标志（每 1 秒检查一次，降低 CPU 占用）
+			while (!isExit()) {
+				try {
+					Thread.sleep(1000); // 休眠 1 秒，避免忙等
+				} catch (InterruptedException e) {
+					// 线程被中断时，恢复中断标志并退出循环（避免无限阻塞）
+					Thread.currentThread().interrupt();
+					LogUtils.d(TAG, "日志监听线程被中断，准备退出。" + e);
+					break;
+				}
+			}
 
-        // 收到退出标志，停止监听并释放资源
-        mLogListener.stopWatching();
-        LogUtils.d(TAG, "日志文件监听已停止，线程退出");
+			// 收到退出标志，停止监听并释放资源
+			mLogListener.stopWatching();
+			LogUtils.d(TAG, "日志文件监听已停止，线程退出");
+		}
     }
 
     /**

libappbase/src/main/java/cc/winboll/studio/libappbase/models/libs1520000/BaseBean.java

@@ -0,0 +1,415 @@
+package cc.winboll.studio.libappbase.models.libs1520000;
+
+import android.content.Context;
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.UTF8FileUtils;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+
+/**
+ * WinBoLL JSON 数据模型基类（抽象类）
+ * 定义 Json Bean 的核心规范：序列化/反序列化、文件持久化、列表处理等通用逻辑，
+ * 子类需实现抽象方法，完成自身字段JSON读写业务逻辑
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @CreateTime 2026/05/19 22:33:00
+ * @EditTime 2026/05/19 23:15:48
+ * @param <T> 泛型约束，限定子类必须继承自BaseBean
+ */
+public abstract class BaseBean<T extends BaseBean> {
+
+    // ====================== 静态常量 ======================
+    /** 日志输出标识TAG */
+    public static final String TAG = "BaseBean";
+    /** JSON存储Bean类名字段Key，用于类型校验 */
+    static final String BEAN_NAME = "BeanName";
+
+    // ====================== 构造方法 ======================
+    /**
+     * 无参空构造，满足反射实例化要求
+     */
+    public BaseBean() {
+
+    }
+
+    // ====================== 抽象方法 ======================
+    /**
+     * 获取当前实体类全类名
+     * @return 全限定类名字符串
+     */
+    public abstract String getName();
+
+    /**
+     * 从JSON读取器解析构建实体对象
+     * @param jsonReader JSON读取流
+     * @return 解析完成实体对象
+     * @throws IOException IO读写异常
+     */
+    public abstract T readBeanFromJsonReader(final JsonReader jsonReader) throws IOException;
+
+    // ====================== 路径获取相关 ======================
+    /**
+     * 获取单个实体默认存储JSON文件路径
+     * @param context 应用上下文
+     * @return 文件绝对路径
+     */
+    public String getBeanJsonFilePath(final Context context) {
+        return context.getExternalFilesDir(TAG) + "/" + getName() + ".json";
+    }
+
+    /**
+     * 获取实体列表默认存储JSON文件路径
+     * @param context 应用上下文
+     * @return 文件绝对路径
+     */
+    public String getBeanListJsonFilePath(final Context context) {
+        return context.getExternalFilesDir(TAG) + "/" + getName() + "_List.json";
+    }
+
+    // ====================== JSON序列化基础方法 ======================
+    /**
+     * 写入基础Bean标识字段至JSON
+     * @param jsonWriter JSON写入流
+     * @throws IOException 写入异常
+     */
+    public void writeThisToJsonWriter(final JsonWriter jsonWriter) throws IOException {
+        jsonWriter.name(BEAN_NAME).value(getName());
+    }
+
+    /**
+     * 基类通用字段解析回调
+     * @param jsonReader JSON读取流
+     * @param name 字段名
+     * @return 是否完成当前字段解析
+     * @throws IOException 读取异常
+     */
+    public boolean initObjectsFromJsonReader(final JsonReader jsonReader, final String name) throws IOException {
+        return false;
+    }
+
+    // ====================== 实体字符串序列化 ======================
+    @Override
+    public String toString() {
+        LogUtils.d(TAG, "执行BaseBean实体转JSON字符串");
+        final StringWriter stringWriter = new StringWriter();
+        final JsonWriter jsonWriter = new JsonWriter(stringWriter);
+        jsonWriter.setIndent("  ");
+        try {
+            jsonWriter.beginObject();
+            writeThisToJsonWriter(jsonWriter);
+            jsonWriter.endObject();
+            return stringWriter.toString();
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "实体转JSON字符串异常", Thread.currentThread().getStackTrace());
+        }
+        return "";
+    }
+
+    // ====================== 列表序列化工具 ======================
+    /**
+     * Bean列表转为格式化JSON数组字符串
+     * @param beanList 实体集合
+     * @param <T> 实体泛型
+     * @return JSON字符串
+     */
+    public static <T extends BaseBean> String toStringByBeanList(final ArrayList<T> beanList) {
+        LogUtils.d(TAG, "执行Bean列表序列化JSON操作");
+        try {
+            final StringWriter stringWriter = new StringWriter();
+            final JsonWriter jsonWriter = new JsonWriter(stringWriter);
+            jsonWriter.setIndent("  ");
+            jsonWriter.beginArray();
+            for (int i = 0; i < beanList.size(); i++) {
+                jsonWriter.beginObject();
+                beanList.get(i).writeThisToJsonWriter(jsonWriter);
+                jsonWriter.endObject();
+            }
+            jsonWriter.endArray();
+            jsonWriter.close();
+            return stringWriter.toString();
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "列表序列化JSON异常", Thread.currentThread().getStackTrace());
+        }
+        return "";
+    }
+
+    // ====================== JSON字符串解析实体 ======================
+    /**
+     * JSON文本解析为单个实体对象
+     * @param szBean JSON文本
+     * @param clazz 实体Class字节码
+     * @param <T> 实体泛型
+     * @return 解析完成实体
+     * @throws IOException 解析IO异常
+     */
+    public static <T extends BaseBean> T parseStringToBean(final String szBean, final Class<T> clazz) throws IOException {
+        LogUtils.d(TAG, "进入字符串解析实体方法，目标Class：" + clazz.getSimpleName());
+        final StringReader stringReader = new StringReader(szBean);
+        final JsonReader jsonReader = new JsonReader(stringReader);
+        try {
+            final T beanTemp = clazz.newInstance();
+            return (T) beanTemp.readBeanFromJsonReader(jsonReader);
+        } catch (final InstantiationException e) {
+            LogUtils.d(TAG, "实体反射实例化失败(InstantiationException)", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            LogUtils.d(TAG, "实体反射权限访问失败(IllegalAccessException)", Thread.currentThread().getStackTrace());
+        }
+        return null;
+    }
+
+    /**
+     * JSON数组文本解析填充实体列表
+     * @param szBeanList JSON数组文本
+     * @param beanList 目标存储集合
+     * @param clazz 实体字节码
+     * @param <T> 实体泛型
+     * @return 解析结果
+     */
+    public static <T extends BaseBean> boolean parseStringToBeanList(final String szBeanList, ArrayList<T> beanList, final Class<T> clazz) {
+        LogUtils.d(TAG, "进入列表字符串解析方法");
+        try {
+            if (beanList == null) {
+                beanList = new ArrayList<T>();
+            } else {
+                beanList.clear();
+            }
+            final StringReader stringReader = new StringReader(szBeanList);
+            final JsonReader jsonReader = new JsonReader(stringReader);
+            jsonReader.beginArray();
+            while (jsonReader.hasNext()) {
+                final T beanTemp = clazz.newInstance();
+                final T bean = (T) beanTemp.readBeanFromJsonReader(jsonReader);
+                if (bean != null) {
+                    beanList.add(bean);
+                }
+            }
+            jsonReader.endArray();
+            return true;
+        } catch (final InstantiationException e) {
+            LogUtils.d(TAG, "列表解析反射实例化异常", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            LogUtils.d(TAG, "列表解析反射权限异常", Thread.currentThread().getStackTrace());
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "列表解析JSON读写异常", Thread.currentThread().getStackTrace());
+        }
+        return false;
+    }
+
+    // ====================== 文件加载实体 ======================
+    /**
+     * 从默认路径加载单个实体
+     * @param context 上下文
+     * @param clazz 实体字节码
+     * @param <T> 实体泛型
+     * @return 加载实体
+     */
+    public static <T extends BaseBean> T loadBean(final Context context, final Class<T> clazz) {
+        LogUtils.d(TAG, "执行默认路径加载实体数据");
+        try {
+            final T beanTemp = clazz.newInstance();
+            return loadBeanFromFile(beanTemp.getBeanJsonFilePath(context), clazz);
+        } catch (final InstantiationException e) {
+            LogUtils.d(TAG, "加载实体反射实例化失败", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            LogUtils.d(TAG, "加载实体反射权限失败", Thread.currentThread().getStackTrace());
+        }
+        return null;
+    }
+
+    /**
+     * 自定义文件路径加载单个实体
+     * @param szFilePath 文件路径
+     * @param clazz 实体字节码
+     * @param <T> 实体泛型
+     * @return 实体对象
+     */
+    public static <T extends BaseBean> T loadBeanFromFile(final String szFilePath, final Class<T> clazz) {
+        LogUtils.d(TAG, "指定路径加载实体，路径：" + szFilePath);
+        try {
+            final File file = new File(szFilePath);
+            if (file.exists()) {
+                final T beanTemp = clazz.newInstance();
+                final String json = UTF8FileUtils.readStringFromFile(szFilePath);
+                return beanTemp.parseStringToBean(json, clazz);
+            }
+        } catch (final InstantiationException e) {
+            LogUtils.d(TAG, "文件加载实体反射实例化异常", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            LogUtils.d(TAG, "文件加载实体反射权限异常", Thread.currentThread().getStackTrace());
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "文件读取JSON数据异常", Thread.currentThread().getStackTrace());
+        }
+        return null;
+    }
+
+    /**
+     * 默认路径加载实体列表
+     * @param context 上下文
+     * @param beanListDst 目标集合
+     * @param clazz 实体字节码
+     * @param <T> 实体泛型
+     * @return 加载结果
+     */
+    public static <T extends BaseBean> boolean loadBeanList(final Context context, final ArrayList<T> beanListDst, final Class<T> clazz) {
+        LogUtils.d(TAG, "默认路径加载实体列表数据");
+        try {
+            final T beanTemp = clazz.newInstance();
+            return loadBeanListFromFile(beanTemp.getBeanListJsonFilePath(context), beanListDst, clazz);
+        } catch (final InstantiationException e) {
+            LogUtils.d(TAG, "列表加载反射实例化异常", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            LogUtils.d(TAG, "列表加载反射权限异常", Thread.currentThread().getStackTrace());
+        }
+        return false;
+    }
+
+    /**
+     * 自定义路径加载实体列表
+     * @param szFilePath 文件路径
+     * @param beanList 目标集合
+     * @param clazz 实体字节码
+     * @param <T> 实体泛型
+     * @return 加载结果
+     */
+    public static <T extends BaseBean> boolean loadBeanListFromFile(final String szFilePath, final ArrayList<T> beanList, final Class<T> clazz) {
+        LogUtils.d(TAG, "指定路径加载实体列表，路径：" + szFilePath);
+        try {
+            final File file = new File(szFilePath);
+            if (file.exists()) {
+                final String listJson = UTF8FileUtils.readStringFromFile(szFilePath);
+                return parseStringToBeanList(listJson, beanList, clazz);
+            }
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "列表文件读取异常", Thread.currentThread().getStackTrace());
+        }
+        return false;
+    }
+
+    // ====================== 实体数据保存文件 ======================
+    /**
+     * 默认路径保存单个实体
+     * @param context 上下文
+     * @param bean 待保存实体
+     * @param <T> 实体泛型
+     * @return 保存结果
+     */
+    public static <T extends BaseBean> boolean saveBean(final Context context, final T bean) {
+        return saveBeanToFile(bean.getBeanJsonFilePath(context), bean);
+    }
+
+    /**
+     * 自定义路径保存单个实体
+     * @param szFilePath 保存路径
+     * @param bean 待保存实体
+     * @param <T> 实体泛型
+     * @return 保存结果
+     */
+    public static <T extends BaseBean> boolean saveBeanToFile(final String szFilePath, final T bean) {
+        LogUtils.d(TAG, "执行实体数据写入文件操作");
+        try {
+            final String json = bean.toString();
+            UTF8FileUtils.writeStringToFile(szFilePath, json);
+            return true;
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "实体写入文件异常", Thread.currentThread().getStackTrace());
+        }
+        return false;
+    }
+
+    /**
+     * 默认路径保存实体列表
+     * @param context 上下文
+     * @param beanList 实体集合
+     * @param clazz 实体字节码
+     * @param <T> 实体泛型
+     * @return 保存结果
+     */
+    public static <T extends BaseBean> boolean saveBeanList(final Context context, final ArrayList<T> beanList, final Class<T> clazz) {
+        LogUtils.d(TAG, "默认路径保存实体列表数据");
+        try {
+            final T beanTemp = clazz.newInstance();
+            return saveBeanListToFile(beanTemp.getBeanListJsonFilePath(context), beanList);
+        } catch (final InstantiationException e) {
+            LogUtils.d(TAG, "列表保存反射实例化异常", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            LogUtils.d(TAG, "列表保存反射权限异常", Thread.currentThread().getStackTrace());
+        }
+        return false;
+    }
+
+    /**
+     * 自定义路径保存实体列表
+     * @param szFilePath 保存路径
+     * @param beanList 实体集合
+     * @param <T> 实体泛型
+     * @return 保存结果
+     */
+    public static <T extends BaseBean> boolean saveBeanListToFile(final String szFilePath, final ArrayList<T> beanList) {
+        LogUtils.d(TAG, "指定路径保存实体列表数据");
+        try {
+            final String json = toStringByBeanList(beanList);
+            UTF8FileUtils.writeStringToFile(szFilePath, json);
+            return true;
+        } catch (final IOException e) {
+            LogUtils.d(TAG, "列表数据写入文件异常", Thread.currentThread().getStackTrace());
+        }
+        return false;
+    }
+
+    // ====================== Bean类型一致性校验 ======================
+    /**
+     * 校验本地JSON列表内实体类型是否统一
+     * @param szFilePath 列表文件路径
+     * @param clazz 目标校验实体Class
+     * @param <T> 实体泛型
+     * @return 校验结果信息
+     */
+    public static <T extends BaseBean> String checkIsTheSameBeanListAndFile(final String szFilePath, final Class<T> clazz) {
+        final StringBuilder sbResult = new StringBuilder();
+        final String szErrorInfo = "Check Is The Same Bean List And File Error : ";
+        try {
+            int sameCount = 0;
+            int totalCount = 0;
+            final T beanTemp = clazz.newInstance();
+            final String targetBeanName = beanTemp.getName();
+            final String listJson = UTF8FileUtils.readStringFromFile(szFilePath);
+            final StringReader stringReader = new StringReader(listJson);
+            final JsonReader jsonReader = new JsonReader(stringReader);
+            jsonReader.beginArray();
+            while (jsonReader.hasNext()) {
+                totalCount++;
+                jsonReader.beginObject();
+                while (jsonReader.hasNext()) {
+                    final String name = jsonReader.nextName();
+                    if (BEAN_NAME.equals(name)) {
+                        if (targetBeanName.equals(jsonReader.nextString())) {
+                            sameCount++;
+                        }
+                    } else {
+                        jsonReader.skipValue();
+                    }
+                }
+                jsonReader.endObject();
+            }
+            jsonReader.endArray();
+            if (sameCount != totalCount) {
+                sbResult.append("Total : ").append(totalCount).append(" Diff : ").append(totalCount - sameCount);
+            }
+        } catch (final InstantiationException e) {
+            sbResult.append(szErrorInfo).append(e);
+            LogUtils.d(TAG, "类型校验反射实例化异常", Thread.currentThread().getStackTrace());
+        } catch (final IllegalAccessException e) {
+            sbResult.append(szErrorInfo).append(e);
+            LogUtils.d(TAG, "类型校验反射权限异常", Thread.currentThread().getStackTrace());
+        } catch (final IOException e) {
+            sbResult.append(szErrorInfo).append(e);
+            LogUtils.d(TAG, "类型校验文件读取解析异常", Thread.currentThread().getStackTrace());
+        }
+        return sbResult.toString();
+    }
+}
+

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

@@ -1,6 +1,8 @@
 package cc.winboll.studio.libappbase.views;
 
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
@@ -12,13 +14,12 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-
+import android.widget.Toast;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.R;
 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;
 
 /**
@@ -76,12 +77,12 @@ public class AboutView extends LinearLayout {
     private EditText metDevUserPassword;
 
     // ===================================== 页面视图控件 =====================================
-    private DebugSwitchImageView ivAppIcon;
+    private DebugSwitchInfoImageView ivAppIcon;
     private TextView tvAppNameVersion;
     private TextView tvAppDesc;
     private LinearLayout llFunctionContainer;
 	private ImageButton ibSebugStepOver;
-    private ImageButton ibSigngetDialog;
+    private ImageButton ibDebugUnlock;
     private ImageButton ibWinBoLLHostDialog;
 
     // ===================================== 构造方法（按参数从少到多排序） =====================================
@@ -195,12 +196,12 @@ public class AboutView extends LinearLayout {
 		llFunctionContainer = findViewById(R.id.ll_function_container);
 		// 功能按钮绑定
 		ibSebugStepOver = findViewById(R.id.ib_debug_step_over);
-		ibSigngetDialog = findViewById(R.id.ib_signgetdialog);
+		ibDebugUnlock = findViewById(R.id.ib_debug_unlock);
 		ibWinBoLLHostDialog = findViewById(R.id.ib_winbollhostdialog);
 
 		// 调试按钮统一只在调试模式显示
 		ibWinBoLLHostDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
-		//ibSigngetDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
+		//ibDebugUnlock.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
 		ibSebugStepOver.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
 
 		// 绑定按钮点击事件
@@ -312,6 +313,47 @@ public class AboutView extends LinearLayout {
         LogUtils.d(TAG, "initAboutPageView()：视图组装完成，功能项加载完毕");
     }
 
+    // ===================================== 调试解锁弹窗 =====================================
+    private void showDebugUnlockDialog() {
+        final AlertDialog dialog = new AlertDialog.Builder(mContext).create();
+        dialog.setTitle("应用调试解锁");
+        dialog.setCanceledOnTouchOutside(true);
+
+        final EditText etToken = new EditText(mContext);
+        etToken.setHint("请输入调试Token");
+        dialog.setView(etToken);
+
+        dialog.setButton(DialogInterface.BUTTON_POSITIVE, "调试解锁", (DialogInterface.OnClickListener) null);
+        dialog.setButton(DialogInterface.BUTTON_NEGATIVE, "关闭", (DialogInterface.OnClickListener) null);
+        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+            @Override
+            public void onShow(DialogInterface d) {
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        String inputToken = etToken.getText().toString().trim();
+                        String savedToken = DebugSwitchInfoImageView.getDebugToken();
+                        if (savedToken != null && savedToken.equals(inputToken)) {
+                            GlobalApplication.setIsDebugging(true);
+                            GlobalApplication.saveDebugStatus(GlobalApplication.getInstance());
+                            Toast.makeText(mContext, "调试解锁成功，重启应用后生效", Toast.LENGTH_SHORT).show();
+                        } else {
+                            Toast.makeText(mContext, "调试Token不匹配", Toast.LENGTH_SHORT).show();
+                            dialog.dismiss();
+                        }
+                    }
+                });
+                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        dialog.dismiss();
+                    }
+                });
+            }
+        });
+        dialog.show();
+    }
+
     // ===================================== 内部工具/事件方法 =====================================
     /**
      * 绑定功能按钮点击事件，处理正版校验、调试地址配置弹窗唤起
@@ -328,14 +370,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
@@ -344,6 +379,15 @@ public class AboutView extends LinearLayout {
 					new DebugHostDialog(mContext).show();
 				}
 			});
+
+        // 应用调试解锁按钮
+        ibDebugUnlock.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "ibDebugUnlock onClick：弹出调试解锁对话框");
+					showDebugUnlockDialog();
+				}
+			});
         LogUtils.d(TAG, "setBtnClickListener()：功能按钮点击事件绑定完成");
     }
 

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

@@ -0,0 +1,127 @@
+package cc.winboll.studio.libappbase.views;
+
+import android.app.AlertDialog;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import java.util.UUID;
+import cc.winboll.studio.libappbase.GlobalApplication;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/04/06 19:32
+ * @Describe 应用Logo控件，连续点击6次弹出调试Token对话框，支持复制与重置
+ */
+public class DebugSwitchInfoImageView extends ImageView {
+
+    public static final String TAG = "DebugSwitchInfoImageView";
+
+    // 连续点击计数
+    private int mClickCount = 0;
+    // 目标点击次数
+    private static final int TARGET_CLICK_COUNT = 7;
+
+    private static String mDebugToken = null;
+    private static final String SP_DEBUG_TOKEN = "debug_token_prefs";
+    private static final String KEY_DEBUG_TOKEN = "debug_token";
+
+    public static String getDebugToken() {
+        if (mDebugToken != null) {
+            return mDebugToken;
+        }
+        Context context = GlobalApplication.getInstance();
+        if (context != null) {
+            SharedPreferences sp = context.getSharedPreferences(SP_DEBUG_TOKEN, Context.MODE_PRIVATE);
+            mDebugToken = sp.getString(KEY_DEBUG_TOKEN, null);
+            if (mDebugToken == null) {
+                mDebugToken = UUID.randomUUID().toString();
+                sp.edit().putString(KEY_DEBUG_TOKEN, mDebugToken).apply();
+            }
+        }
+        return mDebugToken;
+    }
+
+    public static void resetDebugToken() {
+        Context context = GlobalApplication.getInstance();
+        if (context != null) {
+            mDebugToken = UUID.randomUUID().toString();
+            SharedPreferences sp = context.getSharedPreferences(SP_DEBUG_TOKEN, Context.MODE_PRIVATE);
+            sp.edit().putString(KEY_DEBUG_TOKEN, mDebugToken).apply();
+        }
+    }
+
+    private void showDebugTokenDialog() {
+        final AlertDialog dialog = new AlertDialog.Builder(getContext()).create();
+        dialog.setTitle("调试Token");
+        dialog.setMessage(getDebugToken());
+        dialog.setCanceledOnTouchOutside(false);
+        dialog.setButton(DialogInterface.BUTTON_POSITIVE, "复制到剪贴板", (DialogInterface.OnClickListener) null);
+        dialog.setButton(DialogInterface.BUTTON_NEUTRAL, "重置", (DialogInterface.OnClickListener) null);
+        dialog.setButton(DialogInterface.BUTTON_NEGATIVE, "关闭", (DialogInterface.OnClickListener) null);
+        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+            @Override
+            public void onShow(DialogInterface d) {
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        ClipboardManager cm = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                        cm.setPrimaryClip(ClipData.newPlainText("DebugToken", getDebugToken()));
+                    }
+                });
+                dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        resetDebugToken();
+                        dialog.setMessage(getDebugToken());
+                    }
+                });
+                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        dialog.dismiss();
+                    }
+                });
+            }
+        });
+        dialog.show();
+    }
+
+	public DebugSwitchInfoImageView(Context context) {
+        super(context);
+        init();
+    }
+
+    public DebugSwitchInfoImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public DebugSwitchInfoImageView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public DebugSwitchInfoImageView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init();
+    }
+
+    private void init() {
+        setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					mClickCount++;
+					if (mClickCount >= TARGET_CLICK_COUNT) {
+						mClickCount = 0;
+						showDebugTokenDialog();
+					}
+				}
+			});
+    }
+}
+

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

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

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

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

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

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

libwinboll/.gitignore

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

libwinboll/build.gradle

@@ -1,42 +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
-    }
-    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'])
-}

libwinboll/build.properties

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

libwinboll/proguard-rules.pro

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

libwinboll/src/main/AndroidManifest.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.libwinboll" >
-
-    <application>
-        <activity
-            android:name=".WinBoLLLibraryActivity">
-        </activity>
-    </application>
-
-</manifest>
-

libwinboll/src/main/java/cc/winboll/studio/libwinboll/WinBoLLLibraryActivity.java

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

libwinboll/src/main/res/layout/activity_winbolllibrary.xml

@@ -1,11 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="cc.winboll.studio.libwinboll.WinBoLLLibraryActivity"/>
-
-</LinearLayout>

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

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

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

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

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

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

settings.gradle

@@ -0,0 +1,5 @@
+// AES 项目编译设置
+include ':aes'
+include ':libaes'
+rootProject.name = "aes"
+

winboll/README.md

@@ -1,37 +0,0 @@
-# WinBoLL
-
-#### 介绍
-WinBoLL 网站浏览器。
-
-#### 软件架构
-适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
-也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
-
-
-#### Gradle 编译说明
-调试版编译命令 ：gradle assembleBetaDebug
-阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh winboll
-
-#### 使用说明
-3. Termux应用配置：
-- 已安装Termux（包名 com.termux ）；
-- 执行  echo "allow-external-apps = true" > ~/.termux/termux.properties
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
-4.  新建 Pull Request
-
-
-#### 特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
-5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
-
-#### 参考文档

winboll/app_update_description.txt

@@ -1 +0,0 @@
-

winboll/build.gradle

@@ -1,108 +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.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'])
-}

winboll/build.properties

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

winboll/proguard-rules.pro

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

winboll/src/beta/AndroidManifest.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
-
-    <application
-        tools:replace="android:icon"
-        android:icon="@drawable/ic_launcher_beta">
-
-        <!-- Put flavor specific code here -->
-
-    </application>
-
-</manifest>
-

winboll/src/beta/java/cc/winboll/studio/winboll/activities/OllamaWindowActivity.java

@@ -1,32 +0,0 @@
-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;
-    }
-}

winboll/src/beta/res/layout/activity_ollama_window.xml

@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="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>

winboll/src/beta/res/menu/menu_ollama_window.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/menu_config"
-        android:title="配置"
-        android:orderInCategory="100"
-        app:showAsAction="always" />
-
-</menu>

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

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>

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

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

winboll/src/beta/res/xml/shortcutsmaincn1.xml

@@ -1,46 +0,0 @@
-<?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>

winboll/src/beta/res/xml/shortcutsmaincn2.xml

@@ -1,46 +0,0 @@
-<?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>

winboll/src/beta/res/xml/shortcutsmainen1.xml

@@ -1,46 +0,0 @@
-<?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>

winboll/src/main/AndroidManifest.xml

@@ -1,339 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    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>

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

@@ -1,366 +0,0 @@
-package cc.winboll.studio.winboll;
-
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.widget.HorizontalScrollView;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.ToastUtils;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-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;
-        while ((len = input.read(buf)) != -1) {
-            output.write(buf, 0, len);
-        }
-    }
-
-    public static void write(File file, byte[] data) throws IOException {
-        File parent = file.getParentFile();
-        if (parent != null && !parent.exists()) parent.mkdirs();
-
-        ByteArrayInputStream input = new ByteArrayInputStream(data);
-        FileOutputStream output = new FileOutputStream(file);
-        try {
-            write(input, output);
-        } finally {
-            closeIO(input, output);
-        }
-    }
-
-    public static String toString(InputStream input) throws IOException {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        write(input, output);
-        try {
-            return output.toString("UTF-8");
-        } finally {
-            closeIO(input, output);
-        }
-    }
-
-    public static void closeIO(Closeable... closeables) {
-        for (Closeable closeable : closeables) {
-            try {
-                if (closeable != null) closeable.close();
-            } catch (IOException ignored) {}
-        }
-    }
-
-    public static class CrashHandler {
-
-        public static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER = Thread.getDefaultUncaughtExceptionHandler();
-
-        private static CrashHandler sInstance;
-
-        private PartCrashHandler mPartCrashHandler;
-
-        public static CrashHandler getInstance() {
-            if (sInstance == null) {
-                sInstance = new CrashHandler();
-            }
-            return sInstance;
-        }
-
-        public void registerGlobal(Context context) {
-            registerGlobal(context, null);
-        }
-
-        public void registerGlobal(Context context, String crashDir) {
-            Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandlerImpl(context.getApplicationContext(), crashDir));
-        }
-
-        public void unregister() {
-            Thread.setDefaultUncaughtExceptionHandler(DEFAULT_UNCAUGHT_EXCEPTION_HANDLER);
-        }
-
-        public void registerPart(Context context) {
-            unregisterPart(context);
-            mPartCrashHandler = new PartCrashHandler(context.getApplicationContext());
-            MAIN_HANDLER.postAtFrontOfQueue(mPartCrashHandler);
-        }
-
-        public void unregisterPart(Context context) {
-            if (mPartCrashHandler != null) {
-                mPartCrashHandler.isRunning.set(false);
-                mPartCrashHandler = null;
-            }
-        }
-
-        private static class PartCrashHandler implements Runnable {
-
-            private final Context mContext;
-
-            public AtomicBoolean isRunning = new AtomicBoolean(true);
-
-            public PartCrashHandler(Context context) {
-                this.mContext = context;
-            }
-
-            @Override
-            public void run() {
-                while (isRunning.get()) {
-                    try {
-                        Looper.loop();
-                    } catch (final Throwable e) {
-                        e.printStackTrace();
-                        if (isRunning.get()) {
-                            MAIN_HANDLER.post(new Runnable(){
-
-                                    @Override
-                                    public void run() {
-                                        Toast.makeText(mContext, e.toString(), Toast.LENGTH_LONG).show();
-                                    }
-                                });
-                        } else {
-                            if (e instanceof RuntimeException) {
-                                throw (RuntimeException)e;
-                            } else {
-                                throw new RuntimeException(e);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private static class UncaughtExceptionHandlerImpl implements UncaughtExceptionHandler {
-
-            private static DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss");
-
-            private final Context mContext;
-
-            private final File mCrashDir;
-
-            public UncaughtExceptionHandlerImpl(Context context, String crashDir) {
-                this.mContext = context;
-                this.mCrashDir = TextUtils.isEmpty(crashDir) ? new File(mContext.getExternalCacheDir(), "crash") : new File(crashDir);
-            }
-
-            @Override
-            public void uncaughtException(Thread thread, Throwable throwable) {
-                try {
-
-                    String log = buildLog(throwable);
-                    writeLog(log);
-
-                    try {
-                        Intent intent = new Intent(mContext, CrashActivity.class);
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        intent.putExtra(Intent.EXTRA_TEXT, log);
-                        mContext.startActivity(intent);
-                    } catch (Throwable e) {
-                        e.printStackTrace();
-                        writeLog(e.toString());
-                    }
-
-                    throwable.printStackTrace();
-                    android.os.Process.killProcess(android.os.Process.myPid());
-                    System.exit(0);
-
-                } catch (Throwable e) {
-                    if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
-                }
-            }
-
-            private String buildLog(Throwable throwable) {
-                String time = DATE_FORMAT.format(new Date());
-
-                String versionName = "unknown";
-                long versionCode = 0;
-                try {
-                    PackageInfo packageInfo = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0);
-                    versionName = packageInfo.versionName;
-                    versionCode = Build.VERSION.SDK_INT >= 28 ? packageInfo.getLongVersionCode() : packageInfo.versionCode;
-                } catch (Throwable ignored) {}
-
-                LinkedHashMap<String, String> head = new LinkedHashMap<String, String>();
-                head.put("Time Of Crash", time);
-                head.put("Device", String.format("%s, %s", Build.MANUFACTURER, Build.MODEL));
-                head.put("Android Version", String.format("%s (%d)", Build.VERSION.RELEASE, Build.VERSION.SDK_INT));
-                head.put("App Version", String.format("%s (%d)", versionName, versionCode));
-                head.put("Kernel", getKernel());
-                head.put("Support Abis", Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_ABIS != null ? Arrays.toString(Build.SUPPORTED_ABIS): "unknown");
-                head.put("Fingerprint", Build.FINGERPRINT);
-
-                StringBuilder builder = new StringBuilder();
-
-                for (String key : head.keySet()) {
-                    if (builder.length() != 0) builder.append("\n");
-                    builder.append(key);
-                    builder.append(" :    ");
-                    builder.append(head.get(key));
-                }
-
-                builder.append("\n\n");
-                builder.append(Log.getStackTraceString(throwable));
-
-                return builder.toString(); 
-            }
-
-            private void writeLog(String log) {
-                String time = DATE_FORMAT.format(new Date());
-                File file = new File(mCrashDir, "crash_" + time + ".txt");
-                try {
-                    write(file, log.getBytes("UTF-8"));
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                } 
-            }
-
-            private static String getKernel() {
-                try {
-                    return App.toString(new FileInputStream("/proc/version")).trim();
-                } catch (Throwable e) {
-                    return e.getMessage();
-                }
-            }
-        }
-    }
-
-    public static final class CrashActivity extends Activity {
-
-        private String mLog;
-
-        @Override
-        protected void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            setTheme(android.R.style.Theme_DeviceDefault);
-            setTitle("App Crash");
-
-            mLog = getIntent().getStringExtra(Intent.EXTRA_TEXT);
-
-            ScrollView contentView = new ScrollView(this);
-            contentView.setFillViewport(true);
-
-            HorizontalScrollView horizontalScrollView = new HorizontalScrollView(this);
-
-            TextView textView = new TextView(this);
-            int padding = dp2px(16);
-            textView.setPadding(padding, padding, padding, padding);
-            textView.setText(mLog);
-            textView.setTextIsSelectable(true);
-            textView.setTypeface(Typeface.DEFAULT);
-            textView.setLinksClickable(true);
-
-            horizontalScrollView.addView(textView);
-            contentView.addView(horizontalScrollView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-
-            setContentView(contentView);
-        }
-
-        private void restart() {
-            Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
-            if (intent != null) {
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                startActivity(intent);
-            }
-            finish();
-            android.os.Process.killProcess(android.os.Process.myPid());
-            System.exit(0);
-        }
-
-        private static int dp2px(float dpValue) {
-            final float scale = Resources.getSystem().getDisplayMetrics().density;
-            return (int) (dpValue * scale + 0.5f);
-        }
-
-        @Override
-        public boolean onCreateOptionsMenu(Menu menu) {
-            menu.add(0, android.R.id.copy, 0, android.R.string.copy)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            return super.onCreateOptionsMenu(menu);
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            switch (item.getItemId()) {
-                case android.R.id.copy:
-                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
-                    return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
-
-        @Override
-        public void onBackPressed() {
-            restart();
-        }
-    }
-}

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

@@ -1,97 +0,0 @@
-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();
-            }
-        }
-    }
-}

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

@@ -1,35 +0,0 @@
-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;
-    }
-}

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

@@ -1,221 +0,0 @@
-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;
-        }
-    }
-}
-

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

@@ -1,80 +0,0 @@
-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();
-    }
-}

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

@@ -1,40 +0,0 @@
-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);
-    }
-
-}

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

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

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

@@ -1,38 +0,0 @@
-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) {
-        
-    }
-}

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

@@ -1,28 +0,0 @@
-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秒
-}
-

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

@@ -1,86 +0,0 @@
-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;
-    }
-}

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

@@ -1,51 +0,0 @@
-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();
-}
-

winboll/src/main/java/cc/winboll/studio/winboll/activities/LogonActivity.java

@@ -1,150 +0,0 @@
-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());
-        }
-    }
-    
-
-}

winboll/src/main/java/cc/winboll/studio/winboll/activities/New2Activity.java

@@ -1,59 +0,0 @@
-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);
-    }
-}

winboll/src/main/java/cc/winboll/studio/winboll/activities/NewActivity.java

@@ -1,56 +0,0 @@
-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);
-    }
-}

winboll/src/main/java/cc/winboll/studio/winboll/activities/PatternLockActivity.java

@@ -1,308 +0,0 @@
-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);
-                    }
-                }
-            }
-        }
-    }
-}

winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java

@@ -1,50 +0,0 @@
-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()
-                }
-            });
-
-    }
-
-}