源码整理

- 新增 COLOR_GRADIENT_LOW/MID/HIGH 渐变颜色常量
- 新增 COLOR_BORDER 边框颜色常量
- 新增 COLOR_TEXT 文本颜色常量
- 替换 mGradientColors、mBorderColor、mTextColor 为常量引用

.gitignore

@@ -94,8 +94,8 @@ lint-results.html
 ## 忽略 AndroidIDE 临时文件夹
 .androidide
 
-## WinBoLL 基础应用(避免上传敏感配置)
+## MyWinBoLL 基础应用(避免上传敏感配置)
 /winboll.properties
 /local.properties
-/settings.gradle
-/gradle.properties
+#/settings.gradle
+#/gradle.properties

.winboll/bashMergeProjects-to-Projects_Keeper.sh

@@ -1,5 +1,5 @@
 #!/system/bin/sh
-## 合并其他项目分支的模块源码到projects-keeper分支。
+## 合并其他项目分支的模块源码到projects_keeper分支。
 
 # ====================== 0. 进入目标目录 ======================
 TARGET_DIR="/sdcard/AppProjects/Projects_Keeper"
@@ -36,7 +36,7 @@ fi
 
 # ====================== 3. Git 分支检查 ======================
 CUR_BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null)
-TARGET_BRANCH="projects-keeper"
+TARGET_BRANCH="projects_keeper"
 
 if [ "$CUR_BRANCH" != "$TARGET_BRANCH" ]; then
     echo "错误：当前不在 $TARGET_BRANCH 分支！"
@@ -72,7 +72,6 @@ libaes
 libappbase
 libdebugtemp
 libgpsrelaysentinel
-libwinboll
 local.properties-demo
 mymessagemanager
 positions
@@ -82,13 +81,14 @@ winboll
 winboll.properties-demo
 )
 
-# ====================== 5. 获取当前目录真实文件列表 ======================
+# ====================== 5. 获取当前目录真实文件列表（兼容过滤 . ..） ======================
 REAL_ITEMS=()
+# 使用固定排序ls，自动过滤 . 和 ..，不会进入比对数组
 while IFS= read -r line; do
     if [[ "$line" != "." && "$line" != ".." ]]; then
         REAL_ITEMS+=("$line")
     fi
-done < <(ls -a)
+done < <(LC_COLLATE=C ls -a1 --color=none)
 
 # ====================== 6. 差异比对函数 ======================
 check_diff() {
@@ -158,7 +158,7 @@ echo -e "## 对象列表结束
 
 ## 合并 APP 项目
 MERGE_APP_PROJECT_LIST=(
-DemoAPP
+WinBoLL
 )
 echo -e "#@@@ 开始合并应用型模块源码 @@@#
 ## 目标合并对象列表："
@@ -166,14 +166,13 @@ 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 checkout origin/$item_lower $item_lower
     git add .
     git commit -m "合并 $item 项目"
 done
 
 ## 合并 LIB 项目
 MERGE_LIB_PROJECT_LIST=(
-WinBoLL
 APPBase
 AES
 )
@@ -183,10 +182,10 @@ 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 checkout origin/$item_lower $item_lower lib$item_lower
     git add .
     git commit -m "合并 $item 项目"
 done
 
 echo '正在推送 Projects_Keeper 项目'
-git push
+git push

.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh

@@ -38,7 +38,7 @@ if [ "${NOW_BRANCH}" != "${TARGET_BRANCH}" ];then
     exit 1
 fi
 
-# 目录结构校验
+# 目录结构校验白名单（不含 . ..）
 MERGE_OBJECTS_LIST=(
 .git
 .gitignore
@@ -65,7 +65,6 @@ libaes
 libappbase
 libdebugtemp
 libgpsrelaysentinel
-libwinboll
 local.properties-demo
 mymessagemanager
 positions
@@ -76,9 +75,13 @@ winboll.properties-demo
 )
 
 REAL_ITEMS=()
+# 标准排序ls输出，循环强制过滤 . 和 ..
 while IFS= read -r line; do
-    [[ $line != "." && $line != ".." ]] && REAL_ITEMS+=("$line")
-done < <(ls -a)
+    # 跳过虚拟目录 . 和 ..
+    if [[ "$line" != "." && "$line" != ".." ]]; then
+        REAL_ITEMS+=("$line")
+    fi
+done < <(LC_COLLATE=C ls -a1 --color=none)
 
 check_diff(){
     local miss=() extra=()
@@ -89,7 +92,17 @@ check_diff(){
         [[ ! " ${MERGE_OBJECTS_LIST[@]} " =~ " ${i} " ]] && extra+=("$i")
     done
     if [[ ${#miss[@]} -gt 0 || ${#extra[@]} -gt 0 ]];then
+        echo "========================================"
         echo "本地目录结构不一致，终止运行"
+        if [[ ${#miss[@]} -gt 0 ]]; then
+            echo -e "\n缺失条目："
+            for m in "${miss[@]}"; do echo "  $m"; done
+        fi
+        if [[ ${#extra[@]} -gt 0 ]]; then
+            echo -e "\n多余条目："
+            for e in "${extra[@]}"; do echo "  $e"; done
+        fi
+        echo "========================================"
         exit 1
     fi
 }
@@ -98,7 +111,7 @@ check_diff
 echo -e "#@@@ 按时间获取最新标签合并模块源码 @@@#"
 
 # 应用型模块
-MERGE_APP_PROJECT_LIST=(DemoAPP)
+MERGE_APP_PROJECT_LIST=(WinBoLL)
 echo -e "---------- 应用型模块 ----------"
 for name in "${MERGE_APP_PROJECT_LIST[@]}";do
     low_name=$(echo "$name" | tr 'A-Z' 'a-z')
@@ -120,7 +133,7 @@ for name in "${MERGE_APP_PROJECT_LIST[@]}";do
 done
 
 # 类库模块
-MERGE_LIB_PROJECT_LIST=(WinBoLL APPBase AES)
+MERGE_LIB_PROJECT_LIST=(APPBase AES)
 echo -e "---------- 类库模块 ----------"
 for name in "${MERGE_LIB_PROJECT_LIST[@]}";do
     low_name=$(echo "$name" | tr 'A-Z' 'a-z')

.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}"
+                                    }
                                 }
 						    }
                             

LICENSE-Private-Demo

@@ -0,0 +1,97 @@
+# WinBoLL 源码 LICENSE-Private-Demo 规范说明书
+
+# LICENSE-Private-Demo
+
+# WinBoLL 源码公共转私有继承开发规范守则
+
+## 核心声明
+
+本文档**唯一核心设计目的**：通过文件标识、分支隔离、操作规范、责任界定四重约束，**从根源规避私有开发分支代码被人为合并、推送、提交至公共开源主流分支的风险**，明确人为操作失误、违规合并的全部责任归属，同时保证私有分支可正常同步、拉取公共主流分支的上游更新。
+
+## 一、文件宗旨与风险防控说明
+
+本文件为 WinBoLL 项目公共开源分支转为私有独立分支开发的**强制标准化操作手册与责任界定文件**，核心风控目标：
+
+1. 严格隔离公共开源分支与私有开发分支，通过授权文件标记实现分支属性一眼可辨，杜绝人为操作混淆
+
+2. **重点防控人为操作导致的私有分支代码违规合并、回合、推送至公共 ****`winboll`**** 主流分支**，从流程上封堵合并风险
+
+3. 明确所有开发提交者的操作责任，违规合并公共分支的行为由操作人承担全部代码泄露、合规风险
+
+4. 规范私有分支初始化全流程，保证私有分支仅可单向同步公共分支更新，禁止任何反向代码流入公共分支
+
+## 二、公私分支授权标识文件定义（风控核心依据）
+
+### 1. 公共开源分支唯一标识
+
+**文件名：LICENSE**
+
+- 仅允许存在于公共主流分支 `winboll` 及官方公共衍生分支
+
+- 标识当前分支为**开源公开可贡献分支**，遵循原开源授权协议
+
+- **严禁私有分支内保留、恢复此文件**，出现即判定分支属性异常
+
+### 2. 私有开发分支唯一标识
+
+**文件名：LICENSE-Private**
+
+- 仅允许存在于私有开发分支，**绝对禁止出现在公共 ****`winboll`**** 分支**
+
+- 标识当前分支为**私有闭源分支**，代码仅限内部使用，禁止公开、禁止对外贡献
+
+- 为本分支私有属性的法定判定依据，也是禁止合并至公共分支的核心标记
+
+## 三、分支管理与合并风控规则（强制遵守）
+
+1. **公共主流分支**：固定为 `winboll`，为项目唯一开源主线，仅保留 `LICENSE` 文件，**禁止接收任何私有分支的合并、提交、推送请求**。
+
+2. **私有开发分支**：统一从 `winboll` 分支检出，命名固定格式为 `private-demo-*`，与公共分支物理隔离。
+
+3. **核心合并风控铁则**
+
+    - 私有分支 → 公共分支：**永久禁止任何形式的合并、推送、PR 提交、代码回合，人为操作也绝不允许**
+
+    - 公共分支 → 私有分支：允许正常拉取、同步上游更新，不影响私有开发迭代
+
+4. 所有仓库提交者、合并操作者，均视为已阅读并完全认可本规则，**人为执行私有分支向公共分支的合并操作，由操作人承担全部代码泄露、合规违约、项目安全风险**。
+
+## 四、公共转私有标准化操作步骤（锁死合并风险）
+
+请严格按顺序执行，每一步均为风控必要环节，不可跳过、不可修改顺序。
+
+1. 基于公共主流分支 `winboll`，新建私有开发分支，严格使用 `private-demo-*` 命名，从名称上明确分支私有属性，避免人为混淆。
+
+2. 本地仓库切换至新建私有分支，确认当前分支名称、检出来源无误。
+
+3. **永久删除项目根目录公共授权文件 ****`LICENSE`**，彻底移除公共分支标识，断绝误合并的标识漏洞。
+
+4. 将本规范文件 `LICENSE-Private-Demo` 复制并重命名为 `LICENSE-Private`，作为私有分支生效授权文件。
+
+5. 将以上所有变更执行一次性 Git 提交，**提交信息必须固定使用以下内容，不可修改**：
+
+    > 初始化私有开发分支，已切换私有授权文件，本分支禁止任何人为合并、推送至 winboll 公共分支
+    > 
+    > 
+
+6. 提交完成后，本分支正式转为私有开发状态，后续所有代码提交、分支合并、版本迭代，均严禁指向公共 `winboll` 分支。
+
+## 五、人为操作责任界定（核心补充条款）
+
+1. 本分支所有开发者、代码提交者、分支合并操作者，均视为**完全知晓本分支的私有属性与合并禁令**，自愿遵守本规范全部约束。
+
+2. **无论故意或过失，凡是人为执行私有分支向公共 ****`winboll`**** 分支的合并、推送、PR 提交、代码回合操作，全部责任由执行操作的本人独立承担**，项目方不承担任何因人为违规操作导致的代码泄露、开源合规、版本污染风险。
+
+3. 仓库管理员需严格校验合并请求的分支标识与授权文件，发现带有 `LICENSE-Private` 标记的分支申请合并至公共分支，一律直接拒绝，并记录操作人信息。
+
+4. 分支属性校验以根目录授权文件为唯一标准：只要分支内存在 `LICENSE-Private` 文件，就绝对禁止向公共分支发起任何合并操作。
+
+## 六、分支状态校验与异常处理
+
+- 合规公共分支：仅存在 `LICENSE`，无 `LICENSE-Private`
+
+- 合规私有分支：仅存在 `LICENSE-Private`，无 `LICENSE`
+
+- 异常状态：两个文件同时存在 / 均不存在 → 立即停止开发与提交，按本规范重置分支状态，严禁执行任何合并操作
+
+> （注：文档部分内容可能由 AI 生成）

README.md

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

aes/README.md

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

aes/build.gradle

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

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun May 17 20:53:39 HKT 2026
-stageCount=5
+#Sat Jul 11 20:07:00 HKT 2026
+stageCount=19
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.4
+publishVersion=15.20.18
 buildCount=0
-baseBetaVersion=15.20.5
+baseBetaVersion=15.20.19

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

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

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@
     </style>
 
     <style name="MyDebugActivityTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
         <item name="colorTittle">@color/mainWindowTextColor</item>
         <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
         <item name="colorText">@color/debugTextColor</item>

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

@@ -5,7 +5,7 @@
     </style>
 
     <style name="MyDebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
         <item name="colorTittle">@color/mainWindowTextColor</item>
         <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
         <item name="colorText">@color/debugTextColor</item>

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
-#Sun May 17 16:16:36 HKT 2026
-stageCount=16
+#Sun Jun 28 20:55:33 HKT 2026
+stageCount=35
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.15
+publishVersion=15.20.34
 buildCount=0
-baseBetaVersion=15.20.16
+baseBetaVersion=15.20.35

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

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

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;
 
 /**

contacts/README.md

@@ -1,4 +1,40 @@
-# StallHelper
-# 排档辅助管理工具
+# Contacts
+源码参考自：
+https://github.com/aJIEw/PhoneCallApp.git
 
-## LargeStall Stand Auxiliary Management Tool.
+#### 介绍
+这是可以根据正则表达式匹配拦截骚扰电话的手机拨号应用。
+
+#### 软件架构
+适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
+也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
+
+
+#### Gradle 编译说明
+调试版编译命令 ：gradle assembleBetaDebug
+阶段版编译命令 ：gradle assembleStageRelease
+
+#### 使用说明
+
+在安卓系统中需要设置两个权限允许。
+1.自启动权限允许。
+2.省电策略-无限制权限允许。
+
+#### 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
+4.  新建 Pull Request
+
+
+#### 特技
+
+1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
+5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+
+#### 参考文档

contacts/build.gradle

@@ -19,10 +19,12 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 30
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_7
-            targetCompatibility JavaVersion.VERSION_1_7
-        }
+    buildToolsVersion "30.0.3"
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 
     defaultConfig {
         applicationId "cc.winboll.studio.contacts"
@@ -32,7 +34,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.20" 
+        versionName "15.21" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -73,8 +75,10 @@ dependencies {
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.20.4'
-    api 'cc.winboll.studio:libappbase:15.20.15'
+	//api 'cc.winboll.studio:libaes:15.20.21'
+    //api 'cc.winboll.studio:libappbase:15.20.34'
+	api 'cc.winboll.studio:libaes:15.21.+'
+    api 'cc.winboll.studio:libappbase:15.21.+'
 	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }

contacts/build.properties

@@ -1,8 +1,18 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 19 12:01:55 HKT 2026
-stageCount=5
+<<<<<<< HEAD
+#Tue Jul 21 11:13:12 CST 2026
+stageCount=12
 libraryProject=
-baseVersion=15.20
-publishVersion=15.20.4
-buildCount=0
-baseBetaVersion=15.20.5
+baseVersion=15.21
+publishVersion=15.20.11
+buildCount=22
+baseBetaVersion=15.20.12
+=======
+#Tue Jul 21 02:54:31 GMT 2026
+stageCount=0
+libraryProject=
+baseVersion=15.21
+publishVersion=15.21.0
+buildCount=1
+baseBetaVersion=15.21.1
+>>>>>>> origin/contacts

contacts/src/main/AndroidManifest.xml

@@ -3,9 +3,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="cc.winboll.studio.contacts">
 
-    <!-- 网络访问权限 -->
+    <!-- 拥有完全的网络访问权限 -->
     <uses-permission android:name="android.permission.INTERNET"/>
-    
+
     <!-- BIND_AUTOFILL_SERVICE -->
     <uses-permission android:name="android.permission.BIND_AUTOFILL_SERVICE"/>
 
@@ -254,8 +254,10 @@
 
         <activity android:name="cc.winboll.studio.contacts.activities.AboutActivity"/>
 
-        <service android:name="cc.winboll.studio.contacts.services.LimitedTimeSpecialChannelService"/>
+        <service android:name="cc.winboll.studio.contacts.services.LimitedTimeGreenChannelService"/>
+
+        <activity android:name="cc.winboll.studio.contacts.unittest.LayoutDraftPreViewActivity"/>
 
     </application>
 
-</manifest>
+</manifest>

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

@@ -16,9 +16,6 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-		// 设置应用调试标志
-        setIsDebugging(BuildConfig.DEBUG);
-
 		// 初始化窗口管理类
 		WinBoLLActivityManager.init(this);
         // 初始化 Toast 框架

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

@@ -31,14 +31,13 @@ import cc.winboll.studio.contacts.activities.WinBollActivity;
 import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.contacts.fragments.CallLogFragment;
 import cc.winboll.studio.contacts.fragments.ContactsFragment;
-import cc.winboll.studio.contacts.fragments.LogFragment;
+import cc.winboll.studio.contacts.fragments.DunQueryFragment;
 import cc.winboll.studio.contacts.model.MainServiceBean;
 import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.contacts.utils.PermissionUtils;
 import cc.winboll.studio.contacts.views.DunTemperatureView;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
 import com.google.android.material.tabs.TabLayout;
 import java.util.ArrayList;
 import java.util.List;
@@ -75,7 +74,6 @@ public final class MainActivity extends WinBollActivity implements IWinBoLLActiv
     private final String[] REQUIRED_PERMISSIONS = PermissionUtils.BASE_PERMISSIONS;
 
     // ====================== 4. UI控件成员区 ======================
-    private LogView mLogView;
     private Toolbar mToolbar;
     private CheckBox cbMainService;
     private TabLayout tabLayout;
@@ -320,10 +318,10 @@ public final class MainActivity extends WinBollActivity implements IWinBoLLActiv
         // 添加Fragment实例（仅创建对象，不初始化业务逻辑）
         fragmentList.add(CallLogFragment.newInstance(0));
         fragmentList.add(ContactsFragment.newInstance(1));
-        fragmentList.add(LogFragment.newInstance(2));
+        fragmentList.add(DunQueryFragment.newInstance(2));
         tabTitleList.add("通话记录");
         tabTitleList.add("联系人");
-        tabTitleList.add("应用日志");
+        tabTitleList.add("云盾查询");
 
         // 初始化懒加载标记数组（默认均未初始化）
         int fragmentCount = fragmentList.size();
@@ -367,8 +365,8 @@ public final class MainActivity extends WinBollActivity implements IWinBoLLActiv
                 ((CallLogFragment) targetFragment).initData();
             } else if (targetFragment instanceof ContactsFragment) {
                 ((ContactsFragment) targetFragment).initData();
-            } else if (targetFragment instanceof LogFragment) {
-                ((LogFragment) targetFragment).initData();
+            } else if (targetFragment instanceof DunQueryFragment) {
+                ((DunQueryFragment) targetFragment).initData();
             }
             // 标记为已初始化
             isFragmentInit[position] = true;

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

@@ -1,38 +1,22 @@
 package cc.winboll.studio.contacts.activities;
 
 import android.app.Activity;
-import android.content.Context;
 import android.os.Bundle;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libaes.models.APPInfo;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
-import cc.winboll.studio.libaes.views.AboutView;
-import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.models.APPInfo;
+import cc.winboll.studio.libappbase.views.AboutView;
+import androidx.appcompat.widget.Toolbar;
 
 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/03/31 15:15:54
- * @Describe 应用介绍窗口
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/11 12:55
+ * @Describe AboutActivity
  */
 public class AboutActivity extends WinBollActivity implements IWinBoLLActivity {
 
-    // ====================== 常量定义区 ======================
     public static final String TAG = "AboutActivity";
-    private static final String BRANCH_NAME = "contacts";
-
-    // ====================== 成员变量区 ======================
-    private Context mContext;
-    private Toolbar mToolbar;
-
-    // ====================== 接口实现区 ======================
-    @Override
+	@Override
     public Activity getActivity() {
         return this;
     }
@@ -41,76 +25,32 @@ public class AboutActivity extends WinBollActivity implements IWinBoLLActivity {
     public String getTag() {
         return TAG;
     }
-
-    // ====================== 生命周期函数区 ======================
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        LogUtils.d(TAG, "onCreate: 关于页面开始创建");
-
-        mContext = this;
         setContentView(R.layout.activity_about);
 
-        // 初始化工具栏
-        initToolbar();
-        // 初始化关于页面视图
-        initAboutView();
-        // 注册Activity管理
-        WinBoLLActivityManager.getInstance().add(this);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
 
-        LogUtils.d(TAG, "onCreate: 关于页面初始化完成");
+		AboutView aboutView = findViewById(R.id.aboutview);
+		aboutView.setAPPInfo(genDefaultAppInfo());
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        LogUtils.d(TAG, "onDestroy: 关于页面开始销毁");
-        WinBoLLActivityManager.getInstance().registeRemove(this);
-        LogUtils.d(TAG, "onDestroy: 关于页面销毁完成");
-    }
-
-    // ====================== 控件初始化函数区 ======================
-    private void initToolbar() {
-        LogUtils.d(TAG, "initToolbar: 初始化工具栏");
-        // Java7 适配：添加强制类型转换
-        mToolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(mToolbar);
-        mToolbar.setSubtitle(TAG);
-        // 非空判断，避免空指针异常
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        }
-    }
-
-    private void initAboutView() {
-        LogUtils.d(TAG, "initAboutView: 初始化关于页面内容视图");
-        AboutView aboutView = createAboutView();
-        LinearLayout layout = (LinearLayout) findViewById(R.id.aboutviewroot_ll);
-
-        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
-			ViewGroup.LayoutParams.MATCH_PARENT,
-			ViewGroup.LayoutParams.MATCH_PARENT
-        );
-        layout.addView(aboutView, params);
-        LogUtils.d(TAG, "initAboutView: AboutView已添加到布局");
-    }
-
-    // ====================== 业务逻辑函数区 ======================
-    private AboutView createAboutView() {
-        LogUtils.d(TAG, "createAboutView: 构建APP信息并创建AboutView");
+	private APPInfo genDefaultAppInfo() {
+		String branchName = "contacts";
         APPInfo appInfo = new APPInfo();
         appInfo.setAppName("Contacts");
-        appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
-        appInfo.setAppDescription("这是可以根据正则表达式匹配拦截骚扰电话的手机拨号应用。");
-        appInfo.setAppGitName("WinBoLL");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(BRANCH_NAME);
-        appInfo.setAppGitAPPSubProjectFolder(BRANCH_NAME);
+        appInfo.setAppIcon(R.drawable.ic_winboll);
+        appInfo.setAppDescription(getString(R.string.app_description));
+        appInfo.setAppGitName("Contacts");
+        appInfo.setAppGitOwner("ZhanGSKen");
+        appInfo.setAppGitAPPBranch(branchName);
+        appInfo.setAppGitAPPSubProjectFolder(branchName);
         appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=Contacts");
         appInfo.setAppAPKName("Contacts");
         appInfo.setAppAPKFolderName("Contacts");
-
-        return new AboutView(mContext, appInfo);
+        
+        return appInfo;
     }
 }
-

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

@@ -29,6 +29,7 @@ import cc.winboll.studio.contacts.model.PhoneConnectRuleBean;
 import cc.winboll.studio.contacts.model.RingTongBean;
 import cc.winboll.studio.contacts.model.SettingsBean;
 import cc.winboll.studio.contacts.services.MainService;
+import cc.winboll.studio.contacts.views.DebugToolButtonsView;
 import cc.winboll.studio.contacts.views.DuInfoTextView;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
@@ -98,6 +99,9 @@ public class SettingsActivity extends WinBollActivity implements IWinBoLLActivit
         initDunSettings();      // 云盾设置初始化
         initBoBullToonViews();  // BoBullToon功能初始化
 
+        // 调试模式下加载调试工具按钮组
+        initDebugTools();
+
         LogUtils.d(TAG, "onCreate: 设置页面初始化完成");
     }
 
@@ -300,6 +304,26 @@ public class SettingsActivity extends WinBollActivity implements IWinBoLLActivit
         }
     }
 
+    /**
+     * 初始化调试工具按钮组（仅在调试模式下加载）
+     */
+    private void initDebugTools() {
+        LogUtils.d(TAG, "initDebugTools: 检查调试模式状态");
+        if (cc.winboll.studio.libappbase.GlobalApplication.isDebugging()) {
+            LogUtils.d(TAG, "initDebugTools: 调试模式已开启，加载调试工具按钮组");
+            android.widget.LinearLayout contentLayout = (android.widget.LinearLayout) findViewById(R.id.activity_settings_content);
+            if (contentLayout != null) {
+                DebugToolButtonsView debugView = new DebugToolButtonsView(this);
+                contentLayout.addView(debugView);
+                LogUtils.d(TAG, "initDebugTools: 调试工具按钮组加载完成");
+            } else {
+                LogUtils.e(TAG, "initDebugTools: 内容布局未找到，加载失败");
+            }
+        } else {
+            LogUtils.d(TAG, "initDebugTools: 调试模式未开启，跳过加载");
+        }
+    }
+
     // ====================== 点击事件回调区（按功能模块归类） ======================
     /**
      * 云盾开关点击事件（联动参数编辑权限+配置保存）
@@ -382,6 +406,21 @@ public class SettingsActivity extends WinBollActivity implements IWinBoLLActivit
         LogUtils.d(TAG, "onAddNewConnectionRule: 规则添加完成，当前共" + mRuleList.size() + "条规则");
     }
 
+    /**
+     * 初始化测试规则
+     */
+    public void onInitTestRules(View view) {
+        LogUtils.d(TAG, "onInitTestRules: 初始化测试规则");
+        Rules rules = Rules.getInstance(this);
+        if (rules == null) {
+            LogUtils.e(TAG, "onInitTestRules: Rules实例获取失败");
+            return;
+        }
+        initTestRulesIfEmpty(rules);
+        mRuleAdapter.notifyDataSetChanged();
+        ToastUtils.show("测试规则初始化完成");
+    }
+
     /**
      * 跳转默认电话应用设置
      */
@@ -528,15 +567,24 @@ public class SettingsActivity extends WinBollActivity implements IWinBoLLActivit
         WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, AboutActivity.class);
     }
 
+    // ====================== 工具方法区（通用功能+权限相关） ======================
     /**
-     * 跳转日志查看页面
+     * 规则集为空时初始化测试规则
      */
-    public void onLogView(View view) {
-        LogUtils.d(TAG, "onLogView: 跳转日志页面");
-        WinBoLLActivityManager.getInstance().startLogActivity(this);
+    public static void initTestRulesIfEmpty(Rules rules) {
+        if (rules.getPhoneBlacRuleBeanList().size() == 0) {
+            LogUtils.d(TAG, "initTestRulesIfEmpty: 当前无规则，添加测试规则集");
+            rules.add("^1[3-9]\\d{9}$", true, true);
+            rules.add("^0660\\d+$", true, true);
+            rules.add("^020\\d+$", true, true);
+            rules.add(".*", false, true);
+            rules.saveRules();
+            LogUtils.d(TAG, "initTestRulesIfEmpty: 测试规则集已保存");
+        } else {
+            LogUtils.d(TAG, "initTestRulesIfEmpty: 当前已有规则，跳过初始化");
+        }
     }
 
-    // ====================== 工具方法区（通用功能+权限相关） ======================
     /**
      * 更新音量显示文本（当前音量/最大音量）
      */

contacts/src/main/java/cc/winboll/studio/contacts/activities/UnitTestActivity.java

@@ -5,9 +5,9 @@ import android.view.View;
 import android.widget.EditText;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.activities.UnitTestActivity;
+import cc.winboll.studio.contacts.activities.SettingsActivity;
 import cc.winboll.studio.contacts.dun.Rules;
-import cc.winboll.studio.contacts.services.LimitedTimeSpecialChannelService;
+import cc.winboll.studio.contacts.services.LimitedTimeGreenChannelService;
 import cc.winboll.studio.contacts.utils.IntUtils;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libappbase.LogUtils;
@@ -103,7 +103,7 @@ public class UnitTestActivity extends WinBollActivity implements IWinBoLLActivit
         // 初始化规则实例
         Rules rules = Rules.getInstance(this);
         // 无规则时添加测试规则集
-        initTestRulesIfEmpty(rules);
+        SettingsActivity.initTestRulesIfEmpty(rules);
 
         // 预设测试号码列表
         String[] testPhones = {
@@ -122,33 +122,9 @@ public class UnitTestActivity extends WinBollActivity implements IWinBoLLActivit
 		new Thread(new Runnable(){
 				@Override
 				public void run() {
-					LimitedTimeSpecialChannelService.unitTest(UnitTestActivity.this);
+					LimitedTimeGreenChannelService.unitTest(UnitTestActivity.this);
 				}
 			}).start(); 
     }
-
-    // ====================== 私有工具函数区 ======================
-    /**
-     * 规则集为空时初始化测试规则
-     */
-    private void initTestRulesIfEmpty(Rules rules) {
-        if (rules.getPhoneBlacRuleBeanList().size() == 0) {
-            LogUtils.d(TAG, "initTestRulesIfEmpty: 当前无规则，添加测试规则集");
-            // 规则1：中国手机号允许
-            rules.add("^1[3-9]\\d{9}$", true, true);
-            // 规则2：0660区号号码允许
-            rules.add("^0660\\d+$", true, true);
-            // 规则3：020区号号码允许
-            rules.add("^020\\d+$", true, true);
-            // 规则4：默认拒接所有号码
-            rules.add(".*", false, true);
-
-            // 保存规则到本地
-            rules.saveRules();
-            LogUtils.d(TAG, "initTestRulesIfEmpty: 测试规则集已保存");
-        } else {
-            LogUtils.d(TAG, "initTestRulesIfEmpty: 当前已有规则，跳过初始化");
-        }
-    }
 }
 

contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java

@@ -1,9 +1,16 @@
 package cc.winboll.studio.contacts.activities;
 
 import android.app.Activity;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.MenuItem;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import cc.winboll.studio.contacts.dun.Rules;
+import cc.winboll.studio.contacts.model.SettingsBean;
+import cc.winboll.studio.contacts.services.LimitedTimeGreenChannelService;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.models.AESThemeBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
@@ -21,6 +28,8 @@ public class WinBollActivity extends AppCompatActivity implements IWinBoLLActivi
 
     // ====================== 成员变量区 ======================
     protected volatile AESThemeBean.ThemeType mThemeType;
+    private android.content.BroadcastReceiver mGreenChannelReceiver;
+    private int mDefaultStatusBarColor = 0; // 默认状态栏颜色
 
     // ====================== 接口实现区 ======================
     @Override
@@ -42,6 +51,114 @@ public class WinBollActivity extends AppCompatActivity implements IWinBoLLActivi
 //        setThemeStyle();
         super.onCreate(savedInstanceState);
         //LogUtils.d(TAG, "onCreate: 基类主题设置完成，当前主题类型=" + mThemeType);
+
+        // 保存默认状态栏颜色
+        saveDefaultStatusBarColor();
+
+        // 检测绿色通道状态，设置顶部状态栏背景色
+        updateStatusBarForGreenChannel();
+
+        // 注册绿色通道状态变更广播接收器
+        registerGreenChannelReceiver();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        // 反注册绿色通道状态变更广播接收器
+        unregisterGreenChannelReceiver();
+    }
+
+    /**
+     * 根据绿色通道状态更新顶部状态栏背景色
+     * 绿色通道开启时状态栏背景为绿色，其他情况不改变
+     */
+    private void updateStatusBarForGreenChannel() {
+        // API 21+ 才支持设置状态栏颜色
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            boolean isGreenChannelEnabled = false;
+
+            Rules rules = Rules.getInstance(getApplicationContext());
+            if (rules != null) {
+                SettingsBean settings = rules.getSettingsModel();
+                if (settings != null) {
+                    isGreenChannelEnabled = settings.isEnableGreenChannel();
+                }
+            }
+
+            if (isGreenChannelEnabled) {
+                // 绿色通道开启，设置状态栏为绿色
+                getWindow().setStatusBarColor(android.graphics.Color.GREEN);
+                LogUtils.d(TAG, "updateStatusBarForGreenChannel: 绿色通道已开启，状态栏背景设为绿色");
+            } else {
+                // 绿色通道关闭，恢复默认状态栏颜色
+                // 如果默认颜色为0（透明），则获取主题默认颜色
+                int restoreColor = mDefaultStatusBarColor;
+                if (restoreColor == 0) {
+                    // 从主题中获取默认状态栏颜色
+                    android.util.TypedValue typedValue = new android.util.TypedValue();
+                    if (getTheme().resolveAttribute(android.R.attr.statusBarColor, typedValue, true)) {
+                        restoreColor = typedValue.data;
+                    }
+                }
+                getWindow().setStatusBarColor(restoreColor);
+                LogUtils.d(TAG, "updateStatusBarForGreenChannel: 绿色通道已关闭，状态栏背景已恢复, color=0x" + Integer.toHexString(restoreColor));
+            }
+        }
+    }
+
+    /**
+     * 保存默认状态栏颜色（在设置绿色通道颜色之前调用）
+     */
+    private void saveDefaultStatusBarColor() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            mDefaultStatusBarColor = getWindow().getStatusBarColor();
+            
+            // 如果获取到的颜色为0（透明），尝试从主题获取默认颜色
+            if (mDefaultStatusBarColor == 0) {
+                android.util.TypedValue typedValue = new android.util.TypedValue();
+                if (getTheme().resolveAttribute(android.R.attr.statusBarColor, typedValue, true)) {
+                    mDefaultStatusBarColor = typedValue.data;
+                }
+            }
+            
+            LogUtils.d(TAG, "saveDefaultStatusBarColor: 保存默认状态栏颜色=0x" + Integer.toHexString(mDefaultStatusBarColor));
+        }
+    }
+
+    /**
+     * 注册绿色通道状态变更本地广播接收器
+     */
+    private void registerGreenChannelReceiver() {
+        LogUtils.d(TAG, "registerGreenChannelReceiver: 注册绿色通道状态变更广播接收器");
+        mGreenChannelReceiver = new android.content.BroadcastReceiver() {
+            @Override
+            public void onReceive(android.content.Context context, Intent intent) {
+                if (LimitedTimeGreenChannelService.ACTION_GREEN_CHANNEL_STATE_CHANGED.equals(intent.getAction())) {
+                    boolean isEnabled = intent.getBooleanExtra(LimitedTimeGreenChannelService.EXTRA_GREEN_CHANNEL_ENABLED, false);
+                    LogUtils.d(TAG, "registerGreenChannelReceiver: 收到绿色通道状态变更广播, isEnabled=" + isEnabled);
+
+                    // 调用统一方法更新状态栏颜色
+                    updateStatusBarForGreenChannel();
+                }
+            }
+        };
+
+        IntentFilter filter = new IntentFilter(LimitedTimeGreenChannelService.ACTION_GREEN_CHANNEL_STATE_CHANGED);
+        LocalBroadcastManager.getInstance(this).registerReceiver(mGreenChannelReceiver, filter);
+        LogUtils.d(TAG, "registerGreenChannelReceiver: 广播接收器注册完成");
+    }
+
+    /**
+     * 反注册绿色通道状态变更本地广播接收器
+     */
+    private void unregisterGreenChannelReceiver() {
+        if (mGreenChannelReceiver != null) {
+            LogUtils.d(TAG, "unregisterGreenChannelReceiver: 反注册绿色通道状态变更广播接收器");
+            LocalBroadcastManager.getInstance(this).unregisterReceiver(mGreenChannelReceiver);
+            mGreenChannelReceiver = null;
+            LogUtils.d(TAG, "unregisterGreenChannelReceiver: 反注册完成");
+        }
     }
 
     // ====================== 主题相关函数区 ======================

contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java

@@ -5,7 +5,7 @@ import cc.winboll.studio.contacts.activities.SettingsActivity;
 import cc.winboll.studio.contacts.bobulltoon.TomCat;
 import cc.winboll.studio.contacts.model.PhoneConnectRuleBean;
 import cc.winboll.studio.contacts.model.SettingsBean;
-import cc.winboll.studio.contacts.services.LimitedTimeSpecialChannelService;
+import cc.winboll.studio.contacts.services.LimitedTimeGreenChannelService;
 import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.contacts.utils.ContactUtils;
 import cc.winboll.studio.contacts.utils.IntUtils;
@@ -172,9 +172,9 @@ public class Rules {
             LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
         }
 		
-        // 限时特殊通道打开时返回连接
-        if (!isDefend && LimitedTimeSpecialChannelService.isServiceRunning()) {
-            LogUtils.d(TAG, String.format("PhoneNumber %s\n and Limited Time Special Channel Service Is Running.", phoneNumber));
+        // 限时绿色通道打开时返回连接
+        if (!isDefend && LimitedTimeGreenChannelService.isServiceRunning()) {
+            LogUtils.d(TAG, String.format("PhoneNumber %s\n and Limited Time Green Channel Service Is Running.", phoneNumber));
             isDefend = true;
             isConnect = true;
             LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));

contacts/src/main/java/cc/winboll/studio/contacts/floatingwindow/GreenChannelFloatingWindow.java

@@ -0,0 +1,284 @@
+package cc.winboll.studio.contacts.floatingwindow;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.PixelFormat;
+import android.os.Build;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.contacts.services.LimitedTimeGreenChannelService;
+import cc.winboll.studio.contacts.utils.PermissionUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2026/07/20 15:00:00
+ * @Describe 绿色通道悬浮窗管理类
+ * 负责悬浮窗的创建、显示、隐藏和销毁
+ * 适配 Android API 26+ Java 7 语法规范
+ */
+public class GreenChannelFloatingWindow {
+
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "GreenChannelFloatingWindow";
+
+    // Android版本常量（适配Java7）
+    private static final int ANDROID_8_API = 26;
+    private static final int ANDROID_10_API = 29;
+    private static final int ANDROID_19_API = 19;
+
+    // ====================== 成员变量区 ======================
+    private Context mContext;
+    private WindowManager mWindowManager;
+    private WindowManager.LayoutParams mWindowParams;
+    private View mFloatingView;
+    private boolean mIsShowing;
+    private android.content.BroadcastReceiver mGreenChannelReceiver;
+
+    // ====================== 构造函数区 ======================
+    /**
+     * 构造函数
+     * @param context 上下文
+     */
+    public GreenChannelFloatingWindow(Context context) {
+        this.mContext = context;
+        this.mIsShowing = false;
+        LogUtils.d(TAG, "GreenChannelFloatingWindow: 构造函数调用完成");
+    }
+
+    // ====================== 公共方法区 ======================
+    /**
+     * 显示悬浮窗
+     * @return true=显示成功，false=显示失败（权限不足或已显示）
+     */
+    public boolean show() {
+        LogUtils.d(TAG, "show: 尝试显示悬浮窗");
+
+        // 检查是否已显示
+        if (mIsShowing) {
+            LogUtils.w(TAG, "show: 悬浮窗已显示，跳过重复显示");
+            return true;
+        }
+
+        // 检查悬浮窗权限
+        if (!PermissionUtils.isOverlayPermissionGranted(mContext)) {
+            LogUtils.e(TAG, "show: 悬浮窗权限未授予，无法显示");
+            return false;
+        }
+
+        // 初始化窗口管理器
+        if (!initWindowManager()) {
+            LogUtils.e(TAG, "show: 窗口管理器初始化失败");
+            return false;
+        }
+
+        // 初始化悬浮窗视图
+        if (!initFloatingView()) {
+            LogUtils.e(TAG, "show: 悬浮窗视图初始化失败");
+            return false;
+        }
+
+        // 显示悬浮窗
+        try {
+            mWindowManager.addView(mFloatingView, mWindowParams);
+            mIsShowing = true;
+            // 注册绿色通道状态变更广播接收器
+            registerGreenChannelReceiver();
+            LogUtils.d(TAG, "show: 悬浮窗显示成功");
+            return true;
+        } catch (SecurityException e) {
+            LogUtils.e(TAG, "show: 悬浮窗显示失败（安全异常）", e);
+            return false;
+        } catch (Exception e) {
+            LogUtils.e(TAG, "show: 悬浮窗显示异常", e);
+            return false;
+        }
+    }
+
+    /**
+     * 隐藏悬浮窗
+     */
+    public void dismiss() {
+        LogUtils.d(TAG, "dismiss: 尝试隐藏悬浮窗");
+
+        if (!mIsShowing) {
+            LogUtils.d(TAG, "dismiss: 悬浮窗未显示，跳过隐藏操作");
+            return;
+        }
+
+        // 反注册绿色通道状态变更广播接收器
+        unregisterGreenChannelReceiver();
+
+        if (mFloatingView != null && mWindowManager != null) {
+            try {
+                mWindowManager.removeView(mFloatingView);
+                mIsShowing = false;
+                LogUtils.d(TAG, "dismiss: 悬浮窗隐藏成功");
+            } catch (Exception e) {
+                LogUtils.e(TAG, "dismiss: 悬浮窗隐藏异常", e);
+            }
+        }
+    }
+
+    /**
+     * 检查悬浮窗是否正在显示
+     * @return true=正在显示，false=未显示
+     */
+    public boolean isShowing() {
+        return mIsShowing;
+    }
+
+    /**
+     * 获取悬浮窗视图
+     * @return 悬浮窗视图，未初始化时返回null
+     */
+    public View getFloatingView() {
+        return mFloatingView;
+    }
+
+    // ====================== 私有方法区 ======================
+    /**
+     * 初始化窗口管理器
+     * @return true=初始化成功，false=初始化失败
+     */
+    private boolean initWindowManager() {
+        if (mWindowManager == null) {
+            mWindowManager = (WindowManager) mContext.getApplicationContext()
+                .getSystemService(Context.WINDOW_SERVICE);
+            if (mWindowManager == null) {
+                LogUtils.e(TAG, "initWindowManager: WindowManager获取失败");
+                return false;
+            }
+            LogUtils.d(TAG, "initWindowManager: WindowManager初始化成功");
+        }
+
+        // 初始化窗口参数
+        initWindowParams();
+        return true;
+    }
+
+    /**
+     * 初始化窗口参数（适配API26+窗口类型）
+     */
+    private void initWindowParams() {
+        mWindowParams = new WindowManager.LayoutParams();
+
+        // 窗口位置：顶部居中
+        mWindowParams.gravity = Gravity.CENTER_HORIZONTAL | Gravity.TOP;
+
+        // 窗口大小：宽度全屏，高度自适应
+        mWindowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
+        mWindowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+
+        // 窗口格式：半透明
+        mWindowParams.format = PixelFormat.TRANSLUCENT;
+
+        // 窗口类型（适配API26+）
+        if (Build.VERSION.SDK_INT >= ANDROID_10_API) {
+            mWindowParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+            LogUtils.d(TAG, "initWindowParams: API29+ 悬浮窗类型=TYPE_APPLICATION_OVERLAY");
+        } else if (Build.VERSION.SDK_INT >= ANDROID_8_API) {
+            mWindowParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+            LogUtils.d(TAG, "initWindowParams: API26-28 悬浮窗类型=TYPE_APPLICATION_OVERLAY");
+        } else {
+            mWindowParams.type = WindowManager.LayoutParams.TYPE_PHONE;
+            LogUtils.d(TAG, "initWindowParams: API26以下 悬浮窗类型=TYPE_PHONE");
+        }
+
+        // 窗口标志：无焦点（不抢占输入）、全屏布局
+        mWindowParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+            | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
+
+        // API19+ 添加透明状态栏/导航栏标志
+        if (Build.VERSION.SDK_INT >= ANDROID_19_API) {
+            mWindowParams.flags |= WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
+                | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION;
+        }
+
+        LogUtils.d(TAG, "initWindowParams: 窗口参数初始化完成");
+    }
+
+    /**
+     * 初始化悬浮窗视图
+     * @return true=初始化成功，false=初始化失败
+     */
+    private boolean initFloatingView() {
+        if (mFloatingView != null) {
+            LogUtils.d(TAG, "initFloatingView: 视图已初始化，跳过重复创建");
+            return true;
+        }
+
+        try {
+            // 创建FrameLayout拦截返回键
+            FrameLayout keyInterceptorLayout = new FrameLayout(mContext) {
+                @Override
+                public boolean dispatchKeyEvent(KeyEvent event) {
+                    // 拦截返回键，避免误关闭悬浮窗
+                    if (event.getAction() == KeyEvent.ACTION_DOWN
+                        && event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+                        LogUtils.d(TAG, "dispatchKeyEvent: 拦截悬浮窗返回键事件");
+                        return true;
+                    }
+                    return super.dispatchKeyEvent(event);
+                }
+            };
+
+            // 加载悬浮窗布局
+            mFloatingView = LayoutInflater.from(mContext)
+                .inflate(R.layout.view_green_channel_floating, keyInterceptorLayout);
+
+            LogUtils.d(TAG, "initFloatingView: 悬浮窗视图初始化完成");
+            return true;
+        } catch (Exception e) {
+            LogUtils.e(TAG, "initFloatingView: 悬浮窗视图初始化异常", e);
+            return false;
+        }
+    }
+
+    /**
+     * 注册绿色通道状态变更广播接收器
+     * 接收 LimitedTimeGreenChannelView 发出的通道开启与关闭消息
+     */
+    private void registerGreenChannelReceiver() {
+        LogUtils.d(TAG, "registerGreenChannelReceiver: 注册绿色通道状态变更广播接收器");
+        mGreenChannelReceiver = new android.content.BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (LimitedTimeGreenChannelService.ACTION_GREEN_CHANNEL_STATE_CHANGED.equals(intent.getAction())) {
+                    boolean isEnabled = intent.getBooleanExtra(
+                        LimitedTimeGreenChannelService.EXTRA_GREEN_CHANNEL_ENABLED, false);
+                    LogUtils.d(TAG, "registerGreenChannelReceiver: 收到绿色通道状态变更广播, isEnabled=" + isEnabled);
+
+                    // 如果绿色通道关闭，关闭悬浮窗
+                    if (!isEnabled) {
+                        LogUtils.d(TAG, "registerGreenChannelReceiver: 绿色通道已关闭，准备关闭悬浮窗");
+                        dismiss();
+                    }
+                }
+            }
+        };
+
+        IntentFilter filter = new IntentFilter(LimitedTimeGreenChannelService.ACTION_GREEN_CHANNEL_STATE_CHANGED);
+        LocalBroadcastManager.getInstance(mContext).registerReceiver(mGreenChannelReceiver, filter);
+        LogUtils.d(TAG, "registerGreenChannelReceiver: 广播接收器注册完成");
+    }
+
+    /**
+     * 反注册绿色通道状态变更广播接收器
+     */
+    private void unregisterGreenChannelReceiver() {
+        if (mGreenChannelReceiver != null) {
+            LogUtils.d(TAG, "unregisterGreenChannelReceiver: 反注册绿色通道状态变更广播接收器");
+            LocalBroadcastManager.getInstance(mContext).unregisterReceiver(mGreenChannelReceiver);
+            mGreenChannelReceiver = null;
+            LogUtils.d(TAG, "unregisterGreenChannelReceiver: 反注册完成");
+        }
+    }
+}

contacts/src/main/java/cc/winboll/studio/contacts/fragments/DunQueryFragment.java

@@ -0,0 +1,76 @@
+package cc.winboll.studio.contacts.fragments;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/07/19
+ * @Describe 云盾查询区域视图（支持懒加载，仅切换到当前页才加载）
+ */
+public class DunQueryFragment extends Fragment {
+
+    public static final String TAG = "DunQueryFragment";
+    private static final String ARG_PAGE = "ARG_PAGE";
+
+    private int mPage;
+    private boolean isViewInitialized = false;
+    private boolean isLazyInitCompleted = false;
+
+    public static DunQueryFragment newInstance(int page) {
+        LogUtils.d(TAG, "newInstance: 创建云盾查询Fragment实例，页码=" + page);
+        Bundle args = new Bundle();
+        args.putInt(ARG_PAGE, page);
+        DunQueryFragment fragment = new DunQueryFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LogUtils.d(TAG, "onCreate: Fragment创建开始");
+        if (getArguments() != null) {
+            mPage = getArguments().getInt(ARG_PAGE);
+            LogUtils.d(TAG, "onCreate: 读取页面参数，mPage=" + mPage);
+        }
+        LogUtils.d(TAG, "onCreate: Fragment创建完成");
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        LogUtils.d(TAG, "onCreateView: 加载Fragment布局");
+        View view = inflater.inflate(R.layout.fragment_dun_query, container, false);
+        isViewInitialized = true;
+        LogUtils.d(TAG, "onCreateView: Fragment布局加载完成");
+        return view;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy: Fragment开始销毁");
+        isViewInitialized = false;
+        isLazyInitCompleted = false;
+        LogUtils.d(TAG, "onDestroy: Fragment销毁完成");
+    }
+
+    public void initData() {
+        if (isLazyInitCompleted || !isViewInitialized || getContext() == null) {
+            LogUtils.d(TAG, "initData: 懒加载已完成/视图未就绪，跳过");
+            return;
+        }
+        LogUtils.d(TAG, "initData: 开始懒加载初始化");
+        isLazyInitCompleted = true;
+        LogUtils.d(TAG, "initData: 懒加载初始化完成");
+    }
+}

contacts/src/main/java/cc/winboll/studio/contacts/fragments/LogFragment.java

@@ -1,118 +0,0 @@
-package cc.winboll.studio.contacts.fragments;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/02/20 12:58:15
- * @Describe 应用日志区域视图（支持懒加载，仅切换到当前页才启动日志）
- */
-public class LogFragment extends Fragment {
-
-    // ====================== 常量定义区 ======================
-    public static final String TAG = "LogFragment";
-    private static final String ARG_PAGE = "ARG_PAGE";
-
-    // ====================== 页面参数区 ======================
-    private int mPage;
-
-    // ====================== UI控件区 ======================
-    private LogView mLogView;
-
-    // ====================== 懒加载标记区 ======================
-    private boolean isViewInitialized = false; // 视图控件绑定完成标记
-    private boolean isLazyInitCompleted = false; // 懒加载总流程完成标记
-    private boolean isLogViewStarted = false; // LogView启动状态标记
-
-    // ====================== 实例化函数区 ======================
-    public static LogFragment newInstance(int page) {
-        LogUtils.d(TAG, "newInstance: 创建日志Fragment实例，页码=" + page);
-        Bundle args = new Bundle();
-        args.putInt(ARG_PAGE, page);
-        LogFragment fragment = new LogFragment();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    // ====================== 生命周期函数区 ======================
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        LogUtils.d(TAG, "onCreate: Fragment创建开始");
-        if (getArguments() != null) {
-            mPage = getArguments().getInt(ARG_PAGE);
-            LogUtils.d(TAG, "onCreate: 读取页面参数，mPage=" + mPage);
-        }
-        LogUtils.d(TAG, "onCreate: Fragment创建完成");
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        LogUtils.d(TAG, "onCreateView: 加载Fragment布局");
-        View view = inflater.inflate(R.layout.fragment_log, container, false);
-        // Java7 适配：添加强制类型转换，仅初始化LogView控件（不启动）
-        mLogView = (LogView) view.findViewById(R.id.logview);
-        LogUtils.d(TAG, "onCreateView: LogView控件初始化完成（未启动）");
-        // 标记视图控件绑定完成
-        isViewInitialized = true;
-        return view;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        LogUtils.d(TAG, "onResume: Fragment进入前台");
-        // 已完成懒加载 → 仅重启LogView（切回页面时恢复日志显示）
-        if (isLazyInitCompleted && mLogView != null && !isLogViewStarted) {
-            mLogView.start();
-            isLogViewStarted = true;
-            LogUtils.d(TAG, "onResume: LogView已重启，恢复日志显示");
-        }
-        // 未完成懒加载 → 不操作（等待MainActivity调用initData触发）
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        LogUtils.d(TAG, "onDestroy: Fragment开始销毁");
-        if (mLogView != null) {
-            // 若LogView有停止方法，必须调用（避免后台持续占用资源，根据实际API调整）
-            // mLogView.stop(); // 关键：释放LogView资源，防止内存泄漏
-            LogUtils.d(TAG, "onDestroy: LogView资源已释放");
-        }
-        // 重置所有标记，避免重建时状态异常
-        mLogView = null;
-        isViewInitialized = false;
-        isLazyInitCompleted = false;
-        isLogViewStarted = false;
-        LogUtils.d(TAG, "onDestroy: Fragment销毁完成");
-    }
-
-    // ====================== 懒加载核心方法（供MainActivity调用） ======================
-    public void initData() {
-        // 双重防护：避免重复初始化（标记+视图就绪+控件非空）
-        if (isLazyInitCompleted || !isViewInitialized || mLogView == null || getContext() == null) {
-            LogUtils.d(TAG, "initData: 懒加载已完成/视图未就绪，跳过");
-            return;
-        }
-        LogUtils.d(TAG, "initData: 开始懒加载初始化，启动LogView");
-        // 核心：启动LogView（原onCreateView中的start逻辑迁移至此）
-        mLogView.start();
-        isLogViewStarted = true;
-        // 标记懒加载总流程完成（仅执行一次）
-        isLazyInitCompleted = true;
-        LogUtils.d(TAG, "initData: 懒加载初始化完成，LogView正常启动");
-    }
-}
-

contacts/src/main/java/cc/winboll/studio/contacts/model/MainServiceBean.java

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

contacts/src/main/java/cc/winboll/studio/contacts/model/PhoneConnectRuleBean.java

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

contacts/src/main/java/cc/winboll/studio/contacts/model/RingTongBean.java

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

contacts/src/main/java/cc/winboll/studio/contacts/model/SettingsBean.java

@@ -6,7 +6,7 @@ import android.util.JsonWriter;
 import java.io.IOException;
 
 import cc.winboll.studio.contacts.utils.IntUtils;
-import cc.winboll.studio.libappbase.BaseBean;
+import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
 import cc.winboll.studio.libappbase.LogUtils;
 
 /**
@@ -28,6 +28,7 @@ public class SettingsBean extends BaseBean {
     private static final String JSON_KEY_DUN_RESUME_COUNT = "dunResumeCount";
     private static final String JSON_KEY_DUN_ENABLE = "isEnableDun";
     private static final String JSON_KEY_URL = "szBoBullToon_URL";
+    private static final String JSON_KEY_GREEN_CHANNEL_ENABLE = "isEnableGreenChannel";
 
     // ====================== 成员变量区 ======================
     // 云盾防御层数量
@@ -40,6 +41,8 @@ public class SettingsBean extends BaseBean {
     private int dunResumeCount;
     // 是否启用云盾
     private boolean isEnableDun;
+    // 是否启用绿色通道
+    private boolean isEnableGreenChannel;
     // BoBullToon 应用模块数据请求地址
     private String szBoBullToon_URL;
 
@@ -53,6 +56,7 @@ public class SettingsBean extends BaseBean {
         this.dunResumeSecondCount = 60;
         this.dunResumeCount = 1;
         this.isEnableDun = false;
+        this.isEnableGreenChannel = false;
         this.szBoBullToon_URL = "";
         LogUtils.d(TAG, "SettingsModel: 默认构造初始化完成 | 云盾默认配置加载完毕");
     }
@@ -61,17 +65,20 @@ public class SettingsBean extends BaseBean {
      * 带参构造，初始化自定义配置并校验数值范围
      */
     public SettingsBean(int dunTotalCount, int dunCurrentCount, int dunResumeSecondCount,
-                         int dunResumeCount, boolean isEnableDun, String szBoBullToon_URL) {
+                         int dunResumeCount, boolean isEnableDun, boolean isEnableGreenChannel,
+                         String szBoBullToon_URL) {
         this.dunTotalCount = getSettingsModelRangeInt(dunTotalCount);
         this.dunCurrentCount = getSettingsModelRangeInt(dunCurrentCount);
         this.dunResumeSecondCount = getSettingsModelRangeInt(dunResumeSecondCount);
         this.dunResumeCount = getSettingsModelRangeInt(dunResumeCount);
         this.isEnableDun = isEnableDun;
+        this.isEnableGreenChannel = isEnableGreenChannel;
         this.szBoBullToon_URL = szBoBullToon_URL == null ? "" : szBoBullToon_URL;
 
         LogUtils.d(TAG, "SettingsModel: 带参构造初始化完成 | 总层数=" + this.dunTotalCount
 				   + " | 当前层数=" + this.dunCurrentCount + " | 恢复间隔=" + this.dunResumeSecondCount
-				   + " | 恢复层数=" + this.dunResumeCount + " | 云盾启用=" + this.isEnableDun);
+				   + " | 恢复层数=" + this.dunResumeCount + " | 云盾启用=" + this.isEnableDun
+				   + " | 绿色通道启用=" + this.isEnableGreenChannel);
     }
 
     // ====================== 私有工具方法区 ======================
@@ -136,6 +143,15 @@ public class SettingsBean extends BaseBean {
         this.isEnableDun = isEnableDun;
     }
 
+    public boolean isEnableGreenChannel() {
+        return isEnableGreenChannel;
+    }
+
+    public void setIsEnableGreenChannel(boolean isEnableGreenChannel) {
+        LogUtils.d(TAG, "setIsEnableGreenChannel: 绿色通道启用状态更新为" + isEnableGreenChannel);
+        this.isEnableGreenChannel = isEnableGreenChannel;
+    }
+
     public String getBoBullToon_URL() {
         return szBoBullToon_URL;
     }
@@ -164,6 +180,7 @@ public class SettingsBean extends BaseBean {
         jsonWriter.name(JSON_KEY_DUN_RESUME_SECOND).value(getDunResumeSecondCount());
         jsonWriter.name(JSON_KEY_DUN_RESUME_COUNT).value(getDunResumeCount());
         jsonWriter.name(JSON_KEY_DUN_ENABLE).value(isEnableDun());
+        jsonWriter.name(JSON_KEY_GREEN_CHANNEL_ENABLE).value(isEnableGreenChannel());
         jsonWriter.name(JSON_KEY_URL).value(getBoBullToon_URL());
         LogUtils.d(TAG, "writeThisToJsonWriter: JSON序列化完成");
     }
@@ -187,6 +204,8 @@ public class SettingsBean extends BaseBean {
             setDunResumeCount(getSettingsModelRangeInt(jsonReader.nextInt()));
         } else if (JSON_KEY_DUN_ENABLE.equals(name)) {
             setIsEnableDun(jsonReader.nextBoolean());
+        } else if (JSON_KEY_GREEN_CHANNEL_ENABLE.equals(name)) {
+            setIsEnableGreenChannel(jsonReader.nextBoolean());
         } else if (JSON_KEY_URL.equals(name)) {
             setBoBullToon_URL(jsonReader.nextString());
         } else {

contacts/src/main/java/cc/winboll/studio/contacts/services/LimitedTimeGreenChannelService.java

@@ -13,17 +13,17 @@ import cc.winboll.studio.libappbase.LogUtils;
  * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
  * @Date 2026/04/18 15:00:00 (GMT+8)
  * @LastEditTime 2026/04/22 17:20:00 (GMT+8)
- * @Describe 限时特殊通道服务
+ * @Describe 限时绿色通道服务
  * 提供安全的服务启动、令牌校验及循环任务管理
  * 新增功能：
  * 1. 计时过程中实时输出剩余秒数
  * 2. 服务销毁前，发送本地广播通知应用内其他组件，并携带剩余秒数信息
  * 3. 每秒发送一次倒计时状态的本地广播
  */
-public class LimitedTimeSpecialChannelService extends Service {
+public class LimitedTimeGreenChannelService extends Service {
 
     // ========================= 常量定义 =========================
-    public static final String TAG = "LimitedTimeSpecialChannelService";
+    public static final String TAG = "LimitedTimeGreenChannelService";
     public static final String EXTRA_DELAY_MILLIS = "EXTRA_DELAY_MILLIS";
     private static final String EXTRA_SECURITY_TOKEN = "EXTRA_SECURITY_TOKEN";
 
@@ -32,6 +32,10 @@ public class LimitedTimeSpecialChannelService extends Service {
 
     // 倒计时心跳广播 Action
     public static final String ACTION_COUNTDOWN_TICK = "cc.winboll.studio.contacts.services.ACTION_COUNTDOWN_TICK";
+    // 绿色通道状态变更广播 Action
+    public static final String ACTION_GREEN_CHANNEL_STATE_CHANGED = "cc.winboll.studio.contacts.services.ACTION_GREEN_CHANNEL_STATE_CHANGED";
+    // 广播携带的额外参数：绿色通道是否开启
+    public static final String EXTRA_GREEN_CHANNEL_ENABLED = "EXTRA_GREEN_CHANNEL_ENABLED";
     // 广播携带的额外参数：剩余秒数
     public static final String EXTRA_REMAINING_SECONDS = "EXTRA_REMAINING_SECONDS";
     // 广播携带的额外参数：总定时秒数
@@ -44,7 +48,7 @@ public class LimitedTimeSpecialChannelService extends Service {
      */
     public static final String mValidToken = "VALID_TOKEN_" + System.currentTimeMillis();
 
-    private static volatile LimitedTimeSpecialChannelService sInstance = null;
+    private static volatile LimitedTimeGreenChannelService sInstance = null;
     private static volatile boolean sIsServiceRunning = false;
 
     // ========================= 成员变量 =========================
@@ -73,7 +77,7 @@ public class LimitedTimeSpecialChannelService extends Service {
         }
 
         // 构建Intent传递参数
-        Intent intent = new Intent(context, LimitedTimeSpecialChannelService.class);
+        Intent intent = new Intent(context, LimitedTimeGreenChannelService.class);
         intent.putExtra(EXTRA_SECURITY_TOKEN, mValidToken);
         intent.putExtra(EXTRA_DELAY_MILLIS, delayMillis);
 
@@ -93,7 +97,7 @@ public class LimitedTimeSpecialChannelService extends Service {
             LogUtils.w(TAG, "停止失败，上下文为null");
             return;
         }
-        Intent intent = new Intent(context, LimitedTimeSpecialChannelService.class);
+        Intent intent = new Intent(context, LimitedTimeGreenChannelService.class);
         context.stopService(intent);
         LogUtils.i(TAG, "服务停止命令已发出");
     }
@@ -106,6 +110,18 @@ public class LimitedTimeSpecialChannelService extends Service {
         return sIsServiceRunning;
     }
 
+    /**
+     * 公共静态方法：发送绿色通道状态变更广播
+     * @param context 上下文
+     * @param isEnabled 绿色通道是否开启
+     */
+    public static void sendGreenChannelStateChangedBroadcast(Context context, boolean isEnabled) {
+        LogUtils.i(TAG, "sendGreenChannelStateChangedBroadcast: 发送绿色通道状态变更广播, isEnabled=" + isEnabled);
+        Intent intent = new Intent(ACTION_GREEN_CHANNEL_STATE_CHANGED);
+        intent.putExtra(EXTRA_GREEN_CHANNEL_ENABLED, isEnabled);
+        LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
+    }
+
     /**
      * 【核心单元测试方法】
      * 执行完整的单元测试流程

contacts/src/main/java/cc/winboll/studio/contacts/unittest/LayoutDraftPreViewActivity.java

@@ -0,0 +1,47 @@
+package cc.winboll.studio.contacts.unittest;
+
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author 豆包&BigPickle&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/07/18 19:35
+ * @Describe 布局控件快速便捷辅助草稿
+ */
+public class LayoutDraftPreViewActivity extends AppCompatActivity {
+
+    public static final String TAG = "LayoutDraftPreViewActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LogUtils.d(TAG, "onCreate: 布局草稿预览窗口启动");
+        setContentView(R.layout.activity_layoutdraft_preview);
+        initToolbar();
+        LogUtils.d(TAG, "onCreate: 初始化完成");
+    }
+
+    private void initToolbar() {
+        LogUtils.d(TAG, "initToolbar: 初始化工具栏");
+        Toolbar toolbar = (Toolbar) findViewById(R.id.activity_layoutdraft_preview_toolbar);
+        setSupportActionBar(toolbar);
+
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setTitle(TAG);
+        }
+
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    LogUtils.d(TAG, "initToolbar: 点击后退按钮，关闭页面");
+                    finish();
+                }
+            });
+        LogUtils.d(TAG, "initToolbar: 工具栏初始化完成");
+    }
+}

contacts/src/main/java/cc/winboll/studio/contacts/views/DebugToolButtonsView.java

@@ -0,0 +1,154 @@
+package cc.winboll.studio.contacts.views;
+
+import android.content.Context;
+import android.content.Intent;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.contacts.floatingwindow.GreenChannelFloatingWindow;
+import cc.winboll.studio.libappbase.LogActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/07/18
+ * @Describe 调试工具按钮组控件：提供常用调试功能快捷入口，仅在调试模式下显示
+ */
+public class DebugToolButtonsView extends LinearLayout {
+
+    private static final String TAG = "DebugToolButtonsView";
+
+    private Context mContext;
+    private GreenChannelFloatingWindow mGreenChannelFloatingWindow;
+
+    public DebugToolButtonsView(Context context) {
+        super(context);
+        initView(context);
+    }
+
+    public DebugToolButtonsView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initView(context);
+    }
+
+    public DebugToolButtonsView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initView(context);
+    }
+
+    private void initView(Context context) {
+        LogUtils.d(TAG, "initView: 初始化调试工具按钮组");
+        this.mContext = context;
+        setOrientation(VERTICAL);
+        LayoutInflater.from(context).inflate(R.layout.view_debug_tool_buttons, this, true);
+        initButtons();
+        LogUtils.d(TAG, "initView: 调试工具按钮组初始化完成");
+    }
+
+    private void initButtons() {
+        Button btnCrash = (Button) findViewById(R.id.btn_debug_crash);
+        Button btnLayoutPreview = (Button) findViewById(R.id.btn_debug_layout_preview);
+        Button btnUnitTest = (Button) findViewById(R.id.btn_debug_unit_test);
+		Button btnLogView = (Button) findViewById(R.id.btn_debug_logview);
+		Button btnGreenChannel = (Button) findViewById(R.id.btn_debug_green_channel);
+
+        btnCrash.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onTestCrash();
+                }
+            });
+
+        btnLayoutPreview.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onOpenLayoutPreview();
+                }
+            });
+
+        btnUnitTest.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onOpenUnitTest();
+                }
+            });
+
+	    btnLogView.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onLogView();
+                }
+            });
+
+	    btnGreenChannel.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onOpenGreenChannel();
+                }
+            });
+    }
+
+    private void onTestCrash() {
+        LogUtils.d(TAG, "onTestCrash: 触发测试崩溃");
+        for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
+            ((android.app.Activity) mContext).getString(i);
+        }
+    }
+
+    private void onOpenLayoutPreview() {
+        LogUtils.d(TAG, "onOpenLayoutPreview: 打开布局草稿预览窗口");
+        try {
+            Intent intent = new Intent();
+            intent.setClassName(mContext, "cc.winboll.studio.contacts.unittest.LayoutDraftPreViewActivity");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            mContext.startActivity(intent);
+            LogUtils.d(TAG, "onOpenLayoutPreview: 跳转成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "onOpenLayoutPreview: 跳转失败", e);
+        }
+    }
+
+    private void onOpenUnitTest() {
+        LogUtils.d(TAG, "onOpenUnitTest: 打开单元测试窗口");
+        try {
+            Intent intent = new Intent();
+            intent.setClassName(mContext, "cc.winboll.studio.contacts.activities.UnitTestActivity");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            mContext.startActivity(intent);
+            LogUtils.d(TAG, "onOpenUnitTest: 跳转成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "onOpenUnitTest: 跳转失败", e);
+        }
+    }
+
+    /**
+     * 跳转日志查看页面
+     */
+    private void onLogView() {
+        LogUtils.d(TAG, "onLogView: 打开日志窗口");
+        LogActivity.startLogActivity(getContext(), true);
+    }
+
+    /**
+     * 打开绿色通道悬浮窗
+     */
+    private void onOpenGreenChannel() {
+        LogUtils.d(TAG, "onOpenGreenChannel: 打开绿色通道悬浮窗");
+        if (mGreenChannelFloatingWindow == null) {
+            mGreenChannelFloatingWindow = new GreenChannelFloatingWindow(mContext);
+        }
+        if (mGreenChannelFloatingWindow.isShowing()) {
+            LogUtils.d(TAG, "onOpenGreenChannel: 悬浮窗已显示，跳过");
+            return;
+        }
+        boolean result = mGreenChannelFloatingWindow.show();
+        if (result) {
+            LogUtils.d(TAG, "onOpenGreenChannel: 悬浮窗显示成功");
+        } else {
+            LogUtils.e(TAG, "onOpenGreenChannel: 悬浮窗显示失败，可能缺少悬浮窗权限");
+        }
+    }
+}

contacts/src/main/java/cc/winboll/studio/contacts/views/DunQueryView.java

@@ -0,0 +1,103 @@
+package cc.winboll.studio.contacts.views;
+
+import android.content.Context;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.contacts.dun.Rules;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/07/19
+ * @Describe 云盾拦截查询视图控件：实时查询电话号码的云盾拦截状态
+ */
+public class DunQueryView extends LinearLayout {
+
+    private static final String TAG = "DunQueryView";
+
+    private Context mContext;
+    private EditText mEtPhone;
+    private TextView mTvResult;
+
+    public DunQueryView(Context context) {
+        super(context);
+        initView(context);
+    }
+
+    public DunQueryView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initView(context);
+    }
+
+    public DunQueryView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initView(context);
+    }
+
+    private void initView(Context context) {
+        LogUtils.d(TAG, "initView: 初始化云盾查询视图");
+        this.mContext = context;
+        setOrientation(VERTICAL);
+        LayoutInflater.from(context).inflate(R.layout.view_dun_query, this, true);
+        initViews();
+        initListeners();
+        LogUtils.d(TAG, "initView: 云盾查询视图初始化完成");
+    }
+
+    private void initViews() {
+        mEtPhone = (EditText) findViewById(R.id.et_dun_query_phone);
+        mTvResult = (TextView) findViewById(R.id.tv_dun_query_result);
+    }
+
+    private void initListeners() {
+        mEtPhone.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                }
+
+                @Override
+                public void afterTextChanged(Editable s) {
+                    queryDunStatus(s.toString().trim());
+                }
+            });
+    }
+
+    private void queryDunStatus(String phoneNumber) {
+        if (phoneNumber.isEmpty()) {
+            mTvResult.setText("请输入电话号码");
+            mTvResult.setTextColor(mContext.getResources().getColor(R.color.gray_500));
+            LogUtils.d(TAG, "queryDunStatus: 输入为空，显示默认提示");
+            return;
+        }
+
+        Rules rules = Rules.getInstance(mContext);
+        if (rules == null) {
+            mTvResult.setText("云盾规则未初始化");
+            mTvResult.setTextColor(mContext.getResources().getColor(R.color.gray_500));
+            LogUtils.e(TAG, "queryDunStatus: Rules实例获取失败");
+            return;
+        }
+
+        boolean isAllowed = rules.isAllowed(phoneNumber, true);
+        if (isAllowed) {
+            mTvResult.setText("这个号码很新，什么防御都不会启动。");
+            mTvResult.setTextColor(mContext.getResources().getColor(R.color.green_normal));
+            LogUtils.d(TAG, "queryDunStatus: 号码" + phoneNumber + " 允许接通");
+        } else {
+            mTvResult.setText("你说我像云像雾像雨又像风~~~ 怎么来来去去，怎么也又播不通~~~");
+            mTvResult.setTextColor(mContext.getResources().getColor(R.color.red_normal));
+            LogUtils.d(TAG, "queryDunStatus: 号码" + phoneNumber + " 被拦截");
+        }
+    }
+}

contacts/src/main/java/cc/winboll/studio/contacts/views/DunTemperatureView.java

@@ -13,79 +13,79 @@ import android.os.Message;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
+
 import cc.winboll.studio.libappbase.LogUtils;
 import java.util.WeakHashMap;
 
 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/03/19 14:04:20
+ * @Author 豆包&Big Pickle&MiMo&ZhanGSKen<zhangsken@qq.com>
+ * @CreateDate 2025/03/19 14:04:20
+ * @LastEdit 2026/07/21 11:40:00
  * @Describe 云盾华氏度热力视图，垂直盾值温度视图控件（带颜色渐变+静态Handler更新）
- * 采用绘图方式展示盾值温度，填充色随盾值比例渐变，支持设置文本在温度条左侧/右侧，底部对齐竖排显示
- * 温度条宽度=5dp，文本区宽度固定=5dp，整体左右边距=0，无任何多余空白间距
+ * 1. 原生Canvas绘图渲染盾值温度条，填充色随盾值比例动态渐变
+ * 2. 支持竖排数值文本切换至温度条左侧/右侧，文本底部对齐展示
+ * 3. 固定尺寸规范：温度条宽度5dp、文本区域宽度5dp，控件左右无外边距
+ * 4. 全局静态Handler统一分发盾值更新，WeakHashMap弱引用缓存控件防止内存泄漏
+ * 5. 代码完全兼容Java7语法，无Lambda、无try-with-resources、无高版本API
  */
 public class DunTemperatureView extends View {
     // ====================== 常量定义区 ======================
     public static final String TAG = "DunTemperatureView";
-    // 控件默认高度
-    private static final int DEFAULT_HEIGHT = 200;
-    // 温度条宽度（5dp）、文本区宽度（固定5dp）
-    private static final int THERMOMETER_WIDTH_DP = 5;
-    private static final int TEXT_AREA_WIDTH_DP = 5;
-    // 填充区域内边距（左右=0，上下=2避免贴边）
-    private static final int FILL_PADDING_HORIZONTAL = 0;
-    private static final int FILL_PADDING_VERTICAL = 2;
-    // 竖排文本字间距
-    private static final float TEXT_CHAR_SPACING = 8f;
-    // Handler消息标识
     public static final int MSG_UPDATE_DUN_VALUE = 0x01;
-    // 消息参数Key
     public static final String KEY_MAX_VALUE = "max_value";
     public static final String KEY_CURRENT_VALUE = "current_value";
 
+    private static final int DEFAULT_HEIGHT = 200;
+    private static final int THERMOMETER_WIDTH_DP = 5;
+    private static final int TEXT_AREA_WIDTH_DP = 5;
+    private static final int FILL_PADDING_HORIZONTAL = 0;
+    private static final int FILL_PADDING_VERTICAL = 2;
+    private static final float TEXT_CHAR_SPACING = 8f;
+
+    private static final int COLOR_GRADIENT_LOW = Color.GREEN;
+    private static final int COLOR_GRADIENT_MID = Color.YELLOW;
+    private static final int COLOR_GRADIENT_HIGH = Color.RED;
+    private static final int COLOR_BORDER = Color.parseColor("#FF444444");
+    private static final int COLOR_TEXT = Color.parseColor("#FF000000");
+
     // ====================== 静态成员区 ======================
-    // 弱引用缓存控件实例，避免内存泄漏
-    private static WeakHashMap<DunTemperatureView, Object> sViewCache = new WeakHashMap<>();
-    // 静态Handler，处理跨线程更新消息
+    private static final WeakHashMap<DunTemperatureView, Object> sViewCache = new WeakHashMap<DunTemperatureView, Object>();
     private static Handler sStaticHandler;
 
-    // ====================== 成员变量区 ======================
-    // 画笔相关
+    // ====================== 实例成员变量区 ======================
     private Paint mThermometerPaint;
     private Paint mFillPaint;
     private Paint mTextPaint;
-    // 尺寸参数（dp转px后的值）
+
     private int mThermometerWidth;
     private int mTextAreaWidth;
-    private int mMaxValue = 100; // 最高盾值
-    private int mCurrentValue = 0; // 当前盾值
-    private RectF mThermometerRect; // 温度条矩形区域
-    // 渐变颜色配置（低→中→高 对应绿→黄→红）
-    private int[] mGradientColors = {Color.GREEN, Color.YELLOW, Color.RED};
-    private float[] mGradientPositions = {0.0f, 0.5f, 1.0f};
-    // 布局配置：true=文本在温度条右侧（默认），false=文本在温度条左侧
+    private int mMaxValue = 100;
+    private int mCurrentValue = 0;
+
+    private RectF mThermometerRect;
+    private int[] mGradientColors = new int[]{COLOR_GRADIENT_LOW, COLOR_GRADIENT_MID, COLOR_GRADIENT_HIGH};
+    private float[] mGradientPositions = new float[]{0.0f, 0.5f, 1.0f};
     private boolean isTextOnRight = true;
-    // 其他颜色配置
-    private int mBorderColor = Color.parseColor("#FF444444");
-    private int mTextColor = Color.parseColor("#FF000000");
+    private int mBorderColor = COLOR_BORDER;
+    private int mTextColor = COLOR_TEXT;
 
     // ====================== 静态代码块 ======================
     static {
-        // 初始化静态Handler，绑定主线程Looper
         sStaticHandler = new Handler(Looper.getMainLooper()) {
             @Override
-            public void handleMessage(Message msg) {
+            public void handleMessage(final Message msg) {
                 super.handleMessage(msg);
-                if (msg.what == MSG_UPDATE_DUN_VALUE) {
-                    // 获取消息中的盾值参数
-                    int maxValue = msg.getData().getInt(KEY_MAX_VALUE, 100);
-                    int currentValue = msg.getData().getInt(KEY_CURRENT_VALUE, 0);
-                    LogUtils.d(TAG, "sStaticHandler: 收到更新消息，max=" + maxValue + ", current=" + currentValue);
+                final int targetMsgWhat = msg.what;
+                if (targetMsgWhat == MSG_UPDATE_DUN_VALUE) {
+                    final int maxValue = msg.getData().getInt(KEY_MAX_VALUE, 100);
+                    final int currentValue = msg.getData().getInt(KEY_CURRENT_VALUE, 0);
+                    LogUtils.d(TAG, "handleMessage receive update params, max=" + maxValue + ", current=" + currentValue);
 
-                    // 遍历缓存的控件实例，更新所有实例
                     for (DunTemperatureView view : sViewCache.keySet()) {
-                        if (view != null && view.isShown()) {
-                            view.setMaxValue(maxValue);
-                            view.setCurrentValue(currentValue);
+                        final DunTemperatureView targetView = view;
+                        if (targetView != null && targetView.isShown()) {
+                            targetView.setMaxValue(maxValue);
+                            targetView.setCurrentValue(currentValue);
                         }
                     }
                 }
@@ -94,203 +94,194 @@ public class DunTemperatureView extends View {
     }
 
     // ====================== 构造函数区 ======================
-    public DunTemperatureView(Context context) {
+    public DunTemperatureView(final Context context) {
         super(context);
         init();
     }
 
-    public DunTemperatureView(Context context, AttributeSet attrs) {
+    public DunTemperatureView(final Context context, final AttributeSet attrs) {
         super(context, attrs);
         init();
     }
 
-    public DunTemperatureView(Context context, AttributeSet attrs, int defStyleAttr) {
+    public DunTemperatureView(final Context context, final AttributeSet attrs, final int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         init();
     }
 
-    // ====================== 初始化方法区 ======================
+    // ====================== 初始化私有方法 ======================
     /**
-     * 初始化画笔和参数
+     * 初始化画笔、尺寸参数并将实例存入全局缓存
      */
     private void init() {
-        LogUtils.d(TAG, "init: 开始初始化云盾温度视图控件");
-        // dp转px（适配不同分辨率）
-        mThermometerWidth = dp2px(getContext(), THERMOMETER_WIDTH_DP);
-        mTextAreaWidth = dp2px(getContext(), TEXT_AREA_WIDTH_DP);
-        LogUtils.d(TAG, "init: 温度条宽度5dp转px=" + mThermometerWidth + "，文本区宽度5dp转px=" + mTextAreaWidth);
+        final Context context = getContext();
+        LogUtils.d(TAG, "init start");
+
+        mThermometerWidth = dp2px(context, THERMOMETER_WIDTH_DP);
+        mTextAreaWidth = dp2px(context, TEXT_AREA_WIDTH_DP);
+        LogUtils.d(TAG, "init dp convert result, thermometerWidth=" + mThermometerWidth + ", textAreaWidth=" + mTextAreaWidth);
 
-        // 温度条边框画笔（宽度1px，适配5dp宽度）
         mThermometerPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
         mThermometerPaint.setColor(mBorderColor);
         mThermometerPaint.setStyle(Paint.Style.STROKE);
         mThermometerPaint.setStrokeWidth(1);
 
-        // 温度条填充画笔（支持渐变）
         mFillPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
         mFillPaint.setStyle(Paint.Style.FILL);
 
-        // 文本画笔（适配5dp窄文本区，文字居中绘制）
         mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
         mTextPaint.setColor(mTextColor);
-        mTextPaint.setTextSize(18); // 缩小字号适配5dp窄文本区（避免文字超出）
+        mTextPaint.setTextSize(18);
         mTextPaint.setTextAlign(Paint.Align.CENTER);
-        mTextPaint.setFakeBoldText(true); // 文字加粗，提升窄区域可读性
+        mTextPaint.setFakeBoldText(true);
 
-        // 初始化温度条矩形
         mThermometerRect = new RectF();
-
-        // 将当前实例加入静态缓存
         sViewCache.put(this, null);
-        LogUtils.d(TAG, "init: 云盾温度视图控件初始化完成，实例已加入缓存");
+        LogUtils.d(TAG, "init complete, add view to static cache");
     }
 
-    // ====================== 工具方法区 ======================
     /**
-     * dp 转 px（适配不同屏幕分辨率）
+     * dp单位转换px，多分辨率屏幕适配
+     * @param context 上下文
+     * @param dpValue dp数值
+     * @return 对应px像素值
      */
-    private int dp2px(Context context, float dpValue) {
-        return (int) TypedValue.applyDimension(
-			TypedValue.COMPLEX_UNIT_DIP,
-			dpValue,
-			context.getResources().getDisplayMetrics()
-        );
+    private int dp2px(final Context context, final float dpValue) {
+        final float density = context.getResources().getDisplayMetrics().density;
+        return (int) (dpValue * density + 0.5f);
     }
 
-    // ====================== 对外控制方法区 ======================
+    // ====================== UI布局控制方法 ======================
     /**
-     * 设置文本相对于温度条的位置
-     * @param isOnRight true=文本在温度条右侧（默认），false=文本在温度条左侧
+     * 设置文本在温度条的左右位置
+     * @param isOnRight true=右侧，false=左侧
      */
-    public void setTextPosition(boolean isOnRight) {
+    public void setTextPosition(final boolean isOnRight) {
         this.isTextOnRight = isOnRight;
-        invalidate(); // 刷新布局绘制
+        LogUtils.d(TAG, "setTextPosition input param=" + isOnRight);
+        invalidate();
     }
 
     /**
      * 获取当前文本位置配置
-     * @return true=右侧，false=左侧
      */
     public boolean isTextOnRight() {
         return isTextOnRight;
     }
 
-    // ====================== 对外静态方法区 ======================
+    // ====================== 全局静态更新入口 ======================
     /**
-     * 静态外部方法：发送消息更新所有 DunTemperatureView 实例的盾值
-     * 可在子线程中调用
-     * @param maxValue 最高盾值
+     * 全局静态方法，统一更新所有控件盾值，支持子线程调用
+     * @param maxValue 最大盾值
      * @param currentValue 当前盾值
      */
-    public static void updateDunValue(int maxValue, int currentValue) {
+    public static void updateDunValue(final int maxValue, final int currentValue) {
         if (sStaticHandler == null) {
-            LogUtils.w(TAG, "updateDunValue: 静态Handler未初始化");
+            LogUtils.w(TAG, "updateDunValue static handler uninitialized");
             return;
         }
-        // 封装参数到消息
-        Message msg = sStaticHandler.obtainMessage(MSG_UPDATE_DUN_VALUE);
+        LogUtils.d(TAG, "static updateDunValue call, input max=" + maxValue + ", current=" + currentValue);
+        final Message msg = sStaticHandler.obtainMessage(MSG_UPDATE_DUN_VALUE);
         msg.getData().putInt(KEY_MAX_VALUE, maxValue);
         msg.getData().putInt(KEY_CURRENT_VALUE, currentValue);
-        // 发送消息
         sStaticHandler.sendMessage(msg);
     }
 
-    // ====================== 对外实例方法区 ======================
+    // ====================== 盾值读写实例方法 ======================
     /**
-     * 设置最高盾值
-     * @param maxValue 最高盾值（需大于0）
+     * 设置最大盾值，非法值会拦截并打印日志
+     * @param maxValue 目标最大值，必须大于0
      */
-    public void setMaxValue(int maxValue) {
+    public void setMaxValue(final int maxValue) {
         if (maxValue <= 0) {
-            LogUtils.w(TAG, "setMaxValue: 最高盾值必须大于0，当前值=" + maxValue);
+            LogUtils.w(TAG, "setMaxValue invalid input value=" + maxValue);
             return;
         }
         this.mMaxValue = maxValue;
-        // 限制当前值不超过最大值
         mCurrentValue = Math.min(mCurrentValue, maxValue);
-        invalidate(); // 重绘控件
+        LogUtils.d(TAG, "setMaxValue update max=" + maxValue + ", clamp current=" + mCurrentValue);
+        invalidate();
     }
 
     /**
-     * 设置当前盾值
-     * @param currentValue 当前盾值（范围 0~maxValue）
+     * 设置当前盾值，自动限制0~maxValue区间
+     * @param currentValue 目标当前盾值
      */
-    public void setCurrentValue(int currentValue) {
-        int oldValue = this.mCurrentValue;
+    public void setCurrentValue(final int currentValue) {
+        final int oldVal = this.mCurrentValue;
         this.mCurrentValue = Math.max(0, Math.min(currentValue, mMaxValue));
-        if (oldValue != this.mCurrentValue) {
-            LogUtils.d(TAG, "setCurrentValue: 当前盾值从" + oldValue + "更新为" + mCurrentValue);
-            invalidate(); // 重绘控件
+        if (oldVal != this.mCurrentValue) {
+            LogUtils.d(TAG, "setCurrentValue change value from " + oldVal + " to " + mCurrentValue);
+            invalidate();
         }
     }
 
-    /**
-     * 获取当前盾值
-     */
     public int getCurrentValue() {
         return mCurrentValue;
     }
 
-    /**
-     * 获取最高盾值
-     */
     public int getMaxValue() {
         return mMaxValue;
     }
 
+    // ====================== 渐变、颜色自定义配置 ======================
     /**
-     * 设置自定义渐变颜色
-     * @param colors 渐变颜色数组（至少2种颜色）
-     * @param positions 颜色位置数组（与colors长度一致，0.0~1.0）
+     * 自定义渐变颜色数组与位置节点
+     * @param colors 颜色数组，长度≥2
+     * @param positions 渐变节点数组，长度与colors一致
      */
-    public void setGradientColors(int[] colors, float[] positions) {
+    public void setGradientColors(final int[] colors, final float[] positions) {
         if (colors == null || colors.length < 2 || positions == null || positions.length != colors.length) {
-            LogUtils.w(TAG, "setGradientColors: 渐变颜色参数不合法，颜色数组长度=" + (colors == null ? "null" : colors.length));
+            LogUtils.w(TAG, "setGradientColors invalid param, color array length=" + (colors == null ? "null" : colors.length));
             return;
         }
         this.mGradientColors = colors;
         this.mGradientPositions = positions;
-        LogUtils.d(TAG, "setGradientColors: 自定义渐变颜色已设置");
+        LogUtils.d(TAG, "setGradientColors custom gradient config applied");
         invalidate();
     }
 
     /**
-     * 设置温度条边框颜色
+     * 更新温度条边框颜色
+     * @param color 目标色值
      */
-    public void setBorderColor(int color) {
+    public void setBorderColor(final int color) {
         this.mBorderColor = color;
         mThermometerPaint.setColor(color);
-        LogUtils.d(TAG, "setBorderColor: 边框颜色已更新");
+        LogUtils.d(TAG, "setBorderColor update border color");
         invalidate();
     }
 
     /**
-     * 设置文本颜色
+     * 更新竖排文本颜色
+     * @param color 目标色值
      */
-    public void setTextColor(int color) {
+    public void setTextColor(final int color) {
         this.mTextColor = color;
         mTextPaint.setColor(color);
-        LogUtils.d(TAG, "setTextColor: 文本颜色已更新");
+        LogUtils.d(TAG, "setTextColor update text color");
         invalidate();
     }
 
-    // ====================== 生命周期方法 ======================
+    // ====================== 视图生命周期回调 ======================
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
-        // 控件从窗口移除时，从缓存中清除，避免内存泄漏
         sViewCache.remove(this);
-        LogUtils.d(TAG, "onDetachedFromWindow: 控件实例已从缓存移除");
+        LogUtils.d(TAG, "onDetachedFromWindow remove view from static cache");
     }
 
-    // ====================== 测量与绘制区 ======================
+    // ====================== 测量绘制工具私有方法 ======================
     /**
-     * 测量辅助函数
+     * 测量尺寸计算工具
+     * @param defaultSize 默认尺寸
+     * @param measureSpec 测量规格
+     * @return 最终计算尺寸
      */
-    private int measureSize(int defaultSize, int measureSpec) {
+    private int measureSize(final int defaultSize, final int measureSpec) {
         int result = defaultSize;
-        int specMode = MeasureSpec.getMode(measureSpec);
-        int specSize = MeasureSpec.getSize(measureSpec);
+        final int specMode = MeasureSpec.getMode(measureSpec);
+        final int specSize = MeasureSpec.getSize(measureSpec);
         if (specMode == MeasureSpec.EXACTLY) {
             result = specSize;
         } else if (specMode == MeasureSpec.AT_MOST) {
@@ -302,90 +293,83 @@ public class DunTemperatureView extends View {
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        // 强制控件整体左右内边距=0，彻底消除外部边距
         setPadding(0, getPaddingTop(), 0, getPaddingBottom());
 
-        // 控件宽度=温度条宽度 + 文本区宽度（均为5dp转px，无额外空白）
-        int defaultWidth = mThermometerWidth + mTextAreaWidth;
-        int width = measureSize(defaultWidth, widthMeasureSpec);
-        int height = measureSize(DEFAULT_HEIGHT, heightMeasureSpec);
+        final int defaultWidth = mThermometerWidth + mTextAreaWidth;
+        final int width = measureSize(defaultWidth, widthMeasureSpec);
+        final int height = measureSize(DEFAULT_HEIGHT, heightMeasureSpec);
         setMeasuredDimension(width, height);
 
-        // 根据文本位置配置，计算温度条矩形坐标
-        float thermometerLeft, thermometerRight;
-        if (isTextOnRight) {
-            // 文本在右侧：温度条靠左，右接文本区
+        float thermometerLeft;
+        float thermometerRight;
+        final boolean textRightFlag = isTextOnRight;
+        if (textRightFlag) {
             thermometerLeft = 0;
             thermometerRight = thermometerLeft + mThermometerWidth;
         } else {
-            // 文本在左侧：温度条靠右，左接文本区
             thermometerLeft = width - mThermometerWidth;
             thermometerRight = width;
         }
-        float thermometerTop = getPaddingTop();
-        float thermometerBottom = height - getPaddingBottom();
+        final float thermometerTop = getPaddingTop();
+        final float thermometerBottom = height - getPaddingBottom();
         mThermometerRect.set(thermometerLeft, thermometerTop, thermometerRight, thermometerBottom);
 
-        LogUtils.v(TAG, "onMeasure: 文本位置=" + (isTextOnRight ? "右侧" : "左侧") + "，控件尺寸=" + width + "x" + height + "，温度条区域=" + mThermometerRect.toShortString());
+        LogUtils.v(TAG, "onMeasure textPos=" + (textRightFlag ? "RIGHT" : "LEFT") + ", view size=" + width + "x" + height);
     }
 
     @Override
-    protected void onDraw(Canvas canvas) {
+    protected void onDraw(final Canvas canvas) {
         super.onDraw(canvas);
-        // 1. 绘制温度条边框（5dp宽度，小圆角适配）
+        // 绘制温度条外边框
         canvas.drawRoundRect(mThermometerRect, 3, 3, mThermometerPaint);
 
-        // 2. 计算填充高度（根据当前值占最大值的比例）
-        float fillRatio = (float) mCurrentValue / mMaxValue;
-        float fillHeight = mThermometerRect.height() * fillRatio;
-        float fillTop = mThermometerRect.bottom - fillHeight;
+        // 计算渐变填充区域高度比例
+        final float fillRatio = (float) mCurrentValue / mMaxValue;
+        final float fillHeight = mThermometerRect.height() * fillRatio;
+        final float fillTop = mThermometerRect.bottom - fillHeight;
 
-        // 3. 绘制渐变填充部分（左右贴边框，无间距）
+        // 绘制渐变填充色块
         if (fillHeight > 0) {
-            RectF fillRect = new RectF(
-                mThermometerRect.left + FILL_PADDING_HORIZONTAL,
-                fillTop + FILL_PADDING_VERTICAL,
-                mThermometerRect.right - FILL_PADDING_HORIZONTAL,
-                mThermometerRect.bottom - FILL_PADDING_VERTICAL
+            final RectF fillRect = new RectF(
+				mThermometerRect.left + FILL_PADDING_HORIZONTAL,
+				fillTop + FILL_PADDING_VERTICAL,
+				mThermometerRect.right - FILL_PADDING_HORIZONTAL,
+				mThermometerRect.bottom - FILL_PADDING_VERTICAL
             );
-            LinearGradient gradient = new LinearGradient(
-                fillRect.centerX(), fillRect.bottom,
-                fillRect.centerX(), fillRect.top,
-                mGradientColors,
-                mGradientPositions,
-                Shader.TileMode.CLAMP
+            final LinearGradient gradient = new LinearGradient(
+				fillRect.centerX(), fillRect.bottom,
+				fillRect.centerX(), fillRect.top,
+				mGradientColors,
+				mGradientPositions,
+				Shader.TileMode.CLAMP
             );
             mFillPaint.setShader(gradient);
             canvas.drawRoundRect(fillRect, 2, 2, mFillPaint);
             mFillPaint.setShader(null);
         }
 
-        // 4. 绘制文本（5dp固定宽度文本区，底部对齐竖排，文字居中）
-        String text = String.format("%d/%d", mCurrentValue, mMaxValue);
-        if (text.isEmpty()) return;
+        // 竖排文本绘制逻辑
+        final String text = String.format("%d/%d", mCurrentValue, mMaxValue);
+        if (text.length() == 0) {
+            return;
+        }
 
         float textBaseX;
-        if (isTextOnRight) {
-            // 文本在右侧：X=温度条右边缘 + 文本区宽度的一半（紧贴温度条）
+        final boolean textRightFlag = isTextOnRight;
+        if (textRightFlag) {
             textBaseX = mThermometerRect.right + (mTextAreaWidth / 2f);
         } else {
-            // 文本在左侧：X=文本区宽度的一半（紧贴控件左边缘）
             textBaseX = mTextAreaWidth / 2f;
         }
 
-        // 文本绘制参数（适配5dp窄区域，缩小字间距提升紧凑度）
-        float singleCharHeight = mTextPaint.getTextSize() + (TEXT_CHAR_SPACING - 2f); // 字间距减为6f
-        float totalTextHeight = (singleCharHeight * text.length()) - (TEXT_CHAR_SPACING - 2f);
-        Paint.FontMetrics fontMetrics = mTextPaint.getFontMetrics();
-        float charBottomOffset = fontMetrics.bottom;
+        final float singleCharHeight = mTextPaint.getTextSize() + (TEXT_CHAR_SPACING - 2f);
+        final Paint.FontMetrics fontMetrics = mTextPaint.getFontMetrics();
+        final float charBottomOffset = fontMetrics.bottom;
+        final float startTextY = getHeight() - getPaddingBottom() - charBottomOffset;
 
-        // 文本起始Y（底部对齐控件底部，无间距）
-        float startTextY = getHeight() - getPaddingBottom() - charBottomOffset;
-
-        // 逐字竖排绘制（文字居中于5dp文本区，无超出）
         for (int i = 0; i < text.length(); i++) {
-            char singleChar = text.charAt(i);
-            float currentTextY = startTextY - (i * singleCharHeight);
+            final char singleChar = text.charAt(i);
+            final float currentTextY = startTextY - (i * singleCharHeight);
             canvas.drawText(String.valueOf(singleChar), textBaseX, currentTextY, mTextPaint);
         }
     }

contacts/src/main/java/cc/winboll/studio/contacts/views/LimitedTimeGreenChannelView.java

@@ -13,7 +13,9 @@ import android.widget.LinearLayout;
 import android.widget.Switch;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.services.LimitedTimeSpecialChannelService;
+import cc.winboll.studio.contacts.dun.Rules;
+import cc.winboll.studio.contacts.model.SettingsBean;
+import cc.winboll.studio.contacts.services.LimitedTimeGreenChannelService;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.ToastUtils;
 
@@ -21,7 +23,7 @@ import cc.winboll.studio.libappbase.ToastUtils;
  * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
  * @Date 2026/04/18 15:05:00 (GMT+8)
  * @LastEditTime 2026/04/22 17:30:00 (GMT+8)
- * @Describe 限时特殊通道视图
+ * @Describe 限时绿色通道视图
  * 功能说明：
  * 1. Switch 打开时，EditText 不可编辑，布局背景变为绿色，加减按钮不可用
  * 2. Switch 关闭时，EditText 可编辑，布局背景恢复为白色，加减按钮恢复可用
@@ -31,10 +33,10 @@ import cc.winboll.studio.libappbase.ToastUtils;
  * 6. 新增快速设置按钮(btn_thisSeconds)，点击直接设置为当前量级3600秒
  * 7. [新增] 服务销毁时，恢复EditText显示为倒计时剩余秒数
  */
-public class LimitedTimeSpecialChannelView extends LinearLayout {
+public class LimitedTimeGreenChannelView extends LinearLayout {
 
     // ====================== 常量定义 =========================
-    public static final String TAG = "LimitedTimeSpecialChannelView";
+    public static final String TAG = "LimitedTimeGreenChannelView";
     // 定义秒数增量的量级
     private static final long SECONDS_INCREMENT = 3600;
 
@@ -50,17 +52,17 @@ public class LimitedTimeSpecialChannelView extends LinearLayout {
     private android.content.BroadcastReceiver mCountdownReceiver;
 
     // ====================== 构造函数 =========================
-    public LimitedTimeSpecialChannelView(Context context) {
+    public LimitedTimeGreenChannelView(Context context) {
         super(context);
         initView(context);
     }
 
-    public LimitedTimeSpecialChannelView(Context context, AttributeSet attrs) {
+    public LimitedTimeGreenChannelView(Context context, AttributeSet attrs) {
         super(context, attrs);
         initView(context);
     }
 
-    public LimitedTimeSpecialChannelView(Context context, AttributeSet attrs, int defStyleAttr) {
+    public LimitedTimeGreenChannelView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         initView(context);
     }
@@ -71,19 +73,22 @@ public class LimitedTimeSpecialChannelView extends LinearLayout {
         this.mContext = context;
 
         // 加载布局文件
-        LayoutInflater.from(context).inflate(R.layout.view_limitedtimespecialchannel, this, true);
+        LayoutInflater.from(context).inflate(R.layout.view_limitedtimegreenchannel, this, true);
         LogUtils.i(TAG, "布局文件加载完成");
 
         // 绑定控件ID
         bindViews();
         // 初始化所有按钮点击事件
         initButtons();
-        // 初始化开关状态
+        // 初始化开关状态（从持久化存储加载）
         initSwitchState();
         // 注册广播监听
         registerServiceDestroyedListener();
         registerCountdownTickListener();
 
+        // 加载保存的绿色通道启用状态并设置Switch
+        loadSavedGreenChannelState();
+
         LogUtils.i(TAG, "视图初始化流程结束");
     }
 
@@ -191,15 +196,75 @@ public class LimitedTimeSpecialChannelView extends LinearLayout {
 					// 根据开关状态更新UI可操作状态
 					updateUIState(!isChecked);
 
+					// 保存绿色通道启用状态到持久化存储
+					saveGreenChannelState(isChecked);
+
+					// 发送绿色通道状态变更广播
+					LimitedTimeGreenChannelService.sendGreenChannelStateChangedBroadcast(mContext, isChecked);
+
 					if (isChecked) {
-						startLimitedTimeSpecialChannelService();
+						startLimitedTimeGreenChannelService();
 					} else {
-						LimitedTimeSpecialChannelService.stopService(mContext);
+						LimitedTimeGreenChannelService.stopService(mContext);
 					}
 				}
 			});
     }
 
+    /**
+     * 从持久化存储加载绿色通道启用状态并设置Switch
+     */
+    private void loadSavedGreenChannelState() {
+        Rules rules = Rules.getInstance(mContext);
+        if (rules == null) {
+            LogUtils.e(TAG, "loadSavedGreenChannelState: Rules实例获取失败");
+            return;
+        }
+        SettingsBean settings = rules.getSettingsModel();
+        if (settings == null) {
+            LogUtils.e(TAG, "loadSavedGreenChannelState: SettingsBean获取失败");
+            return;
+        }
+
+        boolean savedState = settings.isEnableGreenChannel();
+        LogUtils.i(TAG, "loadSavedGreenChannelState: 加载保存的绿色通道状态=" + savedState);
+
+        // 设置Switch状态（不会触发监听器，因为监听器在initSwitchState中已设置）
+        if (mSwEnable != null && mSwEnable.isChecked() != savedState) {
+            mSwEnable.setChecked(savedState);
+            // 手动更新UI状态
+            updateUIState(!savedState);
+            LogUtils.i(TAG, "loadSavedGreenChannelState: Switch状态已恢复为" + (savedState ? "开启" : "关闭"));
+        }
+
+        // 如果保存的状态是开启，启动服务
+        if (savedState && !LimitedTimeGreenChannelService.isServiceRunning()) {
+            LogUtils.i(TAG, "loadSavedGreenChannelState: 启动绿色通道服务");
+            startLimitedTimeGreenChannelService();
+        }
+    }
+
+    /**
+     * 保存绿色通道启用状态到持久化存储
+     * @param isEnabled 是否启用
+     */
+    private void saveGreenChannelState(boolean isEnabled) {
+        Rules rules = Rules.getInstance(mContext);
+        if (rules == null) {
+            LogUtils.e(TAG, "saveGreenChannelState: Rules实例获取失败，保存失败");
+            return;
+        }
+        SettingsBean settings = rules.getSettingsModel();
+        if (settings == null) {
+            LogUtils.e(TAG, "saveGreenChannelState: SettingsBean获取失败，保存失败");
+            return;
+        }
+
+        settings.setIsEnableGreenChannel(isEnabled);
+        rules.saveDun();
+        LogUtils.i(TAG, "saveGreenChannelState: 绿色通道启用状态已保存为" + isEnabled);
+    }
+
     /**
      * 统一更新UI可操作状态
      * @param enabled 可用状态
@@ -222,11 +287,11 @@ public class LimitedTimeSpecialChannelView extends LinearLayout {
      */
     private void registerServiceDestroyedListener() {
         LogUtils.i(TAG, "注册服务销毁广播监听");
-        IntentFilter filter = new IntentFilter(LimitedTimeSpecialChannelService.ACTION_SERVICE_DESTROYED);
+        IntentFilter filter = new IntentFilter(LimitedTimeGreenChannelService.ACTION_SERVICE_DESTROYED);
         LocalBroadcastManager.getInstance(mContext).registerReceiver(new android.content.BroadcastReceiver() {
 				@Override
 				public void onReceive(Context context, Intent intent) {
-					if (LimitedTimeSpecialChannelService.ACTION_SERVICE_DESTROYED.equals(intent.getAction())) {
+					if (LimitedTimeGreenChannelService.ACTION_SERVICE_DESTROYED.equals(intent.getAction())) {
 						LogUtils.i(TAG, "收到服务销毁广播，执行恢复操作");
 
 						// 1. 恢复开关状态
@@ -236,7 +301,7 @@ public class LimitedTimeSpecialChannelView extends LinearLayout {
 
 						// 2. [核心修改] 检索并设置倒计时剩余秒数参数
 						// 从广播附加数据中获取之前服务发送的剩余秒数
-						long remainingSeconds = intent.getLongExtra(LimitedTimeSpecialChannelService.EXTRA_REMAINING_SECONDS, 0);
+						long remainingSeconds = intent.getLongExtra(LimitedTimeGreenChannelService.EXTRA_REMAINING_SECONDS, 0);
 						// 实际倒计时消耗冲正
 						remainingSeconds -= 1;
 						// 倒计时秒数0值保底
@@ -252,6 +317,10 @@ public class LimitedTimeSpecialChannelView extends LinearLayout {
 							LogUtils.i(TAG, "已将EditText设置为剩余秒数: " + remainingSeconds);
 						}
 
+						// 5. 保存绿色通道关闭状态并发送广播
+						saveGreenChannelState(false);
+						LimitedTimeGreenChannelService.sendGreenChannelStateChangedBroadcast(mContext, false);
+
 						//ToastUtils.show("服务已销毁，恢复倒计时剩余状态");
 					}
 				}
@@ -266,8 +335,8 @@ public class LimitedTimeSpecialChannelView extends LinearLayout {
         mCountdownReceiver = new android.content.BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
-                if (LimitedTimeSpecialChannelService.ACTION_COUNTDOWN_TICK.equals(intent.getAction())) {
-                    long remainingSeconds = intent.getLongExtra(LimitedTimeSpecialChannelService.EXTRA_REMAINING_SECONDS, 0);
+                if (LimitedTimeGreenChannelService.ACTION_COUNTDOWN_TICK.equals(intent.getAction())) {
+                    long remainingSeconds = intent.getLongExtra(LimitedTimeGreenChannelService.EXTRA_REMAINING_SECONDS, 0);
                     if (mEtSeconds != null) {
                         mEtSeconds.setText(String.valueOf(remainingSeconds));
                     }
@@ -278,7 +347,7 @@ public class LimitedTimeSpecialChannelView extends LinearLayout {
             }
         };
 
-        IntentFilter filter = new IntentFilter(LimitedTimeSpecialChannelService.ACTION_COUNTDOWN_TICK);
+        IntentFilter filter = new IntentFilter(LimitedTimeGreenChannelService.ACTION_COUNTDOWN_TICK);
         LocalBroadcastManager.getInstance(mContext).registerReceiver(mCountdownReceiver, filter);
         LogUtils.i(TAG, "倒计时广播注册成功");
     }
@@ -286,8 +355,8 @@ public class LimitedTimeSpecialChannelView extends LinearLayout {
     /**
      * 启动限时特殊通道服务
      */
-    private void startLimitedTimeSpecialChannelService() {
-        LogUtils.i(TAG, "准备启动限时特殊通道服务");
+    private void startLimitedTimeGreenChannelService() {
+        LogUtils.i(TAG, "准备启动限时绿色通道服务");
         String secondsStr = mEtSeconds.getText().toString().trim();
         if (secondsStr.isEmpty()) {
             LogUtils.w(TAG, "输入框为空，使用默认值 3600 秒");
@@ -299,8 +368,8 @@ public class LimitedTimeSpecialChannelView extends LinearLayout {
             long delayMillis = seconds * 1000;
 
             LogUtils.i(TAG, "启动参数 - 输入秒数: " + seconds + ", 转换毫秒: " + delayMillis);
-            //ToastUtils.show("调用 LimitedTimeSpecialChannelService 服务");
-            LimitedTimeSpecialChannelService.startService(mContext, delayMillis);
+            //ToastUtils.show("调用 LimitedTimeGreenChannelService 服务");
+            LimitedTimeGreenChannelService.startService(mContext, delayMillis);
         } catch (NumberFormatException e) {
             LogUtils.e(TAG, "输入的秒数格式错误: " + secondsStr, e);
         }

contacts/src/main/res/drawable/ic_user_key_outline.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M5.8,10C5.4,8.8 4.3,8 3,8C1.3,8 0,9.3 0,11S1.3,14 3,14C4.3,14 5.4,13.2 5.8,12H7V14H9V12H11V10H5.8M3,12C2.4,12 2,11.6 2,11S2.4,10 3,10 4,10.4 4,11 3.6,12 3,12M16,4C13.8,4 12,5.8 12,8S13.8,12 16,12 20,10.2 20,8 18.2,4 16,4M16,10.1C14.8,10.1 13.9,9.2 13.9,8C13.9,6.8 14.8,5.9 16,5.9C17.2,5.9 18.1,6.8 18.1,8S17.2,10.1 16,10.1M16,13C13.3,13 8,14.3 8,17V20H24V17C24,14.3 18.7,13 16,13M22.1,18.1H9.9V17C9.9,16.4 13,14.9 16,14.9C19,14.9 22.1,16.4 22.1,17V18.1Z"/>
+
+</vector>

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

@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">
 
     <androidx.appcompat.widget.Toolbar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1.0"
-        android:id="@+id/aboutviewroot_ll"/>
-    
+	<cc.winboll.studio.libappbase.views.AboutView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:id="@+id/aboutview"/>
+
 </LinearLayout>
+
+

contacts/src/main/res/layout/activity_layoutdraft_preview.xml

@@ -5,8 +5,10 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-     <cc.winboll.studio.libappbase.LogView
-            android:layout_height="match_parent"
-            android:layout_width="match_parent"
-            android:id="@+id/logview"/>
+
+    <androidx.appcompat.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/activity_layoutdraft_preview_toolbar"/>
+
 </LinearLayout>

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

@@ -17,6 +17,7 @@
 			android:id="@+id/activitymainToolbar1"/>
 
 		<LinearLayout
+			android:id="@+id/activity_settings_content"
 			android:orientation="vertical"
 			android:layout_width="match_parent"
 			android:layout_height="0dp"
@@ -57,7 +58,6 @@
 					android:id="@+id/tv_DunInfo"/>
 
 			</LinearLayout>
-			
 
 			<LinearLayout
 				android:orientation="vertical"
@@ -67,12 +67,12 @@
 				<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="特殊通道设置："/>
+					android:text="绿色通道设置："/>
 
-				<cc.winboll.studio.contacts.views.LimitedTimeSpecialChannelView
+				<cc.winboll.studio.contacts.views.LimitedTimeGreenChannelView
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:id="@+id/view_LimitedTimeSpecialChannel"/>
+					android:id="@+id/view_LimitedTimeGreenChannel"/>
 
 			</LinearLayout>
 
@@ -325,29 +325,18 @@
 				android:background="@drawable/recycler_view_border"
 				android:layout_margin="5dp"/>
 
-			<TextView
-				android:layout_width="wrap_content"
+			<Button
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="单元测试："/>
+				android:text="初始化测试规则"
+				android:onClick="onInitTestRules"
+				android:layout_margin="5dp"/>
 
 			<LinearLayout
 				android:orientation="horizontal"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:gravity="right">
-
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="LogView"
-					android:onClick="onLogView"/>
-
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Unit Test"
-					android:onClick="onUnitTest"/>
-
 			</LinearLayout>
 
 			<TextView

contacts/src/main/res/layout/fragment_dun_query.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <cc.winboll.studio.contacts.views.DunQueryView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>

contacts/src/main/res/layout/view_debug_tool_buttons.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginTop="16dp"
+	android:layout_marginBottom="8dp"
+	android:padding="12dp"
+	android:background="@drawable/recycler_view_border">
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="调试工具"
+		android:textSize="16sp"
+		android:textStyle="bold"
+		android:textColor="@color/red_normal"
+		android:layout_marginBottom="8dp"/>
+
+	<HorizontalScrollView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="right">
+
+			<Button
+				android:id="@+id/btn_debug_green_channel"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="绿色通道"
+				android:textSize="12sp"
+				android:layout_margin="2dp"/>
+
+			<Button
+				android:id="@+id/btn_debug_logview"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="应用日志"
+				android:textSize="12sp"
+				android:layout_margin="2dp"/>
+
+			<Button
+				android:id="@+id/btn_debug_unit_test"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="单元测试"
+				android:textSize="12sp"
+				android:layout_margin="2dp"/>
+
+			<Button
+				android:id="@+id/btn_debug_layout_preview"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="布局草稿"
+				android:textSize="12sp"
+				android:layout_margin="2dp"/>
+
+			<Button
+				android:id="@+id/btn_debug_crash"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="测试崩溃"
+				android:textSize="12sp"
+				android:layout_margin="2dp"/>
+
+		</LinearLayout>
+
+	</HorizontalScrollView>
+
+</LinearLayout>
+

contacts/src/main/res/layout/view_dun_query.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginTop="16dp"
+	android:layout_marginBottom="8dp"
+	android:padding="12dp"
+	android:background="@drawable/recycler_view_border">
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="云盾拦截查询"
+		android:textSize="16sp"
+		android:textStyle="bold"
+		android:textColor="@color/red_normal"
+		android:layout_marginBottom="8dp"/>
+
+	<EditText
+		android:id="@+id/et_dun_query_phone"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:hint="输入电话号码查询拦截状态"
+		android:inputType="phone"
+		android:textSize="14sp"
+		android:layout_marginBottom="8dp"/>
+
+	<TextView
+		android:id="@+id/tv_dun_query_result"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:text="请输入电话号码"
+		android:textSize="14sp"
+		android:textColor="@color/gray_500"/>
+
+</LinearLayout>

contacts/src/main/res/layout/view_green_channel_floating.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll_green_channel_floating"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@android:color/white"
+    android:elevation="4dp">
+
+    <cc.winboll.studio.contacts.views.LimitedTimeGreenChannelView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/view_LimitedTimeGreenChannel"/>
+
+</LinearLayout>

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

@@ -2,6 +2,7 @@
 <resources>
 
     <string name="app_name">Contacts</string>
-    <string name="default_bobulltoon_url">https://gitea.winboll.cc/Studio/BoBullToon/archive/main.zip</string>
+    <string name="app_description">This is a mobile dialer app that can block nuisance calls by matching regular expressions.</string>
+    <string name="default_bobulltoon_url">https://gitea.winboll.cc/ZhanGSKen/BoBullToon/archive/main.zip</string>
 
 </resources>

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

@@ -7,6 +7,39 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowContentOverlay">@null</item>
+        
+        <!-- libappbase自定义属性 -->
+        <item name="themeDebug">@style/DebugActivityTheme</item>
+        <item name="aboutViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="aboutViewTextColor">?attr/mainWindowTextColor</item>
+        <item name="aboutViewTitleColor">?attr/mainWindowTextColor</item>
+        <item name="aboutViewDividerColor">?attr/mainWindowDarkTextColor</item>
+        <item name="dialogBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="dialogTextColor">?attr/mainWindowTextColor</item>
+        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        <item name="textViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="textViewTextColor">?attr/mainWindowTextColor</item>
+        <item name="editTextBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="editTextTextColor">?attr/mainWindowTextColor</item>
+        <item name="scrollViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="activityBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="activityTextColor">?attr/mainWindowTextColor</item>
+        <item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+    </style>
+
+    <style name="DebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">?attr/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">?attr/debugTextColor</item>
+        <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
     </style>
 
     <style name="GlobalCrashActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">

gradle.properties

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

libaes/build.gradle

@@ -20,15 +20,11 @@ android {
         }
     }
 	
-    // 米盟 SDK
      compileOptions {
          sourceCompatibility JavaVersion.VERSION_1_7
          targetCompatibility JavaVersion.VERSION_1_7
      }
 
-    packagingOptions {
-         doNotStrip "*/*/libmimo_1011.so"
-    }
 }
 
 dependencies {
@@ -57,7 +53,7 @@ dependencies {
     //api 'androidx.fragment:fragment:1.1.0'
 	
 	// 米盟
-	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+	//api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
      //注意：以下5个库必须要引入
     //implementation 'androidx.appcompat:appcompat:1.4.1'
     api 'androidx.recyclerview:recyclerview:1.0.0'
@@ -66,9 +62,9 @@ dependencies {
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    api 'cc.winboll.studio:libappbase:15.20.9'
+    api 'cc.winboll.studio:libappbase:15.20.34'
 	// 备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'
-	
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
+
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun May 17 20:53:39 HKT 2026
-stageCount=5
+#Sat Jul 11 20:07:00 HKT 2026
+stageCount=19
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.4
+publishVersion=15.20.18
 buildCount=0
-baseBetaVersion=15.20.5
+baseBetaVersion=15.20.19

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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>
@@ -22,7 +25,7 @@
         <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
         <item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
         <item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
-        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
 
         <item name="aToolbar">@style/AESAToolbar</item>
         <item name="aSupportToolbar">@style/AESASupportToolbar</item>
@@ -40,52 +43,52 @@
 
     <style name="AESAToolbar">
         <item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">@color/colorPrimary</item>
-        <item name="attrAToolbarEndColor">@color/colorAccent</item>
+        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
     </style>
 
     <style name="AESASupportToolbar">
         <item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">@color/colorAccent</item>
+        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
     </style>
 
     <style name="DepthAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FF0065EC</item>
-        <item name="colorPrimaryDark">#FF004DB4</item>
-        <item name="colorAccent">#FF4A97FF</item>
+        <item name="colorPrimaryDark">#FF4A97FF</item>
+        <item name="colorAccent">#FF004DB4</item>
     </style>
 
     <style name="SkyAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FF00A6FF</item>
-        <item name="colorPrimaryDark">#FF007ABB</item>
-        <item name="colorAccent">#FF84D4FF</item>
+        <item name="colorPrimaryDark">#FF84D4FF</item>
+        <item name="colorAccent">#FF007ABB</item>
     </style>
 
     <style name="GoldenAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FFF0CA11</item>
-        <item name="colorPrimaryDark">#FFD3AF00</item>
-        <item name="colorAccent">#FFFFE35C</item>
+        <item name="colorPrimaryDark">#FFFFE35C</item>
+        <item name="colorAccent">#FFD3AF00</item>
     </style>
 
     <style name="BearingAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FF840FFF</item>
-        <item name="colorPrimaryDark">#FF6900D7</item>
-        <item name="colorAccent">#FFBA78FF</item>
+        <item name="colorPrimaryDark">#FFBA78FF</item>
+        <item name="colorAccent">#FF6900D7</item>
     </style>
 
     <style name="MemorAESTheme" parent="AESTheme">
         <item name="colorPrimary">#FFFF00F5</item>
-        <item name="colorPrimaryDark">#FFE500DC</item>
-        <item name="colorAccent">#FFFF76FA</item>
+        <item name="colorPrimaryDark">#FFFF76FA</item>
+        <item name="colorAccent">#FFE500DC</item>
     </style>
 
     <style name="TaoAESTheme" parent="AESTheme">
-        <item name="colorPrimary">#FFACACAC</item>
-        <item name="colorPrimaryDark">#FF898989</item>
-        <item name="colorAccent">#FFD8D8D8</item>
+        <item name="colorPrimary">#FF7E7E7E</item>
+        <item name="colorPrimaryDark">#FFE2E2E2</item>
+        <item name="colorAccent">#FF000000</item>
     </style>
 
     <style name="NormalDialogStyle" parent="Theme.AppCompat.Dialog">

libaes/src/main/res/values/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>
@@ -22,7 +25,7 @@
         <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
         <item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
         <item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
-        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
 
         <item name="aToolbar">@style/AESAToolbar</item>
         <item name="aSupportToolbar">@style/AESASupportToolbar</item>
@@ -40,16 +43,16 @@
 
     <style name="AESAToolbar">
         <item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">@color/colorPrimary</item>
-        <item name="attrAToolbarEndColor">@color/colorAccent</item>
+        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
     </style>
 
     <style name="AESASupportToolbar">
         <item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">@color/colorAccent</item>
+        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
     </style>
 
     <style name="DepthAESTheme" parent="AESTheme">
@@ -83,9 +86,9 @@
     </style>
 
     <style name="TaoAESTheme" parent="AESTheme">
-        <item name="colorPrimary">#FFACACAC</item>
-        <item name="colorPrimaryDark">#FF898989</item>
-        <item name="colorAccent">#FFD8D8D8</item>
+        <item name="colorPrimary">#FF7E7E7E</item>
+        <item name="colorPrimaryDark">#FF000000</item>
+        <item name="colorAccent">#FFE2E2E2</item>
     </style>
 
     <style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog">
@@ -109,4 +112,4 @@
         <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item>
     </style>
 
-</resources>
+</resources>

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun May 17 16:16:36 HKT 2026
-stageCount=16
+#Sun Jun 28 20:55:33 HKT 2026
+stageCount=35
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.15
+publishVersion=15.20.34
 buildCount=0
-baseBetaVersion=15.20.16
+baseBetaVersion=15.20.35

libappbase/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
         android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
-            android:name=".CrashHandler$CrashActivity"
+            android:name=".CrashActivity"
             android:label="CrashActivity"
             android:launchMode="singleInstance"
             android:process=":CrashActivity"/>

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/CrashActivity.java

@@ -0,0 +1,109 @@
+package cc.winboll.studio.libappbase;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public final class CrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
+    private static final int MENUITEM_COPY = 0;
+    private static final int MENUITEM_RESTART = 1;
+
+    private String mLog;
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        AppCrashSafetyWire.getInstance().postResumeCrashSafetyWireHandler(getApplicationContext());
+        mLog = getIntent().getStringExtra(CrashHandler.EXTRA_CRASH_LOG);
+        setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
+        initLayout();
+    }
+
+    private void initLayout() {
+        ScrollView contentView = new ScrollView(this);
+        contentView.setFillViewport(true);
+
+        HorizontalScrollView hw = new HorizontalScrollView(this);
+        hw.setBackgroundColor(0xFFF5F5F5);
+
+        TextView message = new TextView(this);
+        final int padding = dp2px(16);
+        message.setPadding(padding, padding, padding, padding);
+        message.setText(mLog);
+        message.setTextColor(0xFF000000);
+        message.setTextIsSelectable(true);
+
+        hw.addView(message);
+        contentView.addView(hw, ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.MATCH_PARENT);
+        setContentView(contentView);
+
+        getActionBar().setTitle(CrashHandler.TITTLE);
+        getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()) + " Error");
+    }
+
+    @Override
+    public void onBackPressed() {
+        restartApp();
+    }
+
+    private void restartApp() {
+        final Intent intent = getPackageManager()
+            .getLaunchIntentForPackage(getPackageName());
+        if (intent != null) {
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                            | Intent.FLAG_ACTIVITY_CLEAR_TOP
+                            | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            startActivity(intent);
+        }
+        finish();
+        android.os.Process.killProcess(android.os.Process.myPid());
+        System.exit(0);
+    }
+
+    private int dp2px(final float dpValue) {
+        final float scale = Resources.getSystem().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(final Menu menu) {
+        menu.add(0, MENUITEM_COPY, 0, "Copy")
+            .setOnMenuItemClickListener(this)
+            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+
+        menu.add(0, MENUITEM_RESTART, 0, "Restart")
+            .setOnMenuItemClickListener(this)
+            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        return true;
+    }
+
+    @Override
+    public boolean onMenuItemClick(final MenuItem item) {
+        switch (item.getItemId()) {
+            case MENUITEM_COPY:
+                ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+                cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
+                Toast.makeText(getApplication(), "The text is copied.", Toast.LENGTH_SHORT).show();
+                break;
+            case MENUITEM_RESTART:
+                AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
+                restartApp();
+                break;
+            default:
+                break;
+        }
+        return false;
+    }
+}

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

@@ -1,27 +1,13 @@
 package cc.winboll.studio.libappbase;
 
-import android.app.Activity;
 import android.app.Application;
 import android.content.ActivityNotFoundException;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.text.TextUtils;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.widget.HorizontalScrollView;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
 
 import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
 
@@ -220,111 +206,5 @@ public final class CrashHandler {
         }
     }
 
-    // ====================== 内部Activity页面 ======================
-    /**
-     * 基础极简崩溃页面
-     * 保险丝熔断时启动，避免复杂布局二次崩溃
-     */
-    public static final class CrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
-        private static final int MENUITEM_COPY = 0;
-        private static final int MENUITEM_RESTART = 1;
-
-        private String mLog;
-
-        @Override
-        protected void onCreate(final Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            AppCrashSafetyWire.getInstance().postResumeCrashSafetyWireHandler(getApplicationContext());
-            mLog = getIntent().getStringExtra(EXTRA_CRASH_LOG);
-            setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
-            initLayout();
-        }
-
-        /**
-         * 动态初始化布局
-         */
-        private void initLayout() {
-            ScrollView contentView = new ScrollView(this);
-            contentView.setFillViewport(true);
-
-            HorizontalScrollView hw = new HorizontalScrollView(this);
-            hw.setBackgroundColor(0xFFF5F5F5);
-
-            TextView message = new TextView(this);
-            final int padding = dp2px(16);
-            message.setPadding(padding, padding, padding, padding);
-            message.setText(mLog);
-            message.setTextColor(0xFF000000);
-            message.setTextIsSelectable(true);
-
-            hw.addView(message);
-            contentView.addView(hw, ViewGroup.LayoutParams.MATCH_PARENT,
-								ViewGroup.LayoutParams.MATCH_PARENT);
-            setContentView(contentView);
-
-            getActionBar().setTitle(TITTLE);
-            getActionBar().setSubtitle(GlobalApplication.class.getSimpleName() + " Error");
-        }
-
-        @Override
-        public void onBackPressed() {
-            restartApp();
-        }
-
-        /**
-         * 重启应用
-         */
-        private void restartApp() {
-            final Intent intent = getPackageManager()
-				.getLaunchIntentForPackage(getPackageName());
-            if (intent != null) {
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-								| Intent.FLAG_ACTIVITY_CLEAR_TOP
-								| Intent.FLAG_ACTIVITY_CLEAR_TASK);
-                startActivity(intent);
-            }
-            finish();
-            android.os.Process.killProcess(android.os.Process.myPid());
-            System.exit(0);
-        }
-
-        /**
-         * dp转px
-         */
-        private int dp2px(final float dpValue) {
-            final float scale = Resources.getSystem().getDisplayMetrics().density;
-            return (int) (dpValue * scale + 0.5f);
-        }
-
-        @Override
-        public boolean onCreateOptionsMenu(final Menu menu) {
-            menu.add(0, MENUITEM_COPY, 0, "Copy")
-				.setOnMenuItemClickListener(this)
-				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
-            menu.add(0, MENUITEM_RESTART, 0, "Restart")
-				.setOnMenuItemClickListener(this)
-				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            return true;
-        }
-
-        @Override
-        public boolean onMenuItemClick(final MenuItem item) {
-            switch (item.getItemId()) {
-                case MENUITEM_COPY:
-                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
-                    Toast.makeText(getApplication(), "The text is copied.", Toast.LENGTH_SHORT).show();
-                    break;
-                case MENUITEM_RESTART:
-                    AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
-                    restartApp();
-                    break;
-                default:
-                    break;
-            }
-            return false;
-        }
-    }
 }
 

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

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

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

@@ -66,7 +66,7 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe
             mCrashLog = getIntent().getStringExtra(CrashHandler.EXTRA_CRASH_LOG);
             final Intent intent = new Intent();
             intent.putExtra(CrashHandler.EXTRA_CRASH_LOG, mCrashLog);
-            CrashHandleNotifyUtils.handleUncaughtException(GlobalApplication.getInstance(), intent, CrashHandler.CrashActivity.class);
+            CrashHandleNotifyUtils.handleUncaughtException(GlobalApplication.getInstance(), intent, CrashActivity.class);
 
             StackTraceElement[] stackElements = Thread.currentThread().getStackTrace();
             StringBuilder sb = new StringBuilder("GlobalCrashActivity onCreate StackTrace");

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,8 @@
 package cc.winboll.studio.libappbase.views;
 
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
@@ -12,6 +14,7 @@ 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;
@@ -74,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;
 
     // ===================================== 构造方法（按参数从少到多排序） =====================================
@@ -193,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);
 
 		// 绑定按钮点击事件
@@ -310,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();
+    }
+
     // ===================================== 内部工具/事件方法 =====================================
     /**
      * 绑定功能按钮点击事件，处理正版校验、调试地址配置弹窗唤起
@@ -335,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/layout/view_log.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:theme="?attr/themeDebug"
+		<!-- Theme removed for compatibility -->
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
@@ -12,7 +12,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="34dp"
 		android:layout_alignParentTop="true"
-		android:background="?attr/colorTittleBackgound"
+		android:background="    android:background="@color/toolbarBackgroundColor""
 		android:id="@+id/viewlogRelativeLayoutToolbar">
 
 		<Button
@@ -20,8 +20,8 @@
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
 			android:text="Clean"
-			android:textColor="?attr/activityTextColor"
-			android:background="?attr/toolbarBackgroundColor"
+			android:textColor="    android:textColor="@color/mainWindowTextColor""
+			android:background="    android:background="@color/toolbarBackgroundColor""
 			android:layout_centerVertical="true"
 			android:id="@+id/viewlogButtonClean"
 			android:layout_marginLeft="5dp"/>
@@ -35,7 +35,7 @@
 			android:layout_toRightOf="@+id/viewlogButtonClean"
 			android:layout_centerVertical="true"
 			android:id="@+id/viewlogTextView1"
-			android:background="?attr/colorTittleBackgound"
+			android:background="    android:background="@color/toolbarBackgroundColor""
 			android:textColor="?attr/toolbarTextColor"/>
 
 		<cc.winboll.studio.libappbase.widget.LogTagSpinner
@@ -53,7 +53,7 @@
 			android:layout_toLeftOf="@+id/viewlogButtonCopy"
 			android:layout_centerVertical="true"
 			android:text="Selectable"
-			android:background="?attr/colorTittleBackgound"
+			android:background="    android:background="@color/toolbarBackgroundColor""
 			android:id="@+id/viewlogCheckBoxSelectable"
 			android:padding="@dimen/log_text_padding"
 			android:textColor="?attr/toolbarTextColor"/>
@@ -62,8 +62,8 @@
 			android:layout_width="@dimen/log_button_width"
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
-			android:textColor="?attr/activityTextColor"
-			android:background="?attr/toolbarBackgroundColor"
+			android:textColor="    android:textColor="@color/mainWindowTextColor""
+			android:background="    android:background="@color/toolbarBackgroundColor""
 			android:text="Copy"
 			android:layout_alignParentRight="true"
 			android:layout_centerVertical="true"
@@ -79,7 +79,7 @@
 		android:layout_below="@+id/viewlogRelativeLayoutToolbar"
 		android:id="@+id/viewlogLinearLayout1"
 		android:gravity="center_vertical"
-		android:background="?attr/colorTittleBackgound">
+		android:background="    android:background="@color/toolbarBackgroundColor"">
 
 		<CheckBox
 			android:layout_width="wrap_content"
@@ -88,7 +88,7 @@
 			android:text="ALL"
 			android:padding="2dp"
 			android:id="@+id/viewlogCheckBox1"
-			android:background="?attr/colorTittleBackgound"
+			android:background="    android:background="@color/toolbarBackgroundColor""
 			android:textColor="?attr/toolbarTextColor"
 			android:layout_marginLeft="5dp"
 			android:layout_marginRight="5dp"/>
@@ -99,14 +99,14 @@
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
 			android:textColor="?attr/colorText"
-			android:background="?attr/colorTittleBackgound"
+			android:background="    android:background="@color/toolbarBackgroundColor""
 			android:singleLine="true"
 			android:id="@+id/tagsearch_et"/>
 
 		<HorizontalScrollView
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:background="?attr/colorTittleBackgound"
+			android:background="    android:background="@color/toolbarBackgroundColor""
 			android:scrollbars="none"
 			android:padding="2dp"
 			android:layout_weight="1.0"
@@ -132,7 +132,7 @@
 		<ScrollView
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:background="?attr/colorTextBackgound"
+    android:background="@color/colorTextBackgound"
 			android:id="@+id/viewlogScrollViewLog">
 
 			<TextView

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

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

mywinboll/.gitignore

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

mywinboll/README.md

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

mywinboll/app_update_description.txt

@@ -0,0 +1 @@
+

mywinboll/build.gradle

@@ -0,0 +1,110 @@
+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.mywinboll"
+        minSdkVersion 26
+        targetSdkVersion 30
+        //1. Android 官方规则
+		//-  versionCode  类型：int 整型
+		//- Java int 最大值：2147483647
+        versionCode 1520000
+        // versionName 更新后需要手动设置 
+        // 项目模块目录的 build.gradle 文件的 stageCount=0
+        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
+        versionName "15.20" 
+        if(true) {
+            versionName = genVersionName("${versionName}")
+        }
+    }
+	
+}
+
+dependencies {
+    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.34'
+    api 'cc.winboll.studio:libaes:15.20.17'
+	
+	// 备用库 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'])
+}

mywinboll/build.properties

@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Wed Jul 01 16:36:17 CST 2026
+stageCount=0
+libraryProject=
+baseVersion=15.20
+publishVersion=15.20.0
+buildCount=11
+baseBetaVersion=15.20.1

mywinboll/proguard-rules.pro

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

mywinboll/src/beta/AndroidManifest.xml

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

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

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

mywinboll/src/main/AndroidManifest.xml

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