<winboll>APK 15.20.3 release Publish.

英文：Entering the development stage of the WinBoLL branch

.gitignore

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

.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,6 +72,7 @@ libaes
 libappbase
 libdebugtemp
 libgpsrelaysentinel
+libwinboll
 local.properties-demo
 mymessagemanager
 positions
@@ -81,14 +82,13 @@ winboll
 winboll.properties-demo
 )
 
-# ====================== 5. 获取当前目录真实文件列表（兼容过滤 . ..） ======================
+# ====================== 5. 获取当前目录真实文件列表 ======================
 REAL_ITEMS=()
-# 使用固定排序ls，自动过滤 . 和 ..，不会进入比对数组
 while IFS= read -r line; do
     if [[ "$line" != "." && "$line" != ".." ]]; then
         REAL_ITEMS+=("$line")
     fi
-done < <(LC_COLLATE=C ls -a1 --color=none)
+done < <(ls -a)
 
 # ====================== 6. 差异比对函数 ======================
 check_diff() {
@@ -158,7 +158,7 @@ echo -e "## 对象列表结束
 
 ## 合并 APP 项目
 MERGE_APP_PROJECT_LIST=(
-WinBoLL
+DemoAPP
 )
 echo -e "#@@@ 开始合并应用型模块源码 @@@#
 ## 目标合并对象列表："
@@ -166,13 +166,14 @@ 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
 )
@@ -182,10 +183,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,6 +65,7 @@ libaes
 libappbase
 libdebugtemp
 libgpsrelaysentinel
+libwinboll
 local.properties-demo
 mymessagemanager
 positions
@@ -75,13 +76,9 @@ winboll.properties-demo
 )
 
 REAL_ITEMS=()
-# 标准排序ls输出，循环强制过滤 . 和 ..
 while IFS= read -r line; do
-    # 跳过虚拟目录 . 和 ..
-    if [[ "$line" != "." && "$line" != ".." ]]; then
-        REAL_ITEMS+=("$line")
-    fi
-done < <(LC_COLLATE=C ls -a1 --color=none)
+    [[ $line != "." && $line != ".." ]] && REAL_ITEMS+=("$line")
+done < <(ls -a)
 
 check_diff(){
     local miss=() extra=()
@@ -92,17 +89,7 @@ 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
 }
@@ -111,7 +98,7 @@ check_diff
 echo -e "#@@@ 按时间获取最新标签合并模块源码 @@@#"
 
 # 应用型模块
-MERGE_APP_PROJECT_LIST=(WinBoLL)
+MERGE_APP_PROJECT_LIST=(DemoAPP)
 echo -e "---------- 应用型模块 ----------"
 for name in "${MERGE_APP_PROJECT_LIST[@]}";do
     low_name=$(echo "$name" | tr 'A-Z' 'a-z')
@@ -133,7 +120,7 @@ for name in "${MERGE_APP_PROJECT_LIST[@]}";do
 done
 
 # 类库模块
-MERGE_LIB_PROJECT_LIST=(APPBase AES)
+MERGE_LIB_PROJECT_LIST=(WinBoLL APPBase AES)
 echo -e "---------- 类库模块 ----------"
 for name in "${MERGE_LIB_PROJECT_LIST[@]}";do
     low_name=$(echo "$name" | tr 'A-Z' 'a-z')

.winboll/bashPublishAPKAddTagInTermux.sh

@@ -1,228 +0,0 @@
-#!/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

@@ -1,20 +0,0 @@
-#!/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
-

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

LICENSE-Private

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

aes/build.gradle

@@ -39,6 +39,10 @@ android {
         }
     }
 	
+	// 米盟 SDK
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
+    }
 }
 
 dependencies {

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Jul 11 20:07:00 HKT 2026
-stageCount=19
+#Wed May 27 20:22:45 HKT 2026
+stageCount=11
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.18
+publishVersion=15.20.10
 buildCount=0
-baseBetaVersion=15.20.19
+baseBetaVersion=15.20.11

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("WinBoLL");
+        appInfo.setAppGitName("AES");
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(branchName);
         appInfo.setAppGitAPPSubProjectFolder(branchName);

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

@@ -5,14 +5,10 @@ package cc.winboll.studio.aes;
  * @Date 2024/06/13 19:03:58
  * @Describe AES应用类
  */
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import android.view.Gravity;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
-import cc.winboll.studio.libappbase.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 {
@@ -21,25 +17,11 @@ public class App extends GlobalApplication {
 
     @Override
     public void onCreate() {
-		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
-			);
-		}
+        super.onCreate();
+		WinBoLLActivityManager.init(this);
 
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
     }
 
 	@Override

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

@@ -1,7 +1,11 @@
 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>
@@ -16,7 +20,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,5 +6,12 @@
 	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">?attr/colorPrimaryDark</item>
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</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">?attr/colorPrimaryDark</item>
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
         <item name="colorTittle">@color/mainWindowTextColor</item>
         <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
         <item name="colorText">@color/debugTextColor</item>

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Jun 28 20:55:33 HKT 2026
-stageCount=35
+#Wed May 27 14:51:29 HKT 2026
+stageCount=23
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.34
+publishVersion=15.20.22
 buildCount=0
-baseBetaVersion=15.20.35
+baseBetaVersion=15.20.23

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

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

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

@@ -1,11 +1,8 @@
 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.utils.CrashHandleNotifyUtils;
-import java.io.PrintWriter;
-import java.io.StringWriter;
+import cc.winboll.studio.libappbase.BuildConfig;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>
@@ -24,24 +21,10 @@ public class App extends GlobalApplication {
      */
     @Override
     public void onCreate() {
-		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
-            );
-        }
+        super.onCreate();
+		
+        // 初始化 Toast 工具类（传入应用全局上下文，确保 Toast 可在任意地方调用）
+        ToastUtils.init(getApplicationContext());
     }
 
     /**

gradle.properties

@@ -1,21 +0,0 @@
-# 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,11 +20,15 @@ android {
         }
     }
 	
+    // 米盟 SDK
      compileOptions {
          sourceCompatibility JavaVersion.VERSION_1_7
          targetCompatibility JavaVersion.VERSION_1_7
      }
 
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
+    }
 }
 
 dependencies {
@@ -53,7 +57,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'
@@ -62,9 +66,9 @@ dependencies {
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    api 'cc.winboll.studio:libappbase:15.20.34'
+    api 'cc.winboll.studio:libappbase:15.20.22'
 	// 备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
-
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.15.21'
+	
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Jul 11 20:07:00 HKT 2026
-stageCount=19
+#Wed May 27 20:22:45 HKT 2026
+stageCount=11
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.18
+publishVersion=15.20.10
 buildCount=0
-baseBetaVersion=15.20.19
+baseBetaVersion=15.20.11

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

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

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

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

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

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

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

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

@@ -13,159 +13,199 @@ 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";
 
-    // 私有静态集合，外部不可直接修改
-    private static ArrayList<Integer> themeStyleIDList = new ArrayList<>();
+    static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
+    static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
 
-    // 移除无用实例成员 mThemeType，工具类不保留实例字段
+    protected volatile AESThemeBean.ThemeType mThemeType;
 
-    /**
-     * 初始化主题样式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> int getThemeTypeID(T context) {
+        AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
+        return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES): bean.getCurrentThemeTypeID();
     }
 
-    /**
-     * 获取当前主题样式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);
+    public static <T extends Context> void saveThemeStyleID(T context, int nThemeTypeID) {
+        AESThemeBean bean = new AESThemeBean(nThemeTypeID);
         AESThemeBean.saveBean(context, bean);
     }
 
-    // ====================== 应用主题 - 规范重载 ======================
-    /**
-     * 应用当前持久化主题（通用 Activity）
-     */
-    public static void applyTheme(Activity activity) {
+    public static <T extends Activity> void applyAppTheme(T activity) {
         activity.setTheme(getThemeTypeID(activity));
     }
 
-    /**
-     * 应用指定主题（通用 Activity）
-     */
-    public static void applyTheme(Activity activity, AESThemeBean.ThemeType themeType) {
-        activity.setTheme(getThemeStyleID(themeType));
-    }
-
-    /**
-     * 应用当前持久化主题（AppCompat 兼容 Activity）
-     */
-    public static void applyAppCompatTheme(AppCompatActivity activity) {
+    public static <T extends AppCompatActivity> void applyAppCompatTheme(T activity) {
         activity.setTheme(getThemeTypeID(activity));
     }
 
-    /**
-     * 应用指定主题（AppCompat 兼容 Activity）
-     */
-    public static void applyAppCompatTheme(AppCompatActivity activity, AESThemeBean.ThemeType themeType) {
-        activity.setTheme(getThemeStyleID(themeType));
+    /*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));
     }
 
-    // ====================== 加载菜单 ======================
-    /**
-     * 加载主题菜单（通用 Activity）
-     */
-    public static void inflateThemeMenu(Activity activity, Menu menu) {
+    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.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
     }
 
-    /**
-     * 加载主题菜单（AppCompat Activity）
-     */
-    public static void inflateCompatThemeMenu(AppCompatActivity activity, Menu menu) {
+    public static <T extends AppCompatActivity> void inflateCompatMenu(T activity, Menu menu) {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
     }
 
-    // ====================== 菜单点击统一核心逻辑（消除重复代码） ======================
-    /**
-     * 主题菜单项点击统一处理
-     * @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;
+    /*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;
         }
-        saveThemeStyleID(context, themeStyleId);
-        return true;
+
+        return false;
     }
 
-    // 对外暴露不同 Activity 类型的入口，内部调用统一核心方法
-    public static boolean onThemeItemSelected(Activity activity, MenuItem item) {
-        return handleThemeMenuClick(activity, item);
-    }
-
-    public static boolean onAppCompatThemeItemSelected(AppCompatActivity activity, MenuItem item) {
-        return handleThemeMenuClick(activity, item);
-    }
-
-    public static boolean onWinBoLLThemeItemSelected(AppCompatActivity activity, MenuItem item) {
-        // 使用 Application 上下文保存，避免 Activity 泄漏
-        return handleThemeMenuClick(activity.getApplicationContext(), item);
-    }
-
-    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];
-            }
+    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 AESThemeBean.ThemeType.values()[0];
+
+        return false;
+    }
+
+    public static <T extends AppCompatActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) {
+        int nThemeStyleID;
+        if (R.id.item_depththeme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_skytheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_goldentheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_bearingtheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_memortheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_taotheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_defaulttheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        }
+
+        return false;
+    }
+
+    public static <T extends DrawerFragmentActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) {
+        int nThemeStyleID;
+        if (R.id.item_depththeme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_skytheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_goldentheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_bearingtheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_memortheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_taotheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_defaulttheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        }
+
+        return false;
     }
 }
-

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

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

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

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

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

@@ -25,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">?attr/colorPrimaryDark</item>
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
 
         <item name="aToolbar">@style/AESAToolbar</item>
         <item name="aSupportToolbar">@style/AESASupportToolbar</item>
@@ -86,9 +86,9 @@
     </style>
 
     <style name="TaoAESTheme" parent="AESTheme">
-        <item name="colorPrimary">#FF7E7E7E</item>
-        <item name="colorPrimaryDark">#FF000000</item>
-        <item name="colorAccent">#FFE2E2E2</item>
+        <item name="colorPrimary">#FFACACAC</item>
+        <item name="colorPrimaryDark">#FF898989</item>
+        <item name="colorAccent">#FFD8D8D8</item>
     </style>
 
     <style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog">
@@ -112,4 +112,4 @@
         <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item>
     </style>
 
-</resources>
+</resources>

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Jun 28 20:55:33 HKT 2026
-stageCount=35
+#Wed May 27 14:51:29 HKT 2026
+stageCount=23
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.34
+publishVersion=15.20.22
 buildCount=0
-baseBetaVersion=15.20.35
+baseBetaVersion=15.20.23

libappbase/src/main/AndroidManifest.xml

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

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

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

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, CrashActivity.class);
+            CrashHandleNotifyUtils.handleUncaughtException(GlobalApplication.getInstance(), intent, CrashHandler.CrashActivity.class);
 
             StackTraceElement[] stackElements = Thread.currentThread().getStackTrace();
             StringBuilder sb = new StringBuilder("GlobalCrashActivity onCreate StackTrace");

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"
-		<!-- Theme removed for compatibility -->
+	android:theme="?attr/themeDebug"
 	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="    android:background="@color/toolbarBackgroundColor""
+		android:background="?attr/colorTittleBackgound"
 		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="    android:textColor="@color/mainWindowTextColor""
-			android:background="    android:background="@color/toolbarBackgroundColor""
+			android:textColor="?attr/activityTextColor"
+			android:background="?attr/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="    android:background="@color/toolbarBackgroundColor""
+			android:background="?attr/colorTittleBackgound"
 			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="    android:background="@color/toolbarBackgroundColor""
+			android:background="?attr/colorTittleBackgound"
 			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="    android:textColor="@color/mainWindowTextColor""
-			android:background="    android:background="@color/toolbarBackgroundColor""
+			android:textColor="?attr/activityTextColor"
+			android:background="?attr/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="    android:background="@color/toolbarBackgroundColor"">
+		android:background="?attr/colorTittleBackgound">
 
 		<CheckBox
 			android:layout_width="wrap_content"
@@ -88,7 +88,7 @@
 			android:text="ALL"
 			android:padding="2dp"
 			android:id="@+id/viewlogCheckBox1"
-			android:background="    android:background="@color/toolbarBackgroundColor""
+			android:background="?attr/colorTittleBackgound"
 			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="    android:background="@color/toolbarBackgroundColor""
+			android:background="?attr/colorTittleBackgound"
 			android:singleLine="true"
 			android:id="@+id/tagsearch_et"/>
 
 		<HorizontalScrollView
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:background="    android:background="@color/toolbarBackgroundColor""
+			android:background="?attr/colorTittleBackgound"
 			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="@color/colorTextBackgound"
+			android:background="?attr/colorTextBackgound"
 			android:id="@+id/viewlogScrollViewLog">
 
 			<TextView

libwinboll/.gitignore

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

libwinboll/build.gradle

@@ -0,0 +1,56 @@
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply from: '../.winboll/winboll_lib_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+android {
+	// 适配MIUI12
+	compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 26
+        targetSdkVersion 30
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+	// 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+	// Gson
+	api 'com.google.code.gson:gson:2.8.9'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+	// 添加JSch依赖（SFTP核心，com.jcraft:jsch:0.1.54）
+	api 'com.jcraft:jsch:0.1.54'
+	
+	// 米盟
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+     //注意：以下5个库必须要引入
+    //implementation 'androidx.appcompat:appcompat:1.4.1'
+    api 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'com.google.code.gson:gson:2.8.5'
+    api 'com.github.bumptech.glide:glide:4.9.0'
+    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+	
+	// WinBoLL库 nexus.winboll.cc 地址
+    api 'cc.winboll.studio:libappbase:15.20.21'
+    api 'cc.winboll.studio:libaes:15.20.9'
+	
+	// 备用库 jitpack.io 地址
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.20'
+	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.8'
+	
+	
+    api fileTree(dir: 'libs', include: ['*.jar'])
+}

libwinboll/build.properties

@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Sun May 31 20:40:44 HKT 2026
+stageCount=4
+libraryProject=libwinboll
+baseVersion=15.20
+publishVersion=15.20.3
+buildCount=0
+baseBetaVersion=15.20.4

libwinboll/proguard-rules.pro

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

libwinboll/src/main/AndroidManifest.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
+    package="cc.winboll.studio.libwinboll" >
 
     <application>
-
-        <!-- Put flavor specific code here -->
-
+        <activity
+            android:name=".WinBoLLLibraryActivity">
+        </activity>
     </application>
 
 </manifest>

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

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

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

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

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

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

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

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

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

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

mywinboll/.gitignore

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

mywinboll/README.md

@@ -1,37 +0,0 @@
-# WinBoLL
-
-#### 介绍
-WinBoLL 网站浏览器。
-
-#### 软件架构
-适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
-也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
-
-
-#### Gradle 编译说明
-调试版编译命令 ：gradle assembleBetaDebug
-阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh winboll
-
-#### 使用说明
-3. Termux应用配置：
-- 已安装Termux（包名 com.termux ）；
-- 执行  echo "allow-external-apps = true" > ~/.termux/termux.properties
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码 : ZhanGSKen(ZhanGSKen<ZhanGSKen@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

@@ -1 +0,0 @@
-

mywinboll/build.gradle

@@ -1,110 +0,0 @@
-apply plugin: 'com.android.application'
-apply from: '../.winboll/winboll_app_build.gradle'
-apply from: '../.winboll/winboll_lint_build.gradle'
-
-def genVersionName(def versionName){
-    // 检查编译标志位配置
-    assert (winbollBuildProps['stageCount'] != null)
-    assert (winbollBuildProps['baseVersion'] != null)
-    // 保存基础版本号
-    winbollBuildProps.setProperty("baseVersion", "${versionName}");
-    //保存编译标志配置
-    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
-    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
-    fos.close();
-    
-    // 返回编译版本号
-    return "${versionName}." + winbollBuildProps['stageCount']
-}
-
-android {
-	// 适配MIUI12
-	compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-	
-    defaultConfig {
-        applicationId "cc.winboll.studio.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

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

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

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

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

mywinboll/src/main/AndroidManifest.xml

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

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

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

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

@@ -1,62 +0,0 @@
-package cc.winboll.studio.mywinboll;
-
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.ToastUtils;
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libaes.utils.DevelopUtils;
-
-public class MainActivity extends AppCompatActivity {
-
-    public static final String TAG = "MainActivity";
-    LogView mLogView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        AESThemeUtil.applyAppCompatTheme(this);
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-
-        mLogView = findViewById(R.id.logview);
-
-        ToastUtils.show("onCreate");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        AESThemeUtil.inflateCompatThemeMenu(this, menu);
-        if (GlobalApplication.isDebugging()) {
-            DevelopUtils.inflateMenu(this, menu);
-        }
-        getMenuInflater().inflate(cc.winboll.studio.libaes.R.menu.toolbar_drawerbase, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        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);
-        }
-        return true;
-    }
-}

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

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

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

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

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

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical">
-
-	<cc.winboll.studio.libaes.views.ASupportToolbar
-		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:gravity="center_vertical|center_horizontal">
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="MyWinBoLL"
-			android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0">
-
-		<cc.winboll.studio.libappbase.LogView
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:id="@+id/logview"/>
-
-	</LinearLayout>
-
-</LinearLayout>
-

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

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

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

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

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

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#42A5F5</color>
-    <color name="colorPrimaryDark">#1565C0</color>
-    <color name="colorAccent">#FFD740</color>
-    <color name="mainWindowBackgroundColor">#121212</color>
-    <color name="mainWindowTextColor">#E0E0E0</color>
-    <color name="toolbarTextColor">#FFFFFF</color>
-    <color name="toolbarBackgroundColor">#1E3A5F</color>
-    <color name="debugTextColor">#00E676</color>
-    <color name="colorTextBackgound">#121212</color>
-</resources>

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

@@ -1,29 +0,0 @@
-<resources>
-
-    <style name="MyAppTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
-        <item name="themeDebug">@style/MyDebugActivityTheme</item>
-        <item name="aboutViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
-        <item name="aboutViewTextColor">?attr/mainWindowDarkTextColor</item>
-        <item name="aboutViewTitleColor">?attr/mainWindowDarkTextColor</item>
-        <item name="aboutViewDividerColor">?attr/mainWindowTextColor</item>
-        <item name="dialogBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
-        <item name="dialogTextColor">?attr/mainWindowDarkTextColor</item>
-        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
-        <item name="toolbarTextColor">@color/toolbarTextColor</item>
-        <item name="textViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
-        <item name="textViewTextColor">?attr/mainWindowDarkTextColor</item>
-        <item name="editTextBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
-        <item name="editTextTextColor">?attr/mainWindowDarkTextColor</item>
-        <item name="scrollViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
-        <item name="activityBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
-        <item name="activityTextColor">?attr/mainWindowDarkTextColor</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>
-    </style>
-
-    <style name="MyAESASupportToolbar" parent="AESASupportToolbar" />
-
-</resources>

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

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#1565C0</color>
-    <color name="colorPrimaryDark">#0D47A1</color>
-    <color name="colorAccent">#FF6F00</color>
-    <color name="mainWindowBackgroundColor">#FAFAFA</color>
-    <color name="mainWindowTextColor">#212121</color>
-    <color name="toolbarTextColor">#FFFFFF</color>
-    <color name="toolbarBackgroundColor">#1565C0</color>
-    <color name="debugTextColor">#616161</color>
-    <color name="colorTextBackgound">#FAFAFA</color>
-</resources>

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

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

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

@@ -1,37 +0,0 @@
-<resources>
-
-    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
-        <item name="themeDebug">@style/MyDebugActivityTheme</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>
-    </style>
-
-    <style name="MyDebugActivityTheme" parent="DebugActivityTheme">
-        <item name="colorTittle">?attr/mainWindowTextColor</item>
-        <item name="colorTittleBackgound">?attr/toolbarBackgroundColor</item>
-        <item name="colorText">?attr/debugTextColor</item>
-        <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
-        <item name="toolbarTextColor">@color/toolbarTextColor</item>
-    </style>
-
-    <style name="MyAESASupportToolbar" parent="AESASupportToolbar" />
-
-</resources>

mywinboll/src/stage/AndroidManifest.xml

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

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

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

settings.gradle

@@ -1,3 +0,0 @@
-// MyWinBoLL 项目编译设置
-include ':mywinboll'
-rootProject.name = "mywinboll"

settings.gradle-demo

@@ -1,3 +1,98 @@
-// MyWinBoLL 项目编译设置
-//include ':mywinboll'
-//rootProject.name = "mywinboll"
+// AutoInstaller 项目编译设置
+//include ':autoinstaller'
+//rootProject.name = "autoinstaller"
+
+// MJ 项目编译设置
+//include ':mj'
+//rootProject.name = "mj"
+
+// PowerBell 项目编译设置
+//include ':powerbell'
+//rootProject.name = "powerbell"
+
+// APPBase 项目编译设置
+//include ':appbase'
+//include ':libappbase'
+//rootProject.name = "appbase"
+
+// APPUtils 项目编译设置
+//include ':apputils'
+//include ':libapputils'
+//rootProject.name = "apputils"
+
+// JC 项目编译设置
+//include ':jc'
+//include ':libjc'
+//rootProject.name = "jc"
+
+// AES 项目编译设置
+//include ':aes'
+//include ':libaes'
+//rootProject.name = "aes"
+
+// Contacts 项目编译设置
+//include ':contacts'
+//rootProject.name = "contacts"
+
+// MyMessageManager 项目编译设置
+//include ':mymessagemanager'
+//rootProject.name = "mymessagemanager"
+
+// TimeStamp 项目编译设置
+//include ':timestamp'
+//rootProject.name = "timestamp"
+
+// AndroidDemo 项目编译设置
+//include ':androiddemo'
+//rootProject.name = "androiddemo"
+
+// AndroidXDemo 项目编译设置
+//include ':androidxdemo'
+//rootProject.name = "androidxdemo"
+
+// Ollama 项目编译设置
+//include ':ollama'
+//rootProject.name = "ollama"
+
+// NumTable 项目编译设置
+//include ':numtable'
+//rootProject.name = "numtable"
+
+// MidiPlayer 项目编译设置
+//include ':midiplayer'
+//rootProject.name = "midiplayer"
+
+// WebPageSources 项目编译设置
+//include ':webpagesources'
+//rootProject.name = "webpagesources"
+
+// Positions 项目编译设置
+//include ':positions'
+//rootProject.name = "positions"
+
+// WinBoLL 项目编译设置
+//include ':winboll'
+//include ':libwinboll'
+//rootProject.name = "winboll"
+
+// RegExpUtils 项目编译设置
+//include ':regexputils'
+//rootProject.name = "regexputils"
+
+// GPSRelaySentinel 项目编译设置
+//include ':gpsrelaysentinel'
+//include ':libgpsrelaysentinel'
+//rootProject.name = "gpsrelaysentinel"
+
+// Gallery 项目编译设置
+//include ':gallery'
+//rootProject.name = "gallery"
+
+// DebugTemp 项目编译设置
+//include ':debugtemp'
+//include ':libdebugtemp'
+//rootProject.name = "debugtemp"
+
+// AutoNFC 项目编译设置
+//include ':autonfc'
+//rootProject.name = "autonfc"

winboll/build.gradle

@@ -18,14 +18,10 @@ def genVersionName(def versionName){
 }
 
 android {
- 	// 适配MIUI12
-     compileSdkVersion 30
- 	
-     compileOptions {
-         sourceCompatibility JavaVersion.VERSION_1_7
-         targetCompatibility JavaVersion.VERSION_1_7
-     }
- 
+	// 适配MIUI12
+	compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+	
     defaultConfig {
         applicationId "cc.winboll.studio.winboll"
         minSdkVersion 26
@@ -40,9 +36,21 @@ android {
             versionName = genVersionName("${versionName}")
         }
     }
+
+	// 米盟 SDK
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
+    }
+	
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs'] // 若SO库放在libs目录下
+        }
+    }
 }
 
 dependencies {
+	api project(':libwinboll')
     api 'com.google.code.gson:gson:2.10.1'
 	
 	// 下拉控件
@@ -72,7 +80,7 @@ dependencies {
 	
 	
 	// 米盟
-	//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'
@@ -95,17 +103,14 @@ dependencies {
 	implementation 'com.termux:terminal-emulator:0.118.0'
 	implementation 'com.termux:terminal-view:0.118.0'
 	implementation 'com.termux:termux-shared:0.118.0'
-
-	// Biometric (指纹识别)
-	implementation 'androidx.biometric:biometric:1.1.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    api 'cc.winboll.studio:libappbase:15.20.34'
-    api 'cc.winboll.studio:libaes:15.20.17'
+    api 'cc.winboll.studio:libappbase:15.20.22'
+    api 'cc.winboll.studio:libaes:15.20.10'
 	
 	// 备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
-	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.16'
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.21'
+	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.9'
 	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }

winboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jul 01 14:49:57 CST 2026
-stageCount=9
-libraryProject=
+#Sun May 31 20:40:44 HKT 2026
+stageCount=4
+libraryProject=libwinboll
 baseVersion=15.20
-publishVersion=15.20.8
-buildCount=16
-baseBetaVersion=15.20.9
+publishVersion=15.20.3
+buildCount=0
+baseBetaVersion=15.20.4

winboll/src/main/AndroidManifest.xml

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

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

@@ -14,6 +14,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.ViewGroup;
@@ -21,12 +22,8 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.GlobalCrashActivity;
 import cc.winboll.studio.libappbase.ToastUtils;
-import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -36,63 +33,45 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 
 public class App extends GlobalApplication {
-
+	
 	public static final String TAG = "App";
-
+	
 	public static final String COMPONENT_EN1 = "cc.winboll.studio.winboll.MainActivityEN1";
 	public static final String COMPONENT_CN1 = "cc.winboll.studio.winboll.MainActivityCN1";
 	public static final String COMPONENT_CN2 = "cc.winboll.studio.winboll.MainActivityCN2";
 	public static final String ACTION_SWITCHTO_EN1 = "cc.winboll.studio.winboll.App.ACTION_SWITCHTO_EN1";
 	public static final String ACTION_SWITCHTO_CN1 = "cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN1";
 	public static final String ACTION_SWITCHTO_CN2 = "cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN2";
-
+	
     private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
-
+	
     @Override
     public void onCreate() {
-		try {
-			super.onCreate();
-
-			ToastUtils.init(this);
-
-			WinBoLLActivityManager.init(this);
-			
-			// 初始化 AES 主题工具（注入当前应用命名空间的主题ID列表，按 ThemeType.ordinal() 顺序）
-			ArrayList<Integer> themeStyleList = new ArrayList<Integer>();
-			themeStyleList.add(R.style.MyAppTheme);         // AES(0)
-			themeStyleList.add(R.style.MyDepthAppTheme);   // DEPTH(1)
-			themeStyleList.add(R.style.MySkyAppTheme);     // SKY(2)
-			themeStyleList.add(R.style.MyGoldenAppTheme);  // GOLDEN(3)
-			themeStyleList.add(R.style.MyBearingAppTheme); // BEARING(4)
-			themeStyleList.add(R.style.MyMemorAppTheme);   // MEMOR(5)
-			themeStyleList.add(R.style.MyTaoAppTheme);     // TAO(6)
-			AESThemeUtil.init(themeStyleList);
-
-        } 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,
-                GlobalCrashActivity.class
-            );
-        }
+        super.onCreate();
+		//setIsDebugging(BuildConfig.DEBUG);
+		//setIsDebugging(false);
+		
+		WinBoLLActivityManager.init(this);
+        
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
+        // 设置 Toast 布局样式
+        //ToastUtils.setView(R.layout.view_toast);
+        //ToastUtils.setStyle(new WhiteToastStyle());
+        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+        
+        //CrashHandler.getInstance().registerGlobal(this);
+        //CrashHandler.getInstance().registerPart(this);
     }
 
 	@Override
@@ -100,8 +79,8 @@ public class App extends GlobalApplication {
 		super.onTerminate();
 		ToastUtils.release();
 	}
-
-
+	
+	
 
     public static void write(InputStream input, OutputStream output) throws IOException {
         byte[] buf = new byte[1024 * 8];

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

@@ -17,7 +17,7 @@ import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.winboll.R;
 import cc.winboll.studio.winboll.activities.AboutActivity;
 import cc.winboll.studio.winboll.activities.SettingsActivity;
-import cc.winboll.studio.winboll.termux.MyTermuxActivity;
+import cc.winboll.studio.winboll.applications.MyTermuxActivity;
 import cc.winboll.studio.winboll.fragments.BrowserFragment;
 import cc.winboll.studio.winboll.unittest.TermuxEnvTestActivity;
 import java.util.ArrayList;
@@ -37,7 +37,7 @@ public class MainActivity extends DrawerFragmentActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
+        setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(this));
         super.onCreate(savedInstanceState);
         initMainHandler();
         if (mBrowserFragment == null) {
@@ -150,12 +150,11 @@ public class MainActivity extends DrawerFragmentActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-		super.onCreateOptionsMenu(menu);
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
 		if (App.isDebugging()) {
 			getMenuInflater().inflate(R.menu.toolbar_test, menu);
 		}
-        getMenuInflater().inflate(R.menu.toolbar_main, menu);
-		return true;
+        return super.onCreateOptionsMenu(menu);
     }
 
     @Override
@@ -193,7 +192,9 @@ public class MainActivity extends DrawerFragmentActivity {
             } else if (nItemId == R.id.item_termux_env_test) {
                 Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class);
                 WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
-
+            } else if (nItemId == R.id.item_library_activity) {
+                Intent intent = new Intent(getApplicationContext(), cc.winboll.studio.libwinboll.WinBoLLLibraryActivity.class);
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
             } else {
                 return super.onOptionsItemSelected(item);
             }

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

@@ -14,6 +14,7 @@ import android.os.Looper;
 import android.view.MotionEvent;
 import android.widget.FrameLayout;
 import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.winboll.R;
 
@@ -56,6 +57,7 @@ public class PatternLockActivity extends BaseWinBoLLActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        AESThemeUtil.applyAppTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_pattern_lock);
 

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

@@ -3,6 +3,7 @@ package cc.winboll.studio.winboll.activities;
 import android.os.Bundle;
 import android.view.View;
 import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.winboll.R;
 import android.app.Activity;
 
@@ -28,6 +29,7 @@ public class SettingsActivity extends BaseWinBoLLActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        AESThemeUtil.applyAppTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
 		

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

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

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

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

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

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

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

@@ -11,11 +11,10 @@
 		android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>
 
-<!-- <cc.winboll.studio.libaes.views.ADsControlView
-			android:id="@+id/ads_control_view"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content" /> -->
-
+    <cc.winboll.studio.libaes.views.ADsControlView
+		android:id="@+id/ads_control_view"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content" />
 	
 </LinearLayout>
 

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

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

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

@@ -17,7 +17,6 @@
     <string name="menu_execute">执行</string>
     <string name="menu_edit">编辑</string>
     <string name="menu_delete">删除</string>
-    <string name="menu_create_shortcut">创建桌面快捷方式</string>
     <string name="menu_cancel">取消</string>
     <string name="dialog_delete_title">确认删除</string>
     <string name="dialog_delete_message">确定要删除</string>
@@ -31,15 +30,4 @@
     <string name="hint_work_dir">工作目录（默认 ~）</string>
     <string name="toast_deleted">已删除</string>
     <string name="toast_fields_required">按钮名称和执行命令不能为空</string>
-    <string name="toast_shortcut_not_supported">系统不支持创建桌面快捷方式</string>
-    <string name="toast_shortcut_failed">创建桌面快捷方式失败</string>
-    <string name="toast_shortcut_not_found">未找到对应的按钮，请先打开MyTermuxActivity</string>
-    <string name="toast_auth_failed">指纹验证失败</string>
-    <string name="biometric_title">指纹验证</string>
-    <string name="biometric_description">名称：%1$s\n命令：%2$s</string>
-    <string name="biometric_start">开始指纹验证</string>
-    <string name="label_icon">Icon</string>
-    <string name="btn_select_icon">Select Icon</string>
-    <string name="btn_clear_icon">Clear Icon</string>
-    <string name="toast_icon_copy_failed">Failed to import icon</string>
 </resources>