<winboll>APK 15.20.8 release Publish.

- cc.winboll.studio:libappbase 15.20.25 → 15.20.33
- cc.winboll.studio:libaes    15.20.14 → 15.20.16
- 注释米盟广告 SDK (mimo-ad-sdk) 依赖及相关 packagingOptions 配置

.gitignore

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

.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

.winboll/bashPublishAPKAddTagInTermux.sh

@@ -0,0 +1,228 @@
+#!/usr/bin/bash
+# ==============================================================================
+# WinBoLL 应用发布脚本
+# 功能：检查Git源码状态 → 编译Stage Release包 → 添加WinBoLL标签 → 提交并推送源码
+# 依赖：build.properties、app_update_description.txt（项目根目录下）
+# 使用：./script_name.sh <APP_NAME>
+# 作者：豆包&ZhanGSKen<zhangsken@qq.com>
+# ==============================================================================
+
+# ==================== 常量定义 ====================
+# 脚本退出码
+EXIT_CODE_SUCCESS=0
+EXIT_CODE_ERR_NO_APP_NAME=2
+EXIT_CODE_ERR_WORK_DIR=1
+EXIT_CODE_ERR_GIT_CHECK=1
+EXIT_CODE_ERR_ADD_WINBOLL_TAG=1
+
+# Gradle 任务（正式发布）
+GRADLE_TASK_PUBLISH="assembleStageRelease"
+# Gradle 任务（调试用，注释备用）
+# GRADLE_TASK_DEBUG="assembleBetaDebug"
+
+# aapt2本地覆盖参数
+AAPT2_OVERRIDE_ARG="-Pandroid.aapt2FromMavenOverride=/data/data/com.termux/files/usr/bin/aapt2"
+# 禁用Gradle守护进程
+GRADLE_NO_DAEMON="--no-daemon"
+
+# ==================== 函数定义 ====================
+# 检查Git源码是否已完全提交（无未提交变更）
+# 返回值：0=已完全提交，1=存在未提交变更
+function checkGitSources() {
+    # 配置Git安全目录（解决权限问题）
+    git config --global --add safe.directory "$(pwd)"
+    
+    # 检查是否有未提交的变更
+    if [[ -n $(git diff --stat) ]]; then
+        echo "[ERROR] Git源码存在未提交变更，请先提交所有修改！"
+        return 1
+    fi
+    
+    echo "[INFO] Git源码检查通过：所有变更已提交。"
+    return 0
+}
+
+# 询问是否添加GitHub Workflows标签（当前逻辑注释，保留扩展能力）
+# 返回值：1=用户选择是，0=用户选择否
+function askAddWorkflowsTag() {
+    read -p "是否添加GitHub Workflows标签？(Y/n) " answer
+    if [[ $answer =~ ^[Yy]$ ]]; then
+        return 1
+    else
+        return 0
+    fi
+}
+
+# 添加WinBoLL正式标签
+# 参数：$1=应用名称（项目根目录名）
+# 返回值：0=标签添加成功，1=标签已存在/添加失败
+function addWinBoLLTag() {
+    local app_name=$1
+    local build_prop_path="${app_name}/build.properties"
+    
+    # 从build.properties中提取publishVersion
+    local publish_version=$(grep -o "publishVersion=.*" "${build_prop_path}" | awk -F '=' '{print $2}')
+    if [[ -z ${publish_version} ]]; then
+        echo "[ERROR] 未从${build_prop_path}中提取到publishVersion配置！"
+        return 1
+    fi
+    echo "[INFO] 从${build_prop_path}读取到publishVersion：${publish_version}"
+    
+    # 构造WinBoLL标签（格式：<APP_NAME>-v<publishVersion>）
+    local tag="${app_name}-v${publish_version}"
+    echo "[INFO] 准备添加WinBoLL标签：${tag}"
+    
+    # 检查标签是否已存在
+    if [[ "$(git tag -l ${tag})" == "${tag}" ]]; then
+        echo "[ERROR] WinBoLL标签${tag}已存在！"
+        return 1
+    fi
+    
+    # 添加带注释的标签（注释来自app_update_description.txt）
+    git tag -a "${tag}" -F "${app_name}/app_update_description.txt"
+    echo "[INFO] WinBoLL标签${tag}添加成功！"
+    return 0
+}
+
+# 添加GitHub Workflows Beta标签（当前逻辑注释，保留扩展能力）
+# 参数：$1=应用名称（项目根目录名）
+# 返回值：0=标签添加成功，1=标签已存在/添加失败
+function addWorkflowsTag() {
+    local app_name=$1
+    local build_prop_path="${app_name}/build.properties"
+    
+    # 从build.properties中提取baseBetaVersion
+    local base_beta_version=$(grep -o "baseBetaVersion=.*" "${build_prop_path}" | awk -F '=' '{print $2}')
+    if [[ -z ${base_beta_version} ]]; then
+        echo "[ERROR] 未从${build_prop_path}中提取到baseBetaVersion配置！"
+        return 1
+    fi
+    echo "[INFO] 从${build_prop_path}读取到baseBetaVersion：${base_beta_version}"
+    
+    # 构造Workflows标签（格式：<APP_NAME>-v<baseBetaVersion>-beta）
+    local tag="${app_name}-v${base_beta_version}-beta"
+    echo "[INFO] 准备添加Workflows标签：${tag}"
+    
+    # 检查标签是否已存在
+    if [[ "$(git tag -l ${tag})" == "${tag}" ]]; then
+        echo "[ERROR] Workflows标签${tag}已存在！"
+        return 1
+    fi
+    
+    # 添加带注释的标签（注释来自app_update_description.txt）
+    git tag -a "${tag}" -F "${app_name}/app_update_description.txt"
+    echo "[INFO] Workflows标签${tag}添加成功！"
+    return 0
+}
+
+# ==================== 主流程开始 ====================
+echo "============================================="
+echo "          WinBoLL 应用发布脚本"
+echo "============================================="
+
+# 1. 检查应用名称参数是否指定
+if [ -z "$1" ]; then
+    echo "[ERROR] 未指定应用名称！使用方式：${0} <APP_NAME>"
+    exit ${EXIT_CODE_ERR_NO_APP_NAME}
+fi
+APP_NAME=$1
+echo "[INFO] 待发布应用名称：${APP_NAME}"
+
+# 2. 检查并切换到项目根目录（确保build.properties存在）
+echo "[INFO] 当前工作目录：$(pwd)"
+if [[ ! -e "${APP_NAME}/build.properties" ]]; then
+    echo "[WARNING] 当前目录不存在${APP_NAME}/build.properties，尝试切换到上级目录..."
+    cd ..
+    echo "[INFO] 切换后工作目录：$(pwd)"
+fi
+
+# 验证最终工作目录是否正确
+if [[ ! -e "${APP_NAME}/build.properties" ]]; then
+    echo "[ERROR] 工作目录错误！${APP_NAME}/build.properties 文件不存在。"
+    exit ${EXIT_CODE_ERR_WORK_DIR}
+fi
+echo "[INFO] 工作目录验证通过：${APP_NAME}/build.properties 存在。"
+
+# 3. 检查Git源码状态
+echo "---------------------------------------------"
+echo "          步骤1：检查Git源码状态"
+echo "---------------------------------------------"
+checkGitSources
+if [[ $? -ne ${EXIT_CODE_SUCCESS} ]]; then
+    echo "[ERROR] Git源码检查失败，脚本终止！"
+    exit ${EXIT_CODE_ERR_GIT_CHECK}
+fi
+
+# 4. 编译Stage Release版本APK（携带aapt2覆盖参数 + --no-daemon）
+echo "---------------------------------------------"
+echo "          步骤2：编译Stage Release APK"
+echo "---------------------------------------------"
+echo "[INFO] 开始执行Gradle任务：${GRADLE_TASK_PUBLISH}"
+# 调试用（注释正式任务，启用调试任务）
+# bash gradlew ${AAPT2_OVERRIDE_ARG} ${GRADLE_NO_DAEMON} :${APP_NAME}:${GRADLE_TASK_DEBUG}
+bash gradlew ${AAPT2_OVERRIDE_ARG} ${GRADLE_NO_DAEMON} :${APP_NAME}:${GRADLE_TASK_PUBLISH}
+
+if [[ $? -ne ${EXIT_CODE_SUCCESS} ]]; then
+    echo "[ERROR] Gradle编译任务失败！"
+    exit 1
+fi
+echo "[INFO] Stage Release APK编译成功！"
+
+# 5. 添加WinBoLL正式标签
+echo "---------------------------------------------"
+echo "          步骤3：添加WinBoLL标签"
+echo "---------------------------------------------"
+addWinBoLLTag ${APP_NAME}
+if [[ $? -ne ${EXIT_CODE_SUCCESS} ]]; then
+    echo "[ERROR] WinBoLL标签添加失败，脚本终止！"
+    exit ${EXIT_CODE_ERR_ADD_WINBOLL_TAG}
+fi
+
+# 6. （可选）添加GitHub Workflows标签（当前逻辑注释，保留扩展能力）
+# echo "---------------------------------------------"
+# echo "          步骤4：添加Workflows标签（可选）"
+# echo "---------------------------------------------"
+# echo "是否添加GitHub Workflows Beta标签？(Y/n) "
+# askAddWorkflowsTag
+# nAskAddWorkflowsTag=$?
+# if [[ ${nAskAddWorkflowsTag} -eq 1 ]]; then
+#     addWorkflowsTag ${APP_NAME}
+#     if [[ $? -ne ${EXIT_CODE_SUCCESS} ]]; then
+#         echo "[ERROR] Workflows标签添加失败，脚本终止！"
+#         exit 1
+#     fi
+# fi
+
+# 7. 清理更新描述文件
+echo "---------------------------------------------"
+echo "          步骤5：清理更新描述文件"
+echo "---------------------------------------------"
+echo "" > "${APP_NAME}/app_update_description.txt"
+echo "[INFO] 已清空${APP_NAME}/app_update_description.txt"
+
+# 8. 提交并推送源码与标签
+echo "---------------------------------------------"
+echo "          步骤6：提交并推送源码"
+echo "---------------------------------------------"
+git add .
+git commit -m "<${APP_NAME}> 开始新的Stage版本开发。"
+echo "[INFO] 源码提交成功，开始推送..."
+
+# 推送源码到远程仓库
+git push origin
+# 推送标签到远程仓库
+git push origin --tags
+
+if [[ $? -eq ${EXIT_CODE_SUCCESS} ]]; then
+    echo "[INFO] 源码与标签推送成功！"
+else
+    echo "[ERROR] 源码与标签推送失败！"
+    exit 1
+fi
+
+# ==================== 主流程结束 ====================
+echo "============================================="
+echo "          WinBoLL 应用发布完成！"
+echo "============================================="
+exit ${EXIT_CODE_SUCCESS}
+

.winboll/bashPublishLIBAddTagInTermux.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/bash
+
+# aapt2本地覆盖参数
+AAPT2_OVERRIDE_ARG="-Pandroid.aapt2FromMavenOverride=/data/data/com.termux/files/usr/bin/aapt2"
+# Gradle禁用守护进程参数
+GRADLE_NO_DAEMON="--no-daemon"
+
+# 检查是否指定了将要发布的类库名称
+# 使用 `-z` 命令检查变量是否为空
+if [ -z "$1" ]; then
+    echo "No Library name specified : $0"
+    exit 2
+fi
+
+## 正式发布使用
+git pull && bash gradlew ${AAPT2_OVERRIDE_ARG} ${GRADLE_NO_DAEMON} :$1:publishReleasePublicationToWinBoLLReleaseRepository && bash .winboll/bashCommitLibReleaseBuildFlagInfo.sh $1
+
+## 调试使用
+#bash gradlew ${AAPT2_OVERRIDE_ARG} ${GRADLE_NO_DAEMON} :$1:publishSnapshotWinBoLLPublicationToWinBoLLSnapshotRepository && bash .winboll/bashCommitLibReleaseBuildFlagInfo.sh $1
+

.winboll/winboll_app_build.gradle

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

BaseVersion.flag

@@ -1 +0,0 @@
-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**：安卓应用单一管理系列项目。
-☆ 源码汇总管理 OriginMaster**：各类分支源码合并存档，不适宜作为开发库使用。
+☆ 源码汇总管理 Projects_Keeper**：各类分支源码合并存档，不适宜作为开发库使用。
 
 ### 3. 源码合并管理推送路线图
 ⚠️ **注意**：仅仅展示不同应用模块源码的综合管理路线。分支合并操作时，必须具备 Git 管理经验。
 
-★ WinBoLL → APPBase → OriginMaster
+★ WinBoLL → APPBase → Projects_Keeper
-★ WinBoLL → AES → OriginMaster
+★ WinBoLL → AES → Projects_Keeper
-★ WinBoLL → PowerBell → OriginMaster
+★ WinBoLL → PowerBell → Projects_Keeper
-★ WinBoLL → Positions → OriginMaster
+★ WinBoLL → Positions → Projects_Keeper
 
 ## 二、WinBoLL 项目核心信息
 

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

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 13:11:28 HKT 2026
+#Tue Jun 02 08:54:20 HKT 2026
-stageCount=4
+stageCount=13
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.3
+publishVersion=15.20.12
 buildCount=0
-baseBetaVersion=15.20.4
+baseBetaVersion=15.20.13

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

@@ -5,10 +5,11 @@ 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.GlobalApplication;
 import cc.winboll.studio.libappbase.ToastUtils;
+import java.util.ArrayList;
 
 
 public class App extends GlobalApplication {
@@ -18,8 +19,7 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-		setIsDebugging(BuildConfig.DEBUG);
+		AESThemeUtil.init(null);
-		//setIsDebugging(false);
 		WinBoLLActivityManager.init(this);
 
         // 初始化 Toast 框架

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

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
+#Wed May 27 14:51:29 HKT 2026
-stageCount=10
+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;
 
 /**

debugtemp/build.gradle

@@ -1,59 +0,0 @@
-apply plugin: 'com.android.application'
-apply from: '../.winboll/winboll_app_build.gradle'
-apply from: '../.winboll/winboll_lint_build.gradle'
-
-def genVersionName(def versionName){
-    // 检查编译标志位配置
-    assert (winbollBuildProps['stageCount'] != null)
-    assert (winbollBuildProps['baseVersion'] != null)
-    // 保存基础版本号
-    winbollBuildProps.setProperty("baseVersion", "${versionName}");
-    //保存编译标志配置
-    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
-    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
-    fos.close();
-    
-    // 返回编译版本号
-    return "${versionName}." + winbollBuildProps['stageCount']
-}
-
-android {
-	// 适配MIUI12
-	compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-	
-    defaultConfig {
-        applicationId "cc.winboll.studio.debugtemp"
-	    minSdkVersion 26
-		// 适配MIUI12
-        targetSdkVersion 30
-        versionCode 1
-        // versionName 更新后需要手动设置 
-        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
-        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.20"
-        if(true) {
-            versionName = genVersionName("${versionName}")
-        }
-    }
-
-	// 确保 Java 7 兼容性（已适配项目技术栈）
-     compileOptions {
-         sourceCompatibility JavaVersion.VERSION_1_7
-         targetCompatibility JavaVersion.VERSION_1_7
-     }
-}
-
-dependencies {
-	api project(':libdebugtemp')
-	
-	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.20.3'
-    api 'cc.winboll.studio:libappbase:15.20.9'
-	
-	// WinBoLL备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:AES:aes-v15.20.3'
-	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.20.9'
-	
-	api fileTree(dir: 'libs', include: ['*.jar'])
-}

debugtemp/build.properties

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

debugtemp/src/main/AndroidManifest.xml

@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.debugtemp">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:label="@string/app_name"
-        android:theme="@style/MyAppTheme"
-        android:resizeableActivity="true"
-        android:name=".App">
-
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name">
-
-            <intent-filter>
-
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-
-            </intent-filter>
-
-        </activity>
-
-        <meta-data
-            android:name="android.max_aspect"
-            android:value="4.0"/>
-
-        <activity android:name=".GlobalApplication$CrashActivity"/>
-
-    </application>
-
-</manifest>

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

@@ -1,38 +0,0 @@
-package cc.winboll.studio.debugtemp;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.LibraryActivity;
-import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.ToastUtils;
-
-public class MainActivity extends AppCompatActivity {
-
-	LogView mLogView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-		Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
-		setSupportActionBar(toolbar);
-
-        mLogView = findViewById(R.id.logview);
-
-        ToastUtils.show("onCreate");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-
-    public void onLibraryActivity(View view) {
-		startActivity(new Intent(this, LibraryActivity.class));
-    }
-}

debugtemp/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>

debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#009688</color>
-    <color name="colorPrimaryDark">#00796B</color>
-    <color name="colorAccent">#FF9800</color>
-</resources>

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

@@ -1,4 +0,0 @@
-<resources>
-    <string name="app_name">DebugTemp</string>
-    
-</resources>

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

@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>

libaes/build.gradle

@@ -21,6 +21,11 @@ android {
     }
 	
     // 米盟 SDK
+     compileOptions {
+         sourceCompatibility JavaVersion.VERSION_1_7
+         targetCompatibility JavaVersion.VERSION_1_7
+     }
+
     packagingOptions {
          doNotStrip "*/*/libmimo_1011.so"
     }
@@ -61,9 +66,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.22'
 	// 备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'
+	api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.22'
 	
     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
+#Tue Jun 02 08:54:20 HKT 2026
-stageCount=4
+stageCount=13
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.3
+publishVersion=15.20.12
 buildCount=0
-baseBetaVersion=15.20.4
+baseBetaVersion=15.20.13

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

@@ -15,6 +15,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
+
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -22,8 +23,10 @@ import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+
 import cc.winboll.studio.libaes.DrawerMenuDataAdapter;
 import cc.winboll.studio.libaes.R;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.models.AESThemeBean;
 import cc.winboll.studio.libaes.models.DrawerMenuBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
@@ -34,8 +37,8 @@ import cc.winboll.studio.libaes.views.ADsBannerView;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import com.baoyz.widget.PullRefreshLayout;
+
 import java.util.ArrayList;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 
 public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBoLLActivity, AdapterView.OnItemClickListener {
 
@@ -44,7 +47,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 +61,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 +81,32 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         return this;
     }
 
-	@Override
+    @Override
-	public String getTag() {
+    public String getTag() {
-		return TAG;
+        return TAG;
-	}
+    }
 
     @Override
     protected void onDestroy() {
-		WinBoLLActivityManager.getInstance().registeRemove(this);
+        WinBoLLActivityManager.getInstance().registeRemove(this);
         super.onDestroy();
-		// 修复：释放广告资源，避免内存泄漏
+        // 修复：释放广告资源，避免内存泄漏
-		ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
+        ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
-		if (adsBannerView != null) {
+        if (adsBannerView != null) {
-			adsBannerView.releaseAdResources();
+            adsBannerView.releaseAdResources();
-		}
+        }
     }
 
-    /*@Override
-	 public Intent getIntent() {
-	 // TODO: Implement this method
-	 return super.getIntent();
-	 }
-
-	 public Context getContext() {
-	 return this.mContext;
-	 }*/
-
     @Override
     public MenuInflater getMenuInflater() {
-        // TODO: Implement this method
         return super.getMenuInflater();
     }
 
-    /*public void setSubtitle(CharSequence context) {
-	 // TODO: Implement this method
-	 getSupportActionBar().setSubtitle(context);
-	 }*/
-
     @Override
     public void recreate() {
         super.recreate();
     }
 
-    /*@Override
-	 public boolean moveTaskToBack(boolean nonRoot) {
-	 return super.moveTaskToBack(nonRoot);
-	 }*/
-
     @Override
     public void startActivity(Intent intent) {
         super.startActivity(intent);
@@ -135,26 +117,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 +124,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
 
     @Override
     public Context getApplicationContext() {
-        // TODO: Implement this method
         return super.getApplicationContext();
     }
 
@@ -173,25 +134,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()));
+        if (DevelopUtils.onDevelopItemSelected(this, item)) {
-		} else {
+            LogUtils.d(TAG, String.format("onOptionsItemSelected item.getItemId() %d ", item.getItemId()));
-			return super.onOptionsItemSelected(item);
+        } else {
-		}
+            return super.onOptionsItemSelected(item);
+        }
 
-		return true;
+        return true;
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
-		ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
+        ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
-		if (adsBannerView != null) {
+        if (adsBannerView != null) {
-			adsBannerView.resumeADs(DrawerFragmentActivity.this);
+            adsBannerView.resumeADs(DrawerFragmentActivity.this);
-		}
+        }
     }
 
     void initRootView() {
@@ -213,14 +176,13 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         mPullRefreshLayout = findViewById(R.id.activitydrawerfragmentPullRefreshLayout1);
 
         mPullRefreshLayout.setOnRefreshListener(new PullRefreshLayout.OnRefreshListener() {
-                @Override
+				@Override
-                public void onRefresh() {
+				public void onRefresh() {
-                    //LogUtils.d(TAG, "onRefresh");
+					reinitDrawerMenuItemList(malDrawerMenuItem);
-                    reinitDrawerMenuItemList(malDrawerMenuItem);
+					mDrawerMenuDataAdapter.notifyDataSetChanged();
-                    mDrawerMenuDataAdapter.notifyDataSetChanged();
+					mPullRefreshLayout.setRefreshing(false);
-                    mPullRefreshLayout.setRefreshing(false);
+				}
-                }
+			});
-            });
 
         malDrawerMenuItem = new ArrayList<DrawerMenuBean>();
 
@@ -236,68 +198,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
+				@Override
-                public void onClick(View v) {
+				public void onClick(View v) {
-                    if (mIsDrawerOpened || mIsDrawerOpening) {
+					if (mIsDrawerOpened || mIsDrawerOpening) {
-                        mIsDrawerClosing = true;
+						mIsDrawerClosing = true;
-                        mIsDrawerOpening = false;
+						mIsDrawerOpening = false;
-                        mDrawerLayout.closeDrawer(mPullRefreshLayout);
+						mDrawerLayout.closeDrawer(mPullRefreshLayout);
-                        return;
+						return;
-                    } 
+					}
-                    if (!mIsDrawerOpened || mIsDrawerClosing) {
+					if (!mIsDrawerOpened || mIsDrawerClosing) {
-                        mIsDrawerOpening = true;
+						mIsDrawerOpening = true;
-                        mIsDrawerClosing = false;
+						mIsDrawerClosing = false;
-                        mDrawerLayout.openDrawer(mPullRefreshLayout);
+						mDrawerLayout.openDrawer(mPullRefreshLayout);
-                        return;
+						return;
-                    }
+					}
-                }
+				}
-            });
+			});
 
         initDrawerMenuItemList(malDrawerMenuItem);
     }
@@ -305,12 +250,11 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     void initSecondaryRootView() {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
-                @Override
+				@Override
-                public void onClick(View v) {
+				public void onClick(View v) {
-                    //LogUtils.d(TAG, "onClick " + Integer.toString(v.getId()));
+					finish();
-                    finish();
+				}
-                }
+			});
-            });
     }
 
     public <T extends Fragment> int removeFragment(T fragment) {
@@ -375,13 +319,13 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         if (mActivityType == ActivityType.Main) {
-			// 主题菜单
+            // 替换为兼容版菜单加载方法
-            AESThemeUtil.inflateMenu(this, menu);
+            AESThemeUtil.inflateCompatThemeMenu(this, menu);
-			// 调试工具菜单
+            // 调试工具菜单
-			if (GlobalApplication.isDebugging()) {
+            if (GlobalApplication.isDebugging()) {
-				DevelopUtils.inflateMenu(this, menu);
+                DevelopUtils.inflateMenu(this, menu);
-			}
+            }
-			// 应用信息菜单
+            // 应用信息菜单
             getMenuInflater().inflate(R.menu.toolbar_drawerbase, menu);
         }
         return super.onCreateOptionsMenu(menu);
@@ -392,3 +336,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 {
 
@@ -42,6 +43,21 @@ public class AESThemeBean extends BaseBean {
         }
     }
 
+	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);
 
@@ -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; }
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
-        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  {
@@ -32,7 +31,8 @@ public class TestASupportToolbarActivity extends AppCompatActivity implements IW
     @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

@@ -17,7 +17,8 @@ public class TestAToolbarActivity extends Activity {
 
     @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

@@ -9,203 +9,165 @@ import android.app.Activity;
 import android.content.Context;
 import android.view.Menu;
 import android.view.MenuItem;
+
 import androidx.appcompat.app.AppCompatActivity;
+
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
 import cc.winboll.studio.libaes.models.AESThemeBean;
 
+import java.util.ArrayList;
+
 public class AESThemeUtil {
 
     public static final String TAG = "AESThemeUtil";
+    private static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
+    private static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
 
-    static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
+    // 私有静态集合，外部不可直接修改
-    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);
+     * 初始化主题样式ID集合
-        return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES): bean.getCurrentThemeTypeID();
+     */
+    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()));
+     * 应用指定主题（AppCompat 兼容 Activity）
-	 }*/
+     */
-
+    public static void applyAppCompatTheme(AppCompatActivity activity, AESThemeBean.ThemeType themeType) {
-    public static <T extends Activity> void applyAppTheme(Activity activity, AESThemeBean.ThemeType themeType) {
+        activity.setTheme(getThemeStyleID(themeType));
-        activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
     }
 
-    public static <T extends AppCompatActivity> void applyAppCompatTheme(Activity activity, AESThemeBean.ThemeType themeType) {
+    // ====================== 加载菜单 ======================
-        activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
+    /**
-    }
+     * 加载主题菜单（通用 Activity）
-
+     */
-    /*public static <T extends WinBoLLActivity> void applyWinBoLLTheme(Activity activity, AESThemeBean.ThemeType themeType) {
+    public static void inflateThemeMenu(Activity activity, Menu menu) {
-	 activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
-	 }*/
-
-    public static <T extends Activity> void inflateMenu(T activity, Menu menu) {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
     }
 
-    public static <T extends AppCompatActivity> void inflateCompatMenu(T activity, Menu menu) {
+    /**
+     * 加载主题菜单（AppCompat Activity）
+     */
+    public static void inflateCompatThemeMenu(AppCompatActivity activity, Menu menu) {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
     }
 
-    /*public static <T extends WinBoLLActivity> void inflateWinBoLLMenu(T activity, Menu menu) {
+    // ====================== 菜单点击统一核心逻辑（消除重复代码） ======================
-	 activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
+    /**
-	 }*/
+     * 主题菜单项点击统一处理
-
+     * @param context 上下文（用于持久化）
-    public static <T extends Activity> boolean onAppThemeItemSelected(T activity, MenuItem item) {
+     * @param item 点击的菜单项
-        int nThemeStyleID;
+     * @return 是否消费点击事件
-        if (R.id.item_depththeme == item.getItemId()) {
+     */
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
+    public static boolean handleThemeMenuClick(Context context, MenuItem item) {
-            saveThemeStyleID(activity, nThemeStyleID);
+        int themeStyleId;
-            return true;
+        int itemId = item.getItemId();
-        } else if (R.id.item_skytheme == item.getItemId()) {
+        if (R.id.item_depththeme == itemId) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
-            saveThemeStyleID(activity, nThemeStyleID);
+        } else if (R.id.item_skytheme == itemId) {
-            return true;
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.SKY);
-        } else if (R.id.item_goldentheme == item.getItemId()) {
+        } else if (R.id.item_goldentheme == itemId) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
-            saveThemeStyleID(activity, nThemeStyleID);
+        } else if (R.id.item_bearingtheme == itemId) {
-            return true;
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.BEARING);
-        } else if (R.id.item_bearingtheme == item.getItemId()) {
+        } else if (R.id.item_memortheme == itemId) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
-            saveThemeStyleID(activity, nThemeStyleID);
+        } else if (R.id.item_taotheme == itemId) {
-            return true;
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.TAO);
-        } else if (R.id.item_memortheme == item.getItemId()) {
+        } else if (R.id.item_defaulttheme == itemId) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
+            themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.AES);
-            saveThemeStyleID(activity, nThemeStyleID);
+        } else {
-            return true;
+            return false;
-        } else if (R.id.item_taotheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
-        } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
-            saveThemeStyleID(activity, nThemeStyleID);
-            return true;
         }
-
+        saveThemeStyleID(context, themeStyleId);
-        return false;
+        return true;
     }
 
-    public static <T extends AppCompatActivity> boolean onAppCompatThemeItemSelected(T activity, MenuItem item) {
+    // 对外暴露不同 Activity 类型的入口，内部调用统一核心方法
-        int nThemeStyleID;
+    public static boolean onThemeItemSelected(Activity activity, MenuItem item) {
-        if (R.id.item_depththeme == item.getItemId()) {
+        return handleThemeMenuClick(activity, item);
-            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;
     }
 
-    public static <T extends AppCompatActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) {
+    public static boolean onAppCompatThemeItemSelected(AppCompatActivity activity, MenuItem item) {
-        int nThemeStyleID;
+        return handleThemeMenuClick(activity, item);
-        if (R.id.item_depththeme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_skytheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_goldentheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_bearingtheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_memortheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_taotheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        }
-
-        return false;
     }
 
-    public static <T extends DrawerFragmentActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) {
+    public static boolean onWinBoLLThemeItemSelected(AppCompatActivity activity, MenuItem item) {
-        int nThemeStyleID;
+        // 使用 Application 上下文保存，避免 Activity 泄漏
-        if (R.id.item_depththeme == item.getItemId()) {
+        return handleThemeMenuClick(activity.getApplicationContext(), item);
-            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 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/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="colorPrimaryDark">#FF3DDC84</color>
-    <color name="colorAccent">#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="colorToastBackgroung">#FF3A3A3A</color>
-    <color name="colorAToolbarStartColor">#FF7D3F12</color>
+    <color name="colorAToolbarStartColor">#FF5A3A1A</color>
-    <color name="colorAToolbarCenterColor">#FFCC6E2B</color>
+    <color name="colorAToolbarCenterColor">#FFA05A2A</color>
-    <color name="colorAToolbarEndColor">#FFF4B98F</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="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrAToolbarEndColor">@color/colorAccent</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="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">@color/colorAccent</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="colorPrimaryDark">#FF4A97FF</item>
-        <item name="colorAccent">#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="colorPrimaryDark">#FF84D4FF</item>
-        <item name="colorAccent">#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="colorPrimaryDark">#FFFFE35C</item>
-        <item name="colorAccent">#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="colorPrimaryDark">#FFBA78FF</item>
-        <item name="colorAccent">#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="colorPrimaryDark">#FFFF76FA</item>
-        <item name="colorAccent">#FFFF76FA</item>
+        <item name="colorAccent">#FFE500DC</item>
     </style>
 
     <style name="TaoAESTheme" parent="AESTheme">
-        <item name="colorPrimary">#FFACACAC</item>
+        <item name="colorPrimary">#FF7E7E7E</item>
-        <item name="colorPrimaryDark">#FF898989</item>
+        <item name="colorPrimaryDark">#FFE2E2E2</item>
-        <item name="colorAccent">#FFD8D8D8</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="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrAToolbarEndColor">@color/colorAccent</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="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">@color/colorAccent</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="colorPrimary">#FF7E7E7E</item>
-        <item name="colorPrimaryDark">#FF898989</item>
+        <item name="colorPrimaryDark">#FF000000</item>
-        <item name="colorAccent">#FFD8D8D8</item>
+        <item name="colorAccent">#FFE2E2E2</item>
     </style>
 
     <style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog">

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
+#Wed May 27 14:51:29 HKT 2026
-stageCount=10
+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();
-        // 恢复/初始化调试模式状态（从本地文件读取，无文件则默认关闭调试）
+        // 初始化服务器地址（从 SP 读取到内存，提高后续访问效率）
-        restoreDebugStatus();
-        // 新增：初始化服务器地址（从 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 执行日志工具初始化");
+		if (!GlobalApplication.isDebugging()) {
-        _mContext = context;
+			return;
+		}
+		Log.d(TAG, "init 执行日志工具初始化");
+		_mContext = context;
 
-        if (GlobalApplication.isDebugging()) {
+		initLogUtilsDir();
-            initDebugDir();
-        } else {
-            initReleaseDir();
-        }
 
-        initLogConfigBean();
+		initLogConfigBean();
-        addClassTAGList();
+		addClassTAGList();
-        loadTAGBeanSettings();
+		loadTAGBeanSettings();
-        checkAndTrimLogFileSize();
+		checkAndTrimLogFileSize();
 
-        _IsInited = true;
+		_IsInited = true;
-        Log.d(TAG, "init 日志工具初始化完成");
+		Log.d(TAG, "init 执行日志工具初始化完成");
     }
 
     // ====================== 目录初始化 ======================
-    private static void initDebugDir() {
+    private static void initLogUtilsDir() {
-        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() {
         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 = 25000L; // ~25KB 确保剪贴板可完整复制
-        final long KEEP_FILE_SIZE = 3145728L;
+        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();
+		if (GlobalApplication.isDebugging()) {
-        LogUtils.d(TAG, "启动日志文件监听，监听目录：" + logDirPath);
+			// 获取日志缓存目录路径（从 LogUtils 统一获取，确保路径一致性）
+			File logDir = LogUtils.getLogCacheDir();
+			if (logDir == null) {
+				LogUtils.d(TAG, "日志缓存目录未初始化，线程退出");
+				return;
+			}
+			String logDirPath = logDir.getPath();
+			LogUtils.d(TAG, "启动日志文件监听，监听目录：" + logDirPath);
 
-        // 初始化日志文件监听器（监听目标目录的文件事件）
+			// 初始化日志文件监听器（监听目标目录的文件事件）
-        mLogListener = new LogListener(logDirPath);
+			mLogListener = new LogListener(logDirPath);
-        // 开始监听文件事件（非阻塞，内部通过 Native 层实现）
+			// 开始监听文件事件（非阻塞，内部通过 Native 层实现）
-        mLogListener.startWatching();
+			mLogListener.startWatching();
 
-        // 循环等待退出标志（每 1 秒检查一次，降低 CPU 占用）
+			// 循环等待退出标志（每 1 秒检查一次，降低 CPU 占用）
-        while (!isExit()) {
+			while (!isExit()) {
-            try {
+				try {
-                Thread.sleep(1000); // 休眠 1 秒，避免忙等
+					Thread.sleep(1000); // 休眠 1 秒，避免忙等
-            } catch (InterruptedException e) {
+				} catch (InterruptedException e) {
-                // 线程被中断时，恢复中断标志并退出循环（避免无限阻塞）
+					// 线程被中断时，恢复中断标志并退出循环（避免无限阻塞）
-                Thread.currentThread().interrupt();
+					Thread.currentThread().interrupt();
-                LogUtils.d(TAG, "日志监听线程被中断，准备退出。" + e);
+					LogUtils.d(TAG, "日志监听线程被中断，准备退出。" + e);
-                break;
+					break;
-            }
+				}
-        }
+			}
 
-        // 收到退出标志，停止监听并释放资源
+			// 收到退出标志，停止监听并释放资源
-        mLogListener.stopWatching();
+			mLogListener.stopWatching();
-        LogUtils.d(TAG, "日志文件监听已停止，线程退出");
+			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>

libdebugtemp/build.gradle

@@ -1,24 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
-apply from: '../.winboll/winboll_lib_build.gradle'
-apply from: '../.winboll/winboll_lint_build.gradle'
-
-android {
-	// 适配MIUI12
-	compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-
-    defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 30
-    }
-	
-    compileOptions {
-         sourceCompatibility JavaVersion.VERSION_1_7
-         targetCompatibility JavaVersion.VERSION_1_7
-     }
-}
-
-dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-}

libdebugtemp/build.properties

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

libdebugtemp/src/main/java/cc/winboll/studio/LibraryActivity.java

@@ -1,12 +0,0 @@
-package cc.winboll.studio;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class LibraryActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.library);
-    }
-}

libwinboll/build.gradle

@@ -0,0 +1,55 @@
+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'
+	
+	// 米盟
+	//api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+     //注意：以下5个库必须要引入
+    //implementation 'androidx.appcompat:appcompat:1.4.1'
+    api 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'com.google.code.gson:gson:2.8.5'
+    api 'com.github.bumptech.glide:glide:4.9.0'
+    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+	
+	// WinBoLL库 nexus.winboll.cc 地址
+    api 'cc.winboll.studio:libappbase:15.20.33'
+    api 'cc.winboll.studio:libaes:15.20.16'
+	
+	// 备用库 jitpack.io 地址
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
+	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.16'
+	
+    api fileTree(dir: 'libs', include: ['*.jar'])
+}

libwinboll/build.properties

@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Wed Jun 24 08:11:15 CST 2026
+stageCount=9
+libraryProject=libwinboll
+baseVersion=15.20
+publishVersion=15.20.8
+buildCount=0
+baseBetaVersion=15.20.9

libwinboll/src/main/AndroidManifest.xml

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

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

@@ -0,0 +1,17 @@
+package cc.winboll.studio.libwinboll;
+
+import android.app.Activity;
+import android.os.Bundle;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+public class WinBoLLLibraryActivity extends Activity 
+{
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_winbolllibrary);
+		
+		ToastUtils.show("WinBoLLLibraryActivity onCreate");
+    }
+}

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

@@ -4,8 +4,8 @@
     android:gravity="center">
 
     <TextView
-        android:text="@string/text_libraryactivity"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:text="cc.winboll.studio.libwinboll.WinBoLLLibraryActivity"/>
 
 </LinearLayout>

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

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

winboll/README.md

@@ -1,7 +1,7 @@
 # WinBoLL
 
 #### 介绍
-WinBoLL 应用编译功能临时调试项目
+WinBoLL 网站浏览器。
 
 #### 软件架构
 适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
@@ -10,7 +10,7 @@ WinBoLL 应用编译功能临时调试项目
 
 #### Gradle 编译说明
 调试版编译命令 ：gradle assembleBetaDebug
-阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh debugtemp
+阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh winboll
 
 #### 使用说明
 3. Termux应用配置：
@@ -21,7 +21,7 @@ WinBoLL 应用编译功能临时调试项目
 
 1.  Fork 本仓库
 2.  新建 Feat_xxx 分支
-3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
+3.  提交代码 : ZhanGSKen(ZhanGSKen<ZhanGSKen@QQ.COM>)
 4.  新建 Pull Request
 
 

winboll/build.gradle

@@ -0,0 +1,108 @@
+apply plugin: 'com.android.application'
+apply from: '../.winboll/winboll_app_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+def genVersionName(def versionName){
+    // 检查编译标志位配置
+    assert (winbollBuildProps['stageCount'] != null)
+    assert (winbollBuildProps['baseVersion'] != null)
+    // 保存基础版本号
+    winbollBuildProps.setProperty("baseVersion", "${versionName}");
+    //保存编译标志配置
+    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
+    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
+    fos.close();
+    
+    // 返回编译版本号
+    return "${versionName}." + winbollBuildProps['stageCount']
+}
+
+android {
+	// 适配MIUI12
+	compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+	
+    defaultConfig {
+        applicationId "cc.winboll.studio.winboll"
+        minSdkVersion 26
+		// 适配MIUI12
+        targetSdkVersion 30
+        versionCode 1
+        // versionName 更新后需要手动设置 
+        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
+        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
+        versionName "15.20"
+        if(true) {
+            versionName = genVersionName("${versionName}")
+        }
+    }
+}
+
+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'
+
+	// Biometric (指纹识别)
+	implementation 'androidx.biometric:biometric:1.1.0'
+	
+	// WinBoLL库 nexus.winboll.cc 地址
+    api 'cc.winboll.studio:libappbase:15.20.33'
+    api 'cc.winboll.studio:libaes:15.20.16'
+	
+	// 备用库 jitpack.io 地址
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
+	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.16'
+	
+	api fileTree(dir: 'libs', include: ['*.jar'])
+}

winboll/build.properties

@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Wed Jun 24 08:11:15 CST 2026
+stageCount=9
+libraryProject=libwinboll
+baseVersion=15.20
+publishVersion=15.20.8
+buildCount=0
+baseBetaVersion=15.20.9

winboll/src/beta/AndroidManifest.xml

@@ -2,7 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" >
 
-    <application>
+    <application
+        tools:replace="android:icon"
+        android:icon="@drawable/ic_launcher_beta">
 
         <!-- Put flavor specific code here -->
 

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

@@ -0,0 +1,32 @@
+package cc.winboll.studio.winboll.activities;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import cc.winboll.studio.winboll.R;
+
+/**
+ * Ollama 模型对话窗口
+ */
+public class OllamaWindowActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_ollama_window);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setTitle("Ollama 窗口");
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_ollama_window, menu);
+        return true;
+    }
+}

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

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#1E1E1E"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#333333"
+            android:elevation="4dp"
+            android:theme="@style/ThemeOverlay.MaterialComponents.ActionBar" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="56dp"
+        android:layout_marginBottom="48dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Ollama 模型对话"
+                android:textColor="#FFFFFF"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="系统提示："
+                    android:textColor="#B0B0B0" />
+
+                <EditText
+                    android:id="@+id/etSystemPrompt"
+                    android:layout_width="match_parent"
+                    android:layout_height="100dp"
+                    android:background="#2D2D2D"
+                    android:hint="请输入系统提示"
+                    android:textColor="#FFFFFF"
+                    android:textColorHint="#666666"
+                    android:gravity="top|start"
+                    android:inputType="textMultiLine" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:text="模型名称："
+                    android:textColor="#B0B0B0" />
+
+                <EditText
+                    android:id="@+id/etModelName"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:background="#2D2D2D"
+                    android:hint="llama3"
+                    android:text="llama3"
+                    android:textColor="#FFFFFF"
+                    android:textColorHint="#666666"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="系统消息："
+                    android:textColor="#B0B0B0" />
+
+                <EditText
+                    android:id="@+id/etUserMessage"
+                    android:layout_width="match_parent"
+                    android:layout_height="120dp"
+                    android:background="#2D2D2D"
+                    android:ems="10"
+                    android:gravity="top|start"
+                    android:hint="输入你要发送的消息..."
+                    android:inputType="textMultiLine" />
+
+                <EditText
+                    android:id="@+id/etAssistantMessage"
+                    android:layout_width="match_parent"
+                    android:layout_height="120dp"
+                    android:background="#2D2D2D"
+                    android:gravity="top|start"
+                    android:hint="模型响应将显示在这里..."
+                    android:inputType="textMultiLine" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btnSend"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="3"
+                    android:text="发送"
+                    android:textColor="#FFFFFF" />
+
+                <Button
+                    android:id="@+id/btnStop"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_weight="1"
+                    android:text="停止"
+                    android:textColor="#FF5252" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</LinearLayout>

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

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

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

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

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">WinBoLL+</string>
+    <string name="app_name_cn1">筋斗云★</string>
+    <string name="app_name_cn2">金抖云☆</string>
+
+</resources>

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 切换启动入口的快捷菜单 -->
+	<shortcut
+        android:shortcutId="switchto_en1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_en1"
+        android:shortcutLongLabel="@string/switchto_en1"
+        android:shortcutDisabledMessage="@string/en1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_EN1"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_en1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<!--<shortcut
+	android:shortcutId="switchto_cn1"
+	android:enabled="true"
+	android:icon="@drawable/ic_launcher"
+	android:shortcutShortLabel="@string/switchto_cn1"
+	android:shortcutLongLabel="@string/switchto_cn1"
+	android:shortcutDisabledMessage="@string/cn1_switch_disabled">
+	<intent
+	android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN1"
+	android:targetPackage="cc.winboll.studio.winboll.beta"
+	android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+	android:data="switchto_cn1" />
+	<categories android:name="android.shortcut.conversation" />
+    </shortcut>-->
+	<shortcut
+        android:shortcutId="switchto_cn2"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn2"
+        android:shortcutLongLabel="@string/switchto_cn2"
+        android:shortcutDisabledMessage="@string/cn2_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN2"
+            android:targetPackage="cc.winboll.studio.winboll.beta"
+            android:targetClass="cc.winboll.studio.winboll.activities.ShortcutActionActivity"
+            android:data="switchto_cn2" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>