<stallhelper>APK 15.20.9 release Publish.

- build.gradle: libaes 15.20.4→15.20.14, libappbase 15.20.15→15.20.25
- DiningTableBean/TaskSchedulerBean: BaseBean 导入路径适配 libappbase 15.20.25 新包结构
- AboutActivity: appGitName 改为 MyWinBoLL，Git 地址指向 gitea.winboll.cc/ZhanGSKen/MyWinBoLL

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

.winboll/winboll_app_build.gradle

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

LICENSE-Private-Demo

@@ -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 Jun 03 07:07:27 HKT 2026
+stageCount=15
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.18
+publishVersion=15.20.14
 buildCount=0
-baseBetaVersion=15.20.19
+baseBetaVersion=15.20.15

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

@@ -7,7 +7,7 @@ package cc.winboll.studio.aes;
  */
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
-import cc.winboll.studio.libappbase.CrashActivity;
+import cc.winboll.studio.libappbase.CrashHandler;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.ToastUtils;
 import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
@@ -36,7 +36,7 @@ public class App extends GlobalApplication {
 				this,
 				getPackageName(),
 				stackTraceStr,
-				CrashActivity.class
+				CrashHandler.CrashActivity.class
 			);
 		}
 

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 Jun 03 06:52:38 HKT 2026
+stageCount=26
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.34
+publishVersion=15.20.25
 buildCount=0
-baseBetaVersion=15.20.35
+baseBetaVersion=15.20.26

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,6 +1,6 @@
 package cc.winboll.studio.appbase;
 
-import cc.winboll.studio.libappbase.CrashActivity;
+import cc.winboll.studio.libappbase.CrashHandler;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.ToastUtils;
 import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
@@ -39,7 +39,7 @@ public class App extends GlobalApplication {
                 this,
                 getPackageName(),
                 stackTraceStr,
-                CrashActivity.class
+                CrashHandler.CrashActivity.class
             );
         }
     }

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.25'
 	// 备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
-
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.25'
+	
     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 Jun 03 07:07:27 HKT 2026
+stageCount=15
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.18
+publishVersion=15.20.14
 buildCount=0
-baseBetaVersion=15.20.19
+baseBetaVersion=15.20.15

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

@@ -15,6 +15,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
+
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -22,9 +23,9 @@ import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+
 import cc.winboll.studio.libaes.DrawerMenuDataAdapter;
 import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.models.AESThemeBean;
 import cc.winboll.studio.libaes.models.DrawerMenuBean;
@@ -32,9 +33,11 @@ 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;
 
 public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBoLLActivity, AdapterView.OnItemClickListener {
@@ -88,10 +91,10 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         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
@@ -148,10 +151,10 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     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() {

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

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>

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 Jun 03 06:52:38 HKT 2026
+stageCount=26
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.34
+publishVersion=15.20.25
 buildCount=0
-baseBetaVersion=15.20.35
+baseBetaVersion=15.20.26

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.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);
+        }
+
+        /**
+         * 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

@@ -152,7 +152,7 @@ public class GlobalApplication extends Application {
                 this,
                 getPackageName(),
                 stackTraceStr,
-                CrashActivity.class
+                CrashHandler.CrashActivity.class
             );
         }
     }

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

libwinboll/build.properties

@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Wed Jun 03 07:32:48 HKT 2026
+stageCount=8
+libraryProject=libwinboll
+baseVersion=15.20
+publishVersion=15.20.7
+buildCount=0
+baseBetaVersion=15.20.8

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

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

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

@@ -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/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/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/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>

settings.gradle

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

settings.gradle-demo

@@ -1,3 +1,102 @@
-// 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"
+
+// StallHelper 项目编译设置
+//include ':stallhelper'
+//rootProject.name = "stallhelper"

stallhelper/README.md

@@ -0,0 +1,4 @@
+# StallHelper
+# 排档辅助管理工具
+
+## LargeStall Stand Auxiliary Management Tool.

stallhelper/build.gradle

@@ -18,35 +18,33 @@ def genVersionName(def versionName){
 }
 
 android {
-	// 适配MIUI12
-	compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-	
+    compileSdkVersion 30
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
+        }
+
     defaultConfig {
-        applicationId "cc.winboll.studio.mywinboll"
+        applicationId "cc.winboll.studio.stallhelper"
         minSdkVersion 26
         targetSdkVersion 30
-        //1. Android 官方规则
-		//-  versionCode  类型：int 整型
-		//- Java int 最大值：2147483647
-        versionCode 1520000
+        versionCode 1
         // versionName 更新后需要手动设置 
-        // 项目模块目录的 build.gradle 文件的 stageCount=0
+        // .winboll/winbollBuildProps.properties 文件的 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'
-    
+    // 拼音搜索
+    // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
+    api 'com.github.open-android:pinyin4j:2.5.0'
     // SSH
     api 'com.jcraft:jsch:0.1.55'
     // Html 解析
@@ -56,55 +54,27 @@ dependencies {
     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'
+    // AndroidX 类库
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.cardview:cardview:1.0.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 'androidx.fragment:fragment:1.1.0'
 	
-	
-	// 米盟
-	//api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
-     //注意：以下5个库必须要引入
+	//注意：以下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'
-
-	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 'cc.winboll.studio:libaes:15.20.14'
+    api 'cc.winboll.studio:libappbase:15.20.25'
 	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }

stallhelper/build.properties

@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Wed Jun 03 17:55:01 HKT 2026
+stageCount=10
+libraryProject=
+baseVersion=15.20
+publishVersion=15.20.9
+buildCount=0
+baseBetaVersion=15.20.10

stallhelper/proguard-rules.pro

@@ -67,6 +67,12 @@
 -keep class okio.** { *; }
 -dontwarn okhttp3.internal.platform.**
 -dontwarn okio.**
+# ============================== 必要补充规则 ==============================
+# OkHttp 4.4.1 补充规则（Java 7 兼容）
+-keep class okhttp3.internal.concurrent.** { *; }
+-keep class okhttp3.internal.connection.** { *; }
+-dontwarn okhttp3.internal.concurrent.TaskRunner
+-dontwarn okhttp3.internal.connection.RealCall
 
 # Glide 4.9.0（米盟广告图片加载依赖）
 -keep public class * implements com.bumptech.glide.module.GlideModule

stallhelper/src/beta/AndroidManifest.xml

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

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">排档辅助管理工具+</string>
+
+</resources>

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

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

stallhelper/src/main/AndroidManifest.xml

@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cc.winboll.studio.stallhelper">
+
+    <!-- 拥有完全的网络访问权限 -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <application
+        android:name=".App"
+        android:allowBackup="true"
+        android:icon="@drawable/ic_stall"
+        android:label="@string/app_name"
+        android:theme="@style/MyStallHelperTheme"
+        android:supportsRtl="true">
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:launchMode="standard"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <activity
+            android:name=".activities.AboutActivity"
+            android:label="AboutActivity"/>
+
+        <activity
+            android:name="cc.winboll.studio.stallhelper.activities.PreNullDiningTableActivity"
+            android:windowSoftInputMode="adjustResize"/>
+
+        <activity
+            android:name="cc.winboll.studio.stallhelper.activities.CompleteDiningTableActivity"
+            android:windowSoftInputMode="adjustResize"/>
+
+         <activity android:name="cc.winboll.studio.stallhelper.activities.NoteRecordHelperActivity"/>
+
+         <activity android:name="cc.winboll.studio.stallhelper.activities.TaskSchedulerActivity"/>
+
+     </application>
+
+ </manifest>

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

@@ -0,0 +1,36 @@
+package cc.winboll.studio.stallhelper;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2025/01/22 00:11:41
+ * @Describe 全局应用类
+ */
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.libappbase.BuildConfig;
+
+public class App extends GlobalApplication {
+    
+    public static final String TAG = "App";
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+		
+		if (isDebugging() != true) {
+			setIsDebugging(BuildConfig.DEBUG);
+		}
+		//setIsDebugging(false);
+		WinBoLLActivityManager.init(this);
+
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
+    }
+
+	@Override
+	public void onTerminate() {
+		super.onTerminate();
+		ToastUtils.release();
+	}
+}

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

@@ -0,0 +1,135 @@
+package cc.winboll.studio.stallhelper;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.stallhelper.R;
+import cc.winboll.studio.stallhelper.activities.AboutActivity;
+import cc.winboll.studio.stallhelper.activities.CompleteDiningTableActivity;
+import cc.winboll.studio.stallhelper.activities.NoteRecordHelperActivity;
+import cc.winboll.studio.stallhelper.activities.PreNullDiningTableActivity;
+import cc.winboll.studio.stallhelper.activities.TaskSchedulerActivity;
+import cc.winboll.studio.stallhelper.activities.WinBoLLActivity;
+
+final public class MainActivity extends WinBoLLActivity {
+
+	public static final String TAG = "MainActivity";
+
+    public static final int REQUEST_HOME_ACTIVITY = 0;
+    public static final int REQUEST_ABOUT_ACTIVITY = 1;
+    Context mContext;
+    private Toolbar mToolbar;
+
+//    @Override
+//    protected boolean isEnableDisplayHomeAsUp() {
+//        return false;
+//    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        mContext = getApplicationContext();
+
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+
+//    @Override
+//    protected boolean isAddWinBoLLToolBar() {
+//        return true;
+//    }
+//
+//    @Override
+//    protected Toolbar initToolBar() {
+//        return findViewById(R.id.activitymainToolbar1);
+//    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.action_about) {
+            startActivity(new Intent(this, AboutActivity.class));
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    void openAboutActivity() {
+        Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
+		startActivity(intent);
+        //App.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), AboutActivity.class);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (resultCode) {
+            case REQUEST_HOME_ACTIVITY : {
+                    LogUtils.d(TAG, "REQUEST_HOME_ACTIVITY");
+                    break;
+                }
+            case REQUEST_ABOUT_ACTIVITY : {
+                    LogUtils.d(TAG, "REQUEST_ABOUT_ACTIVITY");
+                    break;
+                }
+            default : {
+                    super.onActivityResult(requestCode, resultCode, data);
+                }
+        }
+    }
+
+    public void onPreNullDiningTable(View view) {
+        //ToastUtils.show("onDiningTable");
+		Intent intent = new Intent(getApplicationContext(), PreNullDiningTableActivity.class);
+		startActivity(intent);
+        //App.getWinBoLLActivityManager().startWinBoLLActivity(mContext, PreNullDiningTableActivity.class);
+//        try {
+//            WinBoLLActivity clazzActivity = PreNullDiningTableActivity.class.newInstance();
+//            String tag = clazzActivity.getTag();
+//            LogUtils.d(TAG, "String tag = clazzActivity.getTag(); tag " + tag);
+//            Intent intent = new Intent(getApplicationContext(), PreNullDiningTableActivity.class);
+//            startWinBoLLActivity(intent, tag);
+//        } catch (IllegalAccessException e) {} catch (InstantiationException e) {}
+    }
+
+    public void onCompleteDiningTable(View view) {
+        //ToastUtils.show("onDiningTable");
+		Intent intent = new Intent(getApplicationContext(), CompleteDiningTableActivity.class);
+		startActivity(intent);
+        //App.getWinBoLLActivityManager().startWinBoLLActivity(mContext, CompleteDiningTableActivity.class);
+//        try {
+//            WinBoLLActivity clazzActivity = CompleteDiningTableActivity.class.newInstance();
+//            String tag = clazzActivity.getTag();
+//            LogUtils.d(TAG, "String tag = clazzActivity.getTag(); tag " + tag);
+//            Intent intent = new Intent(getApplicationContext(), CompleteDiningTableActivity.class);
+//            startWinBoLLActivity(intent, tag);
+//        } catch (IllegalAccessException e) {} catch (InstantiationException e) {}
+    }
+	
+	public void onNoteRecordHelper(View view) {
+		Intent intent = new Intent(getApplicationContext(), NoteRecordHelperActivity.class);
+		startActivity(intent);
+    }
+
+    public void onTaskScheduler(View view) {
+		Intent intent = new Intent(getApplicationContext(), TaskSchedulerActivity.class);
+		startActivity(intent);
+    }
+}

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

@@ -0,0 +1,50 @@
+package cc.winboll.studio.stallhelper.activities;
+
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.stallhelper.R;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.models.APPInfo;
+import cc.winboll.studio.libappbase.views.AboutView;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/11 12:55
+ * @Describe AboutActivity
+ */
+public class AboutActivity extends AppCompatActivity {
+
+    public static final String TAG = "AboutActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+		AboutView aboutView = findViewById(R.id.aboutview);
+		aboutView.setAPPInfo(genDefaultAppInfo());
+    }
+
+	private APPInfo genDefaultAppInfo() {
+        LogUtils.d(TAG, "genDefaultAppInfo() 调用");
+        String branchName = "stallhelper";
+        APPInfo appInfo = new APPInfo();
+        appInfo.setAppName("StallHelper");
+        appInfo.setAppIcon(R.drawable.ic_winboll);
+        appInfo.setAppDescription(getString(R.string.app_description));
+        appInfo.setAppGitName("MyWinBoLL");
+        appInfo.setAppGitOwner("ZhanGSKen");
+        appInfo.setAppGitAPPBranch(branchName);
+        appInfo.setAppGitAPPSubProjectFolder(branchName);
+        appInfo.setAppHomePage("http://10.8.0.4:9876/apks/index-manager.php?project=StallHelper");
+        appInfo.setAppAPKName("StallHelper");
+        appInfo.setAppAPKFolderName("StallHelper");
+        LogUtils.d(TAG, "genDefaultAppInfo: 应用信息已生成");
+        return appInfo;
+    }
+}

stallhelper/src/main/java/cc/winboll/studio/stallhelper/activities/CompleteDiningTableActivity.java

@@ -0,0 +1,371 @@
+package cc.winboll.studio.stallhelper.activities;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2024/10/29 09:22:24
+ * @Describe 餐桌表补全窗口
+ */
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.Toast;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.stallhelper.App;
+import cc.winboll.studio.stallhelper.R;
+import cc.winboll.studio.stallhelper.beans.DiningTableBean;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+
+public class CompleteDiningTableActivity extends WinBoLLActivity {
+
+    public static final String TAG = "CompleteDiningTableActivity";
+
+    // 某一号晚上的餐桌预定补全列表
+    ArrayList<DiningTableBean> mCompleteTableInfoList;
+    // 原始预定信息内容输入框
+    EditText metOriginBookText;
+    EditText metPreBookList;
+    EditText metCompleteDate;
+    ScrollView mScrollView;
+
+    ArrayList<String> mszOriginBookList;
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+//    @Override
+//    protected boolean isEnableDisplayHomeAsUp() {
+//        return true;
+//    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_completediningtable);
+        setTitle("餐桌表补全");
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        StringBuilder sbDateNow = new StringBuilder("当前日期：");
+        Date now = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String timeString = sdf.format(now);
+        sbDateNow.append(timeString);
+        TextView tvDateNow = findViewById(R.id.activitycompletediningtableTextView2);
+        tvDateNow.setText(sbDateNow.toString());
+
+
+        metOriginBookText = findViewById(R.id.activitycompletediningtableEditText1);
+        metPreBookList = findViewById(R.id.activitycompletediningtableEditText2);
+        metCompleteDate = findViewById(R.id.activitycompletediningtableEditText3);
+        mScrollView = findViewById(R.id.activitycompletediningtableScrollView1);
+    }
+
+//    @Override
+//    protected Toolbar initToolBar() {
+//        return findViewById(R.id.activitycompletediningtableToolbar1);
+//    }
+//
+//    @Override
+//    protected boolean isAddWinBoLLToolBar() {
+//        return false;
+//    }
+
+    boolean isInCompleteRule(DiningTableBean item) {
+        String szCompleteDate = metCompleteDate.getText().toString() + "号";
+        if (item.getDate().equals(szCompleteDate) && item.getDinnerType() == DiningTableBean.DinnerType.Evening) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            WinBoLLActivityManager.getInstance().finish(this);
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    void createNullCompleteTableInfoList() {
+        mCompleteTableInfoList = new ArrayList<DiningTableBean>();
+        String szCompleteDate = metCompleteDate.getText().toString() + "号";
+
+        mCompleteTableInfoList.add(new DiningTableBean("201", 18, true, szCompleteDate));
+        mCompleteTableInfoList.add(new DiningTableBean("202", 8, true, szCompleteDate));
+        mCompleteTableInfoList.add(new DiningTableBean("203", 8, true, szCompleteDate));
+        mCompleteTableInfoList.add(new DiningTableBean("205", 10, true, szCompleteDate));
+        mCompleteTableInfoList.add(new DiningTableBean("206", 0, true, szCompleteDate));
+        mCompleteTableInfoList.add(new DiningTableBean("207", 0, true, szCompleteDate));
+        mCompleteTableInfoList.add(new DiningTableBean("208", 8, true, szCompleteDate));
+        mCompleteTableInfoList.add(new DiningTableBean("209", 10, true, szCompleteDate));
+        mCompleteTableInfoList.add(new DiningTableBean("210", 8, true, szCompleteDate));
+        mCompleteTableInfoList.add(new DiningTableBean("211", 12, true, szCompleteDate));
+        mCompleteTableInfoList.add(new DiningTableBean("212", 8, true, szCompleteDate));
+        mCompleteTableInfoList.add(new DiningTableBean("213", 9, true, szCompleteDate));
+        mCompleteTableInfoList.add(new DiningTableBean("666", 14, true, szCompleteDate));
+        mCompleteTableInfoList.add(new DiningTableBean("888", 20, true, szCompleteDate));
+
+        for (int i = 1; i < 23; i++) {
+            DiningTableBean tempBean = new DiningTableBean(Integer.toString(i), 0, true, szCompleteDate);
+            tempBean.setDinnerType(DiningTableBean.DinnerType.Evening);
+            tempBean.setTableType(DiningTableBean.TableType.Table);
+            tempBean.setIsSelected(false);
+            mCompleteTableInfoList.add(tempBean);
+        }
+
+        //DiningTableBean.saveBeanListToFile(getApplicationContext().getExternalFilesDir("temp") + "/1.json", mCompleteTableInfoList);
+        //ToastUtils.show("Test");
+    }
+
+    ArrayList<DiningTableBean> getOriginBookList() {
+        //ToastUtils.show(metOriginBookText.getText().toString());
+        ArrayList<DiningTableBean> listReturn = new ArrayList<DiningTableBean>();
+        String[] szOriginBookText = metOriginBookText.getText().toString().split("\\r?\\n");
+        for (String szTemp : szOriginBookText) {
+			String szTemp2 = szTemp.replace(" ", "");
+            DiningTableBean bean = format2DiningTableBean(szTemp2);
+            if (bean != null) {
+                listReturn.add(bean);
+                // 更新补全列表
+                updateCompleteTableInfoList(bean);
+            }
+        }
+        //ToastUtils.show("szOriginBookText : " + Integer.toString(szOriginBookText.length));
+        //ToastUtils.show("listReturn : " + Integer.toString(listReturn.size()));
+        return listReturn;
+    }
+
+    //
+    // 如果补全列表某一项时间和房号与指定项一致，
+    // 就把指定项信息更新至补全列表中。
+    //
+    void updateCompleteTableInfoList(DiningTableBean beanNew) {
+        for (DiningTableBean completeTableInfo : mCompleteTableInfoList) {
+            if (completeTableInfo.getDate().equals(beanNew.getDate())
+                && completeTableInfo.getDinnerType() == beanNew.getDinnerType()
+                && completeTableInfo.getTableNumber().equals(beanNew.getTableNumber())) {
+                completeTableInfo.setBookDesc(beanNew.getBookDesc());
+                completeTableInfo.setIsSelected(true);
+            }
+        }
+    }
+
+    // 
+    // 检验每一个数据行的日期格式，
+    // 如果出现(x号/x月x号)以外的日期标注，
+    // 则提示有数据行日期标识不清晰的情况。
+    //
+    boolean checkLinesDateValidAndShow() {
+        boolean checkResult = true;
+        String[] szLines = metOriginBookText.getText().toString().split("\\r?\\n");
+        if (szLines.length < 1) {
+            ToastUtils.show("没有数据行。");
+            checkResult = false;
+        } else {
+            StringBuilder sb = new StringBuilder("日期标识不清晰，在");
+            for (int i = 0; i < szLines.length; i++) {
+                Pattern pattern = Pattern.compile("(\\d*[月]{0,1}\\d+号)\\s*([晚|午]{0,1}).*");
+                Matcher matcher = pattern.matcher(szLines[i]);
+                if (!matcher.find()) {
+                    sb.append("(");
+                    sb.append(Integer.toString(i + 1));
+                    sb.append(")");
+                    checkResult = false;
+                }
+            }
+            sb.append("行。");
+            if (checkResult == false) {
+                ToastUtils.show(sb.toString());
+            }
+        }
+        return checkResult;
+    }
+
+    //
+    // 获取指定日期的第一条数据的位置
+    // 返回 -1 表示所有数据都没有该日期
+    //
+    int getFirstIndexOfDate(ArrayList<DiningTableBean> originBookList, String szDate) {
+        int nResult = -1;
+        //ToastUtils.show("szDate " + szDate);
+        for (int i = originBookList.size() - 1 ; i > 0; i--) {
+            //LogUtils.d(TAG, "originBookList.get(i).getDate() " + originBookList.get(i).getDate());
+            if (originBookList.get(i).isDiningTableBean()) {
+                if (originBookList.get(i).getDate().equals(szDate)) {
+                    nResult = i;
+                    continue;
+                } else {
+                    return nResult;
+                }
+            } else {
+                nResult = i;
+                continue;
+            }
+        }
+        return nResult;
+    }
+
+    DiningTableBean format2DiningTableBean(String szBookInfo) {
+        if (!szBookInfo.trim().equals("")) {
+            //String sz = "29号晚 201房 123456";
+            // 定义正则表达式模式
+            Pattern pattern = Pattern.compile("(\\d*[月]{0,1}\\d+号)\\s*([晚|午]{0,1})\\s*(\\d+)([房|桌])[-\\s]*(.*)");
+            Matcher matcher = pattern.matcher(szBookInfo);
+            if (matcher.find()) {
+                String date = matcher.group(1);
+                String szDinnerType = matcher.group(2);
+                String tableNumber = matcher.group(3);
+                String szTableType = matcher.group(4);
+                String bookDesc = matcher.group(5);
+
+                DiningTableBean.DinnerType dinnerType = DiningTableBean.DinnerType.Evening;
+                if (szDinnerType.equals("午")) {
+                    dinnerType = DiningTableBean.DinnerType.Noon;
+                }
+                DiningTableBean.TableType tableType = DiningTableBean.TableType.Room;
+                if (szTableType.equals("桌")) {
+                    tableType = DiningTableBean.TableType.Table;
+                }
+                return new DiningTableBean(tableNumber, 0, true, dinnerType, bookDesc, date, tableType);
+            } else {
+                return new DiningTableBean(true, false, szBookInfo);
+            }
+        }
+        return null;
+    }
+
+    void checkAndAddCompleteTableInfoList(ArrayList<DiningTableBean> originBookList) {
+        boolean isAddCompleteTableInfoList = false;
+        for (int i = 0; i < originBookList.size(); i++) {
+            DiningTableBean item = originBookList.get(i);
+            // 循环读取原始 Bean 列表，
+            // 如果遇到第一个匹配指定日期号，
+            // 就不显示 item 项，并且添加预制好的补全表(一次性添加，后续再遇到同类 item 项则不添加补全表。)。
+            if (isInCompleteRule(item)) {
+                // 设置不显示 item 项
+                item.setIsSelected(false);
+
+                // 添加补全列表(一次性添加，后续再遇到同类 item 项则不添加补全表。)
+                if (isAddCompleteTableInfoList == false) {
+                    originBookList.addAll(i, mCompleteTableInfoList);
+                    // 设置后续遇到同类项时，不再添加补全列表
+                    isAddCompleteTableInfoList = true;
+                    i = i + mCompleteTableInfoList.size();
+                }
+            }
+
+        }
+
+        // 如果遍历完原始 Bean 表后还未添加补全表，
+        // 就添加一次补全表
+        if (isAddCompleteTableInfoList == false) {
+            int nInsertPost = getFirstIndexOfDate(originBookList, metCompleteDate.getText().toString() + "号");
+            //ToastUtils.show("nInsertPost " + Integer.toString(nInsertPost));
+            if (nInsertPost == -1) {
+                originBookList.addAll(mCompleteTableInfoList);
+            } else {
+                originBookList.addAll(nInsertPost, mCompleteTableInfoList);
+            }
+            // 设置后续遇到同类项时，不再添加补全列表
+            isAddCompleteTableInfoList = true;
+        }
+    }
+
+    public void onCopyResultText(View view) {
+        // Gets a handle to the clipboard service.
+        ClipboardManager clipboard = (ClipboardManager) getApplicationContext().getSystemService(Context.CLIPBOARD_SERVICE);
+        // Creates a new text clip to put on the clipboard
+        ClipData clip = ClipData.newPlainText("simple text", metPreBookList.getText());
+        // Set the clipboard's primary clip.
+        clipboard.setPrimaryClip(clip);
+        Toast.makeText(getApplicationContext(), "Copy to clipboard.", Toast.LENGTH_SHORT).show();
+    }
+
+    public void onCleanResultText(View view) {
+        metPreBookList.setText("");
+    }
+
+    public void onCreatePreBookList(View view) {
+        if(metCompleteDate.getText().toString().trim().equals("")) {
+            ToastUtils.show("没有填写补全日期");
+            return;
+        }
+        
+        //checkLinesDateValidAndShow();
+        createNullCompleteTableInfoList();
+        ArrayList<DiningTableBean> originBookList = getOriginBookList();
+        checkAndAddCompleteTableInfoList(originBookList);
+
+        StringBuilder sbPreBookList = new StringBuilder();
+        for (int i = 0; i < originBookList.size(); i++) {
+            DiningTableBean item = originBookList.get(i);
+            if (item.isDiningTableBean()) {
+                if (item.getIsSelected()) {
+                    String szDinnerTyp = "";
+                    if (item.getDinnerType() == DiningTableBean.DinnerType.Evening) {
+                        szDinnerTyp = "晚";
+                    }
+
+                    if (item.getDinnerType() == DiningTableBean.DinnerType.Noon) {
+                        szDinnerTyp = "午";
+                    }
+
+                    String szTableType = "";
+                    if (item.getTableType() == DiningTableBean.TableType.Room) {
+                        szTableType = "房";
+                    }
+
+                    if (item.getTableType() == DiningTableBean.TableType.Table) {
+                        szTableType = "桌";
+                    }
+
+                    sbPreBookList.append(item.getDate());
+                    //sbPreBookList.append("号");
+                    sbPreBookList.append(szDinnerTyp);
+                    //sbPreBookList.append(" ");
+                    sbPreBookList.append(item.getTableNumber());
+                    sbPreBookList.append(szTableType);
+                    sbPreBookList.append("-");
+                    sbPreBookList.append(item.getBookDesc());
+                    sbPreBookList.append("\n");
+                }
+            } else {
+                sbPreBookList.append(item.getOriginDesc());
+                sbPreBookList.append("\n");
+            }
+
+            // 不同日期间隔行排版
+            if (i + 1 != originBookList.size()) {
+                if (!originBookList.get(i + 1).getDate().equals(originBookList.get(i).getDate())) {
+                    sbPreBookList.append("\n");
+                }
+            }
+        }
+
+        //metPreBookList.append("\n");
+        metPreBookList.append(sbPreBookList.toString());
+
+        mScrollView.post(new Runnable() {
+                @Override
+                public void run() {
+                    mScrollView.fullScroll(ScrollView.FOCUS_DOWN);
+                }
+            });
+    }
+
+}

stallhelper/src/main/java/cc/winboll/studio/stallhelper/activities/NoteRecordHelperActivity.java

@@ -0,0 +1,226 @@
+package cc.winboll.studio.stallhelper.activities;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.style.BackgroundColorSpan;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.stallhelper.R;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @CreateTime 2026-03-31 00:20:00
+ * @ModifyTime 2026-03-31 14:47:00
+ * @Describe 订单笔录辅助窗口，支持房号、桌号、多房间号(含"号"字)、手机号尾4位及'-'后文本高亮，原文完整输出
+ */
+public class NoteRecordHelperActivity extends AppCompatActivity {
+
+    public static final String TAG = "NoteRecordHelperActivity";
+
+    // 高亮颜色数组
+    private final int[] highlightColors = {
+		Color.parseColor("#4CAF50"),
+		Color.parseColor("#FF9800"),
+		Color.parseColor("#E91E63"),
+		Color.parseColor("#F44336"),
+		Color.parseColor("#FFC107"),
+		Color.parseColor("#2196F3")
+    };
+
+    // 正则匹配
+    // 匹配多房间号（包含后面的"号"字）：11-16-17号
+    private final Pattern PATTERN_MULTI_ROOM = Pattern.compile("(\\d+(?:-\\d+)+\\s*号)");
+    // 匹配手机号（连续11位或带分隔符）
+    private final Pattern PATTERN_PHONE = Pattern.compile("(?:\\d{11}|(?:\\d{3,4}[\\s-]?){3,4})");
+
+    // 控件
+    private EditText etContent;
+    private Button btnHighlight;
+    private TextView tvHighlightResult;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_noterecordhelper);
+        LogUtils.i(TAG, "onCreate: 页面初始化");
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        setTitle("订单笔录辅助");
+
+        initViews();
+    }
+
+    /**
+     * 初始化控件
+     */
+    private void initViews() {
+        etContent = findViewById(R.id.et_content);
+        btnHighlight = findViewById(R.id.btn_highlight);
+        tvHighlightResult = findViewById(R.id.tv_highlight_result);
+
+        btnHighlight.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.i(TAG, "onClick: 点击高亮按钮");
+					highlightContent();
+				}
+			});
+    }
+
+    /**
+     * 解析并高亮内容
+     */
+    private void highlightContent() {
+        LogUtils.i(TAG, "highlightContent: 开始处理高亮");
+
+        String raw = etContent.getText().toString();
+        if (raw.isEmpty()) {
+            LogUtils.i(TAG, "highlightContent: 输入内容为空，直接返回");
+            return;
+        }
+
+        String[] lines = raw.split("\\n");
+        SpannableStringBuilder ssb = new SpannableStringBuilder();
+
+        for (int i = 0; i < lines.length; i++) {
+            String line = lines[i];
+            // 空行也完整保留
+            if (line.isEmpty()) {
+                ssb.append("\n");
+                continue;
+            }
+
+            int colorIndex = i % highlightColors.length;
+            int color = highlightColors[colorIndex];
+
+            LogUtils.d(TAG, "highlightContent: 处理第" + (i + 1) + "行，颜色索引=" + colorIndex);
+            processLine(line, ssb, color);
+
+            if (i != lines.length - 1) {
+                ssb.append("\n");
+            }
+        }
+
+        tvHighlightResult.setText(ssb);
+        LogUtils.i(TAG, "highlightContent: 高亮处理完成");
+    }
+
+    /**
+     * 处理单行高亮（原文完整保留）
+     * @param line 单行文本
+     * @param ssb  富文本构建器
+     * @param color 高亮颜色
+     */
+    private void processLine(String line, SpannableStringBuilder ssb, int color) {
+        LogUtils.d(TAG, "processLine: line=" + line + ", color=" + Integer.toHexString(color));
+
+        // 1. 先把原文完整追加到 ssb，不会丢失任何字符
+        int start = ssb.length();
+        ssb.append(line);
+
+        // 2. 高亮多房间号（包含"号"字）：11-16-17号
+        Matcher mMulti = PATTERN_MULTI_ROOM.matcher(line);
+        if (mMulti.find()) {
+            int s = start + mMulti.start(1);
+            int e = start + mMulti.end(1);
+            ssb.setSpan(new BackgroundColorSpan(color), s, e, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        // 3. 高亮房号 / 桌号
+        int roomIdx = line.indexOf("房");
+        int tableIdx = line.indexOf("号桌");
+
+        if (roomIdx != -1) {
+            int s = findNumberStart(line, roomIdx);
+            int e = roomIdx + 1;
+            ssb.setSpan(new BackgroundColorSpan(color), start + s, start + e, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        } else if (tableIdx != -1) {
+            int s = findNumberStart(line, tableIdx);
+            int e = tableIdx + 2;
+            ssb.setSpan(new BackgroundColorSpan(color), start + s, start + e, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        // 4. 处理'-'后的内容：优先高亮手机号尾4位，否则高亮全部文本
+        int dashIndex = line.indexOf("-");
+        if (dashIndex != -1) {
+            String afterDash = line.substring(dashIndex + 1);
+            Matcher phoneMatcher = PATTERN_PHONE.matcher(afterDash);
+            boolean foundPhone = false;
+
+            // 尝试匹配手机号并高亮尾4位
+            while (phoneMatcher.find()) {
+                String phone = phoneMatcher.group();
+                if (phone != null) {
+                    foundPhone = true;
+                    // 提取纯数字
+                    String pureNumber = phone.replaceAll("[^0-9]", "");
+                    if (pureNumber.length() >= 4) {
+                        String last4 = pureNumber.substring(pureNumber.length() - 4);
+                        // 在原行中定位尾4位（从 dashIndex+1 开始查找，避免匹配前面的数字）
+                        int tailStart = line.indexOf(last4, dashIndex + 1);
+                        if (tailStart != -1) {
+                            int s = start + tailStart;
+                            int e = s + 4;
+                            ssb.setSpan(new BackgroundColorSpan(color), s, e, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                        }
+                    }
+                }
+            }
+
+            // 没有手机号，则高亮'-'后的全部文本
+            if (!foundPhone) {
+                int s = start + dashIndex + 1;
+                int e = start + line.length();
+                ssb.setSpan(new BackgroundColorSpan(color), s, e, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
+        } else {
+            // 无'-'的行，尝试匹配并高亮手机号尾4位
+            Matcher phoneMatcher = PATTERN_PHONE.matcher(line);
+            while (phoneMatcher.find()) {
+                String phone = phoneMatcher.group();
+                if (phone != null) {
+                    String pureNumber = phone.replaceAll("[^0-9]", "");
+                    if (pureNumber.length() >= 4) {
+                        String last4 = pureNumber.substring(pureNumber.length() - 4);
+                        int tailStart = line.indexOf(last4);
+                        if (tailStart != -1) {
+                            int s = start + tailStart;
+                            int e = s + 4;
+                            ssb.setSpan(new BackgroundColorSpan(color), s, e, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 查找数字起始位置
+     * @param line 文本行
+     * @param endIdx 结束位置
+     * @return 数字起始下标
+     */
+    private int findNumberStart(String line, int endIdx) {
+        LogUtils.d(TAG, "findNumberStart: endIdx=" + endIdx);
+
+        for (int i = endIdx - 1; i >= 0; i--) {
+            char c = line.charAt(i);
+            if (!Character.isDigit(c) && c != ' ') {
+                return i + 1;
+            }
+        }
+        return 0;
+    }
+
+}
+

stallhelper/src/main/java/cc/winboll/studio/stallhelper/activities/PreNullDiningTableActivity.java

@@ -0,0 +1,264 @@
+package cc.winboll.studio.stallhelper.activities;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2024/10/16 05:13:42
+ * @Describe 餐桌空白预定表生成窗口
+ */
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.Toast;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.stallhelper.R;
+import cc.winboll.studio.stallhelper.beans.DiningTableBean;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Date;
+
+public class PreNullDiningTableActivity extends WinBoLLActivity {
+
+    public static final String TAG = "DiningTableActivity";
+
+    ArrayList<DiningTableBean> mListTableInfo;
+    DiningTableBeanListAdapter mDiningTableBeanListAdapter;
+    EditText metPreBookList;
+    ScrollView mScrollView;
+    RadioButton mrbDinnerTypeNoon;
+    RadioButton mrbDinnerTypeEvening;
+
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+//    @Override
+//    protected boolean isEnableDisplayHomeAsUp() {
+//        return true;
+//    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_prenulldiningtable);
+        setTitle("餐桌空白预定表制作");
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        StringBuilder sbDateNow = new StringBuilder("当前日期：");
+        Date now = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String timeString = sdf.format(now);
+        sbDateNow.append(timeString);
+        TextView tvDateNow = findViewById(R.id.activityprenulldiningtableTextView2);
+        tvDateNow.setText(sbDateNow.toString());
+
+        LocalDate currentDate = LocalDate.now();
+        int dayOfMonth = currentDate.getDayOfMonth();
+        EditText etDateNow = findViewById(R.id.activityprenulldiningtableEditText1);
+        etDateNow.setText(Integer.toString(dayOfMonth));
+
+
+        mListTableInfo = new ArrayList<DiningTableBean>();
+        addTable();
+        RecyclerView recyclerView = findViewById(R.id.activityprenulldiningtableRecyclerView1);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext(), LinearLayoutManager.HORIZONTAL, false));
+        mDiningTableBeanListAdapter = new DiningTableBeanListAdapter(mListTableInfo);
+        // 设置 RecyclerView 的适配器
+        recyclerView.setAdapter(mDiningTableBeanListAdapter);
+
+        metPreBookList = findViewById(R.id.activityprenulldiningtableEditText2);
+        mScrollView = findViewById(R.id.activityprenulldiningtableScrollView1);
+
+        mrbDinnerTypeNoon = findViewById(R.id.activityprenulldiningtableRadioButton1);
+        mrbDinnerTypeEvening = findViewById(R.id.activityprenulldiningtableRadioButton2);
+        mrbDinnerTypeEvening.setChecked(true);
+
+    }
+
+
+//
+//    @Override
+//    protected Toolbar initToolBar() {
+//        return findViewById(R.id.activityprenulldiningtableToolbar1);
+//    }
+//
+//    @Override
+//    protected boolean isAddWinBoLLToolBar() {
+//        return false;
+//    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            WinBoLLActivityManager.getInstance().finish(this);
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    void addTable() {
+        mListTableInfo.add(new DiningTableBean("201", 18, false));
+        mListTableInfo.add(new DiningTableBean("202", 8, false));
+        mListTableInfo.add(new DiningTableBean("203", 8, false));
+        mListTableInfo.add(new DiningTableBean("205", 10, false));
+        mListTableInfo.add(new DiningTableBean("206", 0, false));
+        mListTableInfo.add(new DiningTableBean("207", 0, false));
+        mListTableInfo.add(new DiningTableBean("208", 8, false));
+        mListTableInfo.add(new DiningTableBean("209", 10, false));
+        mListTableInfo.add(new DiningTableBean("210", 8, false));
+        mListTableInfo.add(new DiningTableBean("211", 12, false));
+        mListTableInfo.add(new DiningTableBean("212", 8, false));
+        mListTableInfo.add(new DiningTableBean("213", 9, false));
+        mListTableInfo.add(new DiningTableBean("666", 14, false));
+        mListTableInfo.add(new DiningTableBean("888", 20, false));
+    }
+
+    public void onDinnerType(View view) {
+        RadioButton rb = (RadioButton)view;
+        if (rb.getId() == mrbDinnerTypeNoon.getId()) {
+            ToastUtils.show("午餐");
+            mrbDinnerTypeEvening.setChecked(false);
+        } else {
+            ToastUtils.show("晚餐");
+            mrbDinnerTypeNoon.setChecked(false);
+        }
+    }
+
+    public void onCopyResultText(View view) {
+        // Gets a handle to the clipboard service.
+        ClipboardManager clipboard = (ClipboardManager) getApplicationContext().getSystemService(Context.CLIPBOARD_SERVICE);
+        // Creates a new text clip to put on the clipboard
+        ClipData clip = ClipData.newPlainText("simple text", metPreBookList.getText());
+        // Set the clipboard's primary clip.
+        clipboard.setPrimaryClip(clip);
+        Toast.makeText(getApplicationContext(), "Copy to clipboard.", Toast.LENGTH_SHORT).show();
+    }
+
+    public void onCleanResultText(View view) {
+        metPreBookList.setText("");
+    }
+
+    public void onCreatePreBookList(View view) {
+        String szDinnerTyp = mrbDinnerTypeEvening.isChecked() ?"晚": "午";
+
+        EditText etDate = findViewById(R.id.activityprenulldiningtableEditText1);
+
+        StringBuilder sbPreBookList = new StringBuilder();
+        for (DiningTableBean item : mListTableInfo) {
+            if (item.getIsSelected()) {
+                /*sbPreBookList.append(etDate.getText());
+                 sbPreBookList.append("号 ");
+                 sbPreBookList.append(szDinnerTyp);
+                 sbPreBookList.append(" ");
+                 sbPreBookList.append(item.getTableNumber());
+                 sbPreBookList.append("房-\n");*/
+
+
+                String szTableType = "";
+                if (item.getTableType() == DiningTableBean.TableType.Room) {
+                    szTableType = "房";
+                }
+
+                if (item.getTableType() == DiningTableBean.TableType.Table) {
+                    szTableType = "桌";
+                }
+
+                sbPreBookList.append(etDate.getText());
+                sbPreBookList.append("号 ");
+                sbPreBookList.append(szDinnerTyp);
+                sbPreBookList.append(" ");
+                sbPreBookList.append(item.getTableNumber());
+                sbPreBookList.append(szTableType);
+                sbPreBookList.append("-");
+                sbPreBookList.append(item.getBookDesc());
+                sbPreBookList.append("\n");
+            }
+        }
+
+        //metPreBookList.append("\n");
+        metPreBookList.append(sbPreBookList.toString());
+
+        mScrollView.post(new Runnable() {
+                @Override
+                public void run() {
+                    mScrollView.fullScroll(ScrollView.FOCUS_DOWN);
+                }
+            });
+    }
+
+    public void onSelectALLTable(View view) {
+        boolean isSelectAll =((CheckBox)findViewById(R.id.activityprenulldiningtableCheckBox1)).isChecked();
+        for (DiningTableBean item : mListTableInfo) {
+            item.setIsSelected(isSelectAll);
+        }
+        //ToastUtils.show(Boolean.toString(isSelectAll));
+        mDiningTableBeanListAdapter.notifyDataSetChanged();
+
+    }
+
+    class DiningTableBeanListAdapter extends RecyclerView.Adapter {
+
+        ArrayList<DiningTableBean> mDataList;
+        public DiningTableBeanListAdapter(ArrayList<DiningTableBean> listInfo) {
+            mDataList = listInfo;
+        }
+        @Override
+        public int getItemCount() {
+            return mDataList.size();
+        }
+
+        @Override
+        public void onBindViewHolder(RecyclerView.ViewHolder holder, final int position) {
+            final DiningTableBean item = mDataList.get(position);
+            if (holder.getItemViewType() == 0) {
+                final SimpleViewHolder viewHolder = (SimpleViewHolder) holder;
+                viewHolder.mcbTable.setText(item.getTableNumber() + "房(" + Integer.toString(item.getMaxPersonCount()) + "人)");
+                viewHolder.mcbTable.setChecked(item.getIsSelected());
+                viewHolder.mcbTable.setOnClickListener(new View.OnClickListener(){
+                        @Override
+                        public void onClick(View v) {
+                            item.setIsSelected(viewHolder.mcbTable.isChecked());
+                        }
+                    });
+
+
+            }
+        }
+
+        @Override
+        public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            if (viewType == 0) {
+                View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.listview_tableinfo, parent, false);
+                return new SimpleViewHolder(view);
+            }
+            return null;
+        }
+
+        class SimpleViewHolder extends RecyclerView.ViewHolder {
+            CheckBox mcbTable;
+            SimpleViewHolder(View itemView) {
+                super(itemView);
+                mcbTable = itemView.findViewById(R.id.listviewtableinfoCheckBox1);
+            }
+        }
+
+    }
+}

stallhelper/src/main/java/cc/winboll/studio/stallhelper/activities/TaskSchedulerActivity.java

@@ -0,0 +1,766 @@
+package cc.winboll.studio.stallhelper.activities;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.ContextMenu;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.PopupMenu;
+import android.widget.TextView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.stallhelper.R;
+import cc.winboll.studio.stallhelper.beans.TaskSchedulerBean;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+import net.sourceforge.pinyin4j.PinyinHelper;
+import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
+import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
+import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2026/05/18
+ * @Describe 任务排档窗口
+ */
+public class TaskSchedulerActivity extends WinBoLLActivity {
+
+    public static final String TAG = "TaskSchedulerActivity";
+
+    // 时间转换常量
+    private static final int MINUTES_PER_HOUR = 60;
+    private static final int HOURS_PER_DAY = 24;
+    private static final int DAYS_PER_MONTH = 30; // 默认按30天计算
+
+    ArrayList<TaskSchedulerBean> mTaskList;
+    TaskSchedulerAdapter mAdapter;
+    EditText mSearchEditText;
+    String mSearchQuery = "";
+    HanyuPinyinOutputFormat mPinyinFormat;
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_task_scheduler);
+        LogUtils.i(TAG, "onCreate: 任务排档页面初始化");
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        setTitle("任务排档");
+
+        // 初始化任务列表
+        mTaskList = new ArrayList<TaskSchedulerBean>();
+        loadTaskData();
+
+        // 设置搜索框
+        mPinyinFormat = new HanyuPinyinOutputFormat();
+        mPinyinFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);
+        mPinyinFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
+
+        mSearchEditText = findViewById(R.id.et_search);
+        mSearchEditText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                mSearchQuery = s.toString().trim().toLowerCase();
+                filterTaskList();
+            }
+        });
+
+        // 设置 RecyclerView
+        RecyclerView recyclerView = findViewById(R.id.task_scheduler_recycler_view);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext(), LinearLayoutManager.VERTICAL, false));
+        mAdapter = new TaskSchedulerAdapter(mTaskList);
+        recyclerView.setAdapter(mAdapter);
+
+        // 设置悬浮按钮点击事件
+        Button fabAddTask = findViewById(R.id.fab_add_task);
+        fabAddTask.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					showAddTaskDialog();
+				}
+			});
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            WinBoLLActivityManager.getInstance().finish(this);
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    /**
+     * 从文件加载任务数据
+     */
+    private void loadTaskData() {
+        boolean loadSuccess = TaskSchedulerBean.loadBeanList(this, mTaskList, TaskSchedulerBean.class);
+        if (loadSuccess) {
+            LogUtils.i(TAG, "loadTaskData: 成功加载 " + mTaskList.size() + " 条任务数据");
+        } else {
+            LogUtils.i(TAG, "loadTaskData: 未找到已保存的任务数据，使用空列表");
+        }
+        sortTaskList();
+    }
+
+    private void applyChanges() {
+        sortTaskList();
+        filterTaskList();
+        saveTaskData();
+    }
+
+    /**
+     * 保存任务数据到文件
+     */
+    private void saveTaskData() {
+        boolean saveSuccess = TaskSchedulerBean.saveBeanList(this, mTaskList, TaskSchedulerBean.class);
+        if (saveSuccess) {
+            LogUtils.i(TAG, "saveTaskData: 成功保存 " + mTaskList.size() + " 条任务数据");
+        } else {
+            LogUtils.e(TAG, "saveTaskData: 任务数据保存失败");
+        }
+    }
+
+    /**
+     * 按排档时间倒序排列列表
+     */
+    private void sortTaskList() {
+        Collections.sort(mTaskList, new Comparator<TaskSchedulerBean>() {
+            @Override
+            public int compare(TaskSchedulerBean a, TaskSchedulerBean b) {
+                long diff = a.getCurrentScheduleTime() - b.getCurrentScheduleTime();
+                if (diff > 0) return 1;
+                if (diff < 0) return -1;
+                return 0;
+            }
+        });
+    }
+
+    /**
+     * 格式化时间戳为年月日和小时
+     * @param timestamp 时间戳
+     * @return 格式化的时间字符串，如 "2026-05-18 09"
+     */
+    private String formatTimestamp(long timestamp) {
+        if (timestamp == 0) {
+            return "";
+        }
+        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH");
+        java.util.Date date = new java.util.Date(timestamp);
+        return sdf.format(date);
+    }
+
+    /**
+     * 解析时间字符串为时间戳
+     * @param timeStr 时间字符串，如 "2026-05-18 09"
+     * @return 时间戳
+     */
+    private long parseTimeString(String timeStr) {
+        if (timeStr == null || timeStr.trim().isEmpty()) {
+            return 0;
+        }
+        try {
+            java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH");
+            java.util.Date date = sdf.parse(timeStr);
+            return date.getTime();
+        } catch (Exception e) {
+            LogUtils.e(TAG, "parseTimeString: 时间解析错误", e);
+            return 0;
+        }
+    }
+
+    /**
+     * 初始化示例数据
+     */
+    private void initSampleData() {
+        java.util.Calendar calendar = java.util.Calendar.getInstance();
+        calendar.set(java.util.Calendar.MINUTE, 0);
+        calendar.set(java.util.Calendar.SECOND, 0);
+        calendar.set(java.util.Calendar.MILLISECOND, 0);
+
+        calendar.set(java.util.Calendar.HOUR_OF_DAY, 9);
+        long time9 = calendar.getTimeInMillis();
+
+        calendar.set(java.util.Calendar.HOUR_OF_DAY, 10);
+        long time10 = calendar.getTimeInMillis();
+
+        calendar.set(java.util.Calendar.HOUR_OF_DAY, 11);
+        calendar.set(java.util.Calendar.MINUTE, 30);
+        long time1130 = calendar.getTimeInMillis();
+
+        calendar.set(java.util.Calendar.HOUR_OF_DAY, 12);
+        calendar.set(java.util.Calendar.MINUTE, 30);
+        long time1230 = calendar.getTimeInMillis();
+
+        calendar.set(java.util.Calendar.HOUR_OF_DAY, 16);
+        calendar.set(java.util.Calendar.MINUTE, 0);
+        long time16 = calendar.getTimeInMillis();
+
+        calendar.set(java.util.Calendar.HOUR_OF_DAY, 17);
+        long time17 = calendar.getTimeInMillis();
+
+        mTaskList.add(new TaskSchedulerBean("准备食材", "购买新鲜蔬菜和肉类", time9, 60));
+        mTaskList.add(new TaskSchedulerBean("烹饪午餐", "按照食谱准备午餐", time10, 90));
+        mTaskList.add(new TaskSchedulerBean("用餐休息", "享受美食并休息", time1130, 60));
+        mTaskList.add(new TaskSchedulerBean("清洁厨房", "清洗餐具和整理厨房", time1230, 45));
+        mTaskList.add(new TaskSchedulerBean("准备晚餐", "提前准备晚餐食材", time16, 60));
+        mTaskList.add(new TaskSchedulerBean("烹饪晚餐", "制作丰盛的晚餐", time17, 90));
+    }
+
+    /**
+     * 将中文转换为拼音（不含声调，小写）
+     */
+    private String toPinyin(String chinese) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < chinese.length(); i++) {
+            char c = chinese.charAt(i);
+            try {
+                String[] pinyins = PinyinHelper.toHanyuPinyinStringArray(c, mPinyinFormat);
+                if (pinyins != null && pinyins.length > 0) {
+                    sb.append(pinyins[0]);
+                }
+            } catch (Exception e) {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 将中文转换为拼音首字母串（小写）
+     */
+    private String toPinyinInitials(String chinese) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < chinese.length(); i++) {
+            char c = chinese.charAt(i);
+            try {
+                String[] pinyins = PinyinHelper.toHanyuPinyinStringArray(c, mPinyinFormat);
+                if (pinyins != null && pinyins.length > 0) {
+                    sb.append(pinyins[0].charAt(0));
+                }
+            } catch (Exception e) {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 检查任务名称是否匹配搜索关键词（支持中文/拼音/首字母）
+     */
+    private boolean matchesSearch(TaskSchedulerBean task, String query) {
+        if (query == null || query.isEmpty()) return true;
+        String name = task.getTaskName();
+        if (name == null) return false;
+        if (name.toLowerCase().contains(query)) return true;
+        String pinyin = toPinyin(name);
+        if (pinyin.contains(query)) return true;
+        String initials = toPinyinInitials(name);
+        if (initials.contains(query)) return true;
+        return false;
+    }
+
+    /**
+     * 根据搜索关键词过滤任务列表并刷新界面
+     */
+    private void filterTaskList() {
+        if (mSearchQuery.isEmpty()) {
+            mAdapter.setData(mTaskList);
+            return;
+        }
+        ArrayList<TaskSchedulerBean> filteredList = new ArrayList<TaskSchedulerBean>();
+        for (TaskSchedulerBean task : mTaskList) {
+            if (matchesSearch(task, mSearchQuery)) {
+                filteredList.add(task);
+            }
+        }
+        mAdapter.setData(filteredList);
+    }
+
+    /**
+     * 将月、天、小时转换为总分钟数
+     * @param month 月份
+     * @param day 天数
+     * @param hour 小时
+     * @return 总分钟数
+     */
+    private int convertToTotalMinutes(int month, int day, int hour) {
+        return month * DAYS_PER_MONTH * HOURS_PER_DAY * MINUTES_PER_HOUR +
+			day * HOURS_PER_DAY * MINUTES_PER_HOUR +
+			hour * MINUTES_PER_HOUR;
+    }
+
+    /**
+     * 将总分钟数转换为月、天、小时的格式字符串
+     * @param totalMinutes 总分钟数
+     * @return 格式化的字符串，如 "0月0天1小时"
+     */
+    private String formatDurationToString(int totalMinutes) {
+        int totalHours = totalMinutes / MINUTES_PER_HOUR;
+        int totalDays = totalHours / HOURS_PER_DAY;
+        int month = totalDays / DAYS_PER_MONTH;
+        int day = totalDays % DAYS_PER_MONTH;
+        int hour = totalHours % HOURS_PER_DAY;
+
+        StringBuilder sb = new StringBuilder();
+        if (month > 0) {
+            sb.append(month).append("月");
+        }
+        if (day > 0) {
+            sb.append(day).append("天");
+        }
+        if (hour > 0) {
+            sb.append(hour).append("小时");
+        }
+        if (sb.length() == 0) {
+            sb.append("0小时");
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 显示编辑任务对话框
+     * @param position 要编辑的任务位置
+     */
+    private void showEditTaskDialog(final int position) {
+        if (position < 0 || position >= mAdapter.mDataList.size()) {
+            return;
+        }
+
+        final TaskSchedulerBean task = mAdapter.mDataList.get(position);
+        final Dialog dialog = new Dialog(this);
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(R.layout.dialog_task_edit);
+
+        final EditText etTaskName = dialog.findViewById(R.id.dialog_et_task_name);
+        final EditText etCurrentScheduleTime = dialog.findViewById(R.id.dialog_et_start_time);
+        final EditText etMonth = dialog.findViewById(R.id.dialog_et_month);
+        final EditText etDay = dialog.findViewById(R.id.dialog_et_day);
+        final EditText etHour = dialog.findViewById(R.id.dialog_et_hour);
+        final EditText etRemark = dialog.findViewById(R.id.dialog_et_remark);
+        Button btnCancel = dialog.findViewById(R.id.dialog_btn_cancel);
+        Button btnSave = dialog.findViewById(R.id.dialog_btn_save);
+        Button btnNow = dialog.findViewById(R.id.dialog_btn_now);
+
+        etTaskName.setText(task.getTaskName());
+        etCurrentScheduleTime.setText(formatTimestamp(task.getCurrentScheduleTime()));
+        etRemark.setText(task.getRemark());
+
+        int totalMinutes = task.getDurationMinutes();
+        int totalHours = totalMinutes / MINUTES_PER_HOUR;
+        int totalDays = totalHours / HOURS_PER_DAY;
+        int month = totalDays / DAYS_PER_MONTH;
+        int day = totalDays % DAYS_PER_MONTH;
+        int hour = totalHours % HOURS_PER_DAY;
+
+        if (month > 0) {
+            etMonth.setText(Integer.toString(month));
+        }
+        if (day > 0) {
+            etDay.setText(Integer.toString(day));
+        }
+        if (hour > 0) {
+            etHour.setText(Integer.toString(hour));
+        }
+
+        btnNow.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                java.util.Calendar calendar = java.util.Calendar.getInstance();
+                calendar.set(java.util.Calendar.MINUTE, 0);
+                calendar.set(java.util.Calendar.SECOND, 0);
+                calendar.set(java.util.Calendar.MILLISECOND, 0);
+                etCurrentScheduleTime.setText(formatTimestamp(calendar.getTimeInMillis()));
+            }
+        });
+
+        btnCancel.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					dialog.dismiss();
+				}
+			});
+
+        btnSave.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					String taskName = etTaskName.getText().toString().trim();
+					String currentScheduleTime = etCurrentScheduleTime.getText().toString().trim();
+					String monthStr = etMonth.getText().toString().trim();
+					String dayStr = etDay.getText().toString().trim();
+					String hourStr = etHour.getText().toString().trim();
+					String remark = etRemark.getText().toString().trim();
+
+					if (taskName.isEmpty()) {
+						etTaskName.setError("请输入任务名称");
+						return;
+					}
+					if (currentScheduleTime.isEmpty()) {
+						etCurrentScheduleTime.setError("请输入当前排档时间");
+						return;
+					}
+
+					long timestamp = parseTimeString(currentScheduleTime);
+					if (timestamp == 0) {
+						etCurrentScheduleTime.setError("时间格式不正确，请使用 yyyy-MM-dd HH 格式");
+						return;
+					}
+
+					int month = 0, day = 0, hour = 0;
+					try {
+						if (!monthStr.isEmpty()) month = Integer.parseInt(monthStr);
+						if (!dayStr.isEmpty()) day = Integer.parseInt(dayStr);
+						if (!hourStr.isEmpty()) hour = Integer.parseInt(hourStr);
+					} catch (NumberFormatException e) {
+						LogUtils.e(TAG, "showEditTaskDialog: 数字解析错误", e);
+						return;
+					}
+
+					int durationMinutes = convertToTotalMinutes(month, day, hour);
+					task.setTaskName(taskName);
+					task.setCurrentScheduleTime(timestamp);
+					task.setDurationMinutes(durationMinutes);
+					task.setRemark(remark);
+
+					applyChanges();
+					LogUtils.i(TAG, "showEditTaskDialog: 任务 [" + taskName + "] 数据已更新，排档幅度=" + durationMinutes + "分钟");
+					dialog.dismiss();
+				}
+			});
+        dialog.show();
+    }
+
+    /**
+     * 显示添加任务对话框
+     */
+    private void showAddTaskDialog() {
+        final Dialog dialog = new Dialog(this);
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(R.layout.dialog_task_edit);
+
+        final EditText etTaskName = dialog.findViewById(R.id.dialog_et_task_name);
+        final EditText etCurrentScheduleTime = dialog.findViewById(R.id.dialog_et_start_time);
+        final EditText etMonth = dialog.findViewById(R.id.dialog_et_month);
+        final EditText etDay = dialog.findViewById(R.id.dialog_et_day);
+        final EditText etHour = dialog.findViewById(R.id.dialog_et_hour);
+        final EditText etRemark = dialog.findViewById(R.id.dialog_et_remark);
+        Button btnCancel = dialog.findViewById(R.id.dialog_btn_cancel);
+        Button btnSave = dialog.findViewById(R.id.dialog_btn_save);
+        Button btnNow = dialog.findViewById(R.id.dialog_btn_now);
+
+        // 设置默认时间为当前时间
+        java.util.Calendar calendar = java.util.Calendar.getInstance();
+        calendar.set(java.util.Calendar.MINUTE, 0);
+        calendar.set(java.util.Calendar.SECOND, 0);
+        calendar.set(java.util.Calendar.MILLISECOND, 0);
+        etCurrentScheduleTime.setText(formatTimestamp(calendar.getTimeInMillis()));
+
+        btnNow.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                java.util.Calendar cal = java.util.Calendar.getInstance();
+                cal.set(java.util.Calendar.MINUTE, 0);
+                cal.set(java.util.Calendar.SECOND, 0);
+                cal.set(java.util.Calendar.MILLISECOND, 0);
+                etCurrentScheduleTime.setText(formatTimestamp(cal.getTimeInMillis()));
+            }
+        });
+
+        btnCancel.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					dialog.dismiss();
+				}
+			});
+
+        btnSave.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					String taskName = etTaskName.getText().toString().trim();
+					String currentScheduleTime = etCurrentScheduleTime.getText().toString().trim();
+					String monthStr = etMonth.getText().toString().trim();
+					String dayStr = etDay.getText().toString().trim();
+					String hourStr = etHour.getText().toString().trim();
+					String remark = etRemark.getText().toString().trim();
+
+					if (taskName.isEmpty()) {
+						etTaskName.setError("请输入任务名称");
+						return;
+					}
+					if (currentScheduleTime.isEmpty()) {
+						etCurrentScheduleTime.setError("请输入当前排档时间");
+						return;
+					}
+
+					long timestamp = parseTimeString(currentScheduleTime);
+					if (timestamp == 0) {
+						etCurrentScheduleTime.setError("时间格式不正确，请使用 yyyy-MM-dd HH 格式");
+						return;
+					}
+
+					int month = 0, day = 0, hour = 0;
+					try {
+						if (!monthStr.isEmpty()) month = Integer.parseInt(monthStr);
+						if (!dayStr.isEmpty()) day = Integer.parseInt(dayStr);
+						if (!hourStr.isEmpty()) hour = Integer.parseInt(hourStr);
+					} catch (NumberFormatException e) {
+						LogUtils.e(TAG, "showAddTaskDialog: 数字解析错误", e);
+						return;
+					}
+
+					int durationMinutes = convertToTotalMinutes(month, day, hour);
+					TaskSchedulerBean newTask = new TaskSchedulerBean(taskName, remark, timestamp, durationMinutes);
+					mTaskList.add(newTask);
+					applyChanges();
+					LogUtils.i(TAG, "showAddTaskDialog: 任务 [" + taskName + "] 已添加，排档幅度=" + durationMinutes + "分钟");
+					dialog.dismiss();
+				}
+			});
+        dialog.show();
+    }
+
+    /**
+     * 显示删除确认对话框
+     * @param position 要删除的任务位置
+     */
+    private void showDeleteConfirmDialog(final int position) {
+        if (position < 0 || position >= mAdapter.mDataList.size()) {
+            return;
+        }
+
+        final TaskSchedulerBean task = mAdapter.mDataList.get(position);
+        final Dialog dialog = new Dialog(this);
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(R.layout.dialog_delete_confirm);
+
+        TextView tvMessage = dialog.findViewById(R.id.dialog_delete_message);
+        Button btnCancel = dialog.findViewById(R.id.dialog_btn_cancel);
+        Button btnConfirm = dialog.findViewById(R.id.dialog_btn_confirm);
+
+        tvMessage.setText("确定要删除任务 \"" + task.getTaskName() + "\" 吗？");
+
+        btnCancel.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					dialog.dismiss();
+				}
+			});
+
+        btnConfirm.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					String taskName = task.getTaskName();
+					mTaskList.remove(task);
+					applyChanges();
+					LogUtils.i(TAG, "showDeleteConfirmDialog: 任务 [" + taskName + "] 已删除");
+					dialog.dismiss();
+				}
+			});
+        dialog.show();
+    }
+
+    /**
+     * 显示排档确认对话框
+     * @param position 要排档的任务位置
+     */
+    private void showScheduleConfirmDialog(final int position) {
+        if (position < 0 || position >= mAdapter.mDataList.size()) {
+            return;
+        }
+
+        final TaskSchedulerBean task = mAdapter.mDataList.get(position);
+        long currentTime = task.getCurrentScheduleTime();
+        int duration = task.getDurationMinutes();
+        long newTime = currentTime + duration * 60 * 1000L;
+
+        final Dialog dialog = new Dialog(this);
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(R.layout.dialog_schedule_confirm);
+
+        TextView tvTaskName = dialog.findViewById(R.id.dialog_schedule_task_name);
+        TextView tvCurrentTime = dialog.findViewById(R.id.dialog_schedule_current_time);
+        TextView tvDuration = dialog.findViewById(R.id.dialog_schedule_duration);
+        TextView tvRemark = dialog.findViewById(R.id.dialog_schedule_remark);
+        TextView tvNewTime = dialog.findViewById(R.id.dialog_schedule_new_time);
+        Button btnCancel = dialog.findViewById(R.id.dialog_btn_cancel);
+        Button btnConfirm = dialog.findViewById(R.id.dialog_btn_confirm);
+
+        tvTaskName.setText("任务：" + task.getTaskName());
+        tvCurrentTime.setText("当前排档时间：" + formatTimestamp(currentTime));
+        tvDuration.setText("排档幅度：" + formatDurationToString(duration));
+        tvRemark.setText("备注：" + (task.getRemark() != null && !task.getRemark().isEmpty() ? task.getRemark() : "无"));
+        tvNewTime.setText("排档后时间：" + formatTimestamp(newTime));
+
+        btnCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+
+        btnConfirm.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+                performSchedule(position);
+            }
+        });
+
+        dialog.show();
+    }
+
+    /**
+     * 执行排档操作
+     * @param position 点击排档按钮的任务位置
+     */
+    private void performSchedule(int position) {
+        if (position < 0 || position >= mAdapter.mDataList.size()) {
+            return;
+        }
+        TaskSchedulerBean currentTask = mAdapter.mDataList.get(position);
+        long currentTime = currentTask.getCurrentScheduleTime();
+        int duration = currentTask.getDurationMinutes();
+        long newTime = currentTime + duration * 60 * 1000L;
+        LogUtils.i(TAG, "performSchedule: 当前时间 " + formatTimestamp(currentTime) + " + " + duration + "分钟 = " + formatTimestamp(newTime));
+        currentTask.setCurrentScheduleTime(newTime);
+        applyChanges();
+        LogUtils.i(TAG, "performSchedule: 更新任务 [" + currentTask.getTaskName() + "] 时间更新为 " + formatTimestamp(newTime));
+    }
+
+    /**
+     * RecyclerView 适配器
+     */
+    class TaskSchedulerAdapter extends RecyclerView.Adapter {
+
+        ArrayList<TaskSchedulerBean> mDataList;
+
+        public TaskSchedulerAdapter(ArrayList<TaskSchedulerBean> dataList) {
+            mDataList = dataList;
+        }
+
+        public void setData(ArrayList<TaskSchedulerBean> dataList) {
+            mDataList = dataList;
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public int getItemCount() {
+            return mDataList.size();
+        }
+
+        @Override
+        public void onBindViewHolder(RecyclerView.ViewHolder holder, final int position) {
+            final TaskSchedulerBean item = mDataList.get(position);
+            final TaskViewHolder viewHolder = (TaskViewHolder) holder;
+
+            viewHolder.mtvTaskName.setText(item.getTaskName());
+            viewHolder.mtvCurrentScheduleTime.setText(formatTimestamp(item.getCurrentScheduleTime()));
+            viewHolder.mtvDuration.setText(formatDurationToString(item.getDurationMinutes()));
+            viewHolder.mtvRemark.setText(item.getRemark());
+
+            long diffMs = item.getCurrentScheduleTime() - System.currentTimeMillis();
+            int diffMinutes = (int) Math.abs(diffMs / 60000);
+            if (diffMs >= 0) {
+                viewHolder.mtvTimeDiff.setText("剩余" + formatDurationToString(diffMinutes));
+            } else {
+                viewHolder.mtvTimeDiff.setText("已过" + formatDurationToString(diffMinutes));
+            }
+
+            if (item.getCurrentScheduleTime() <= System.currentTimeMillis()) {
+                viewHolder.mllMain.setBackgroundResource(R.color.colorScheduleFutureBackground);
+            } else {
+                viewHolder.mllMain.setBackgroundResource(R.drawable.bg_frame);
+            }
+
+            // 长按直接内置菜单，直接使用当前position
+            viewHolder.mllMain.setOnLongClickListener(new View.OnLongClickListener() {
+					@Override
+					public boolean onLongClick(final View v) {
+						// 使用PopupMenu替代ContextMenu
+						PopupMenu popup = new PopupMenu(TaskSchedulerActivity.this, v);
+						popup.getMenu().add("编辑任务内容");
+						popup.getMenu().add("删除任务");
+						popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+								@Override
+								public boolean onMenuItemClick(MenuItem item) {
+									String title = item.getTitle().toString();
+									if ("编辑任务内容".equals(title)) {
+										showEditTaskDialog(position);
+										return true;
+									} else if ("删除任务".equals(title)) {
+										showDeleteConfirmDialog(position);
+										return true;
+									}
+									return false;
+								}
+							});
+						// 弹出菜单
+						popup.show();
+						return true;
+					}
+				});
+
+            viewHolder.mbtnSchedule.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						showScheduleConfirmDialog(position);
+					}
+				});
+        }
+
+        @Override
+        public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_task_scheduler, parent, false);
+            return new TaskViewHolder(view);
+        }
+
+        class TaskViewHolder extends RecyclerView.ViewHolder {
+            TextView mtvTaskName;
+            TextView mtvCurrentScheduleTime;
+            TextView mtvTimeDiff;
+            TextView mtvDuration;
+            TextView mtvRemark;
+            LinearLayout mllMain;
+            Button mbtnSchedule;
+
+            TaskViewHolder(View itemView) {
+                super(itemView);
+                mtvTaskName = itemView.findViewById(R.id.item_task_name);
+                mtvCurrentScheduleTime = itemView.findViewById(R.id.item_start_time);
+                mtvTimeDiff = itemView.findViewById(R.id.item_time_diff);
+                mtvDuration = itemView.findViewById(R.id.item_duration);
+                mtvRemark = itemView.findViewById(R.id.item_remark);
+                mllMain = itemView.findViewById(R.id.itemtaskscheduler_llmain);
+                mbtnSchedule = itemView.findViewById(R.id.item_btn_schedule);
+            }
+        }
+    }
+}
+

stallhelper/src/main/java/cc/winboll/studio/stallhelper/activities/WinBoLLActivity.java

@@ -0,0 +1,82 @@
+package cc.winboll.studio.stallhelper.activities;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 15:34:16
+ * @Describe 应用活动窗口基类
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.view.MenuItem;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.libaes.dialogs.YesNoAlertDialog;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.stallhelper.App;
+import cc.winboll.studio.stallhelper.R;
+
+public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
+
+    public static final String TAG = "WinBoLLActivityBase";
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    WinBoLLActivityManager getWinBoLLActivityManager() {
+        return WinBoLLActivityManager.getInstance();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWinBoLLActivityManager().add(this);
+    }
+
+    @Override
+    public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
+        super.onPostCreate(savedInstanceState, persistentState);
+    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+//        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+//            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
+//            return true;
+//        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
+//            //moveTaskToBack(true);
+//            exit();
+//        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+
+    void exit() {
+        YesNoAlertDialog.show(this, "Exit " + getString(R.string.app_name), "Close all activity and exit?", new YesNoAlertDialog.OnDialogResultListener(){
+
+                @Override
+                public void onYes() {
+                    WinBoLLActivityManager.getInstance().finishAll();
+                }
+
+                @Override
+                public void onNo() {
+                }
+            });
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        getWinBoLLActivityManager().registeRemove(this);
+    }
+}

stallhelper/src/main/java/cc/winboll/studio/stallhelper/beans/DiningTableBean.java

@@ -0,0 +1,216 @@
+package cc.winboll.studio.stallhelper.beans;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2024/10/16 06:09:54
+ * @Describe 餐桌
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
+import java.io.IOException;
+
+public class DiningTableBean extends BaseBean {
+
+    public static final String TAG = "AuthenticationBean";
+
+    public enum DinnerType { Noon, Evening };
+    public enum TableType { Room, Table };
+
+    // 餐桌号
+    String tableNumber;
+    // 最大就餐人数
+    int maxPersonCount;
+    // 是否选取了这张桌号
+    boolean isSelected;
+    // 预定时间类型
+    DinnerType dinnerType;
+    // 预定信息
+    String bookDesc;
+    // 预定时间
+    String date;
+    // 餐桌类型
+    TableType tableType;
+    // 是否被识别为 DiningTableBean
+    boolean isDiningTableBean;
+    // 或者是无法识别为 DiningTableBean 的原始信息。
+    String originDesc;
+
+    public DiningTableBean(String tableNumber, int maxPersonCount, boolean isSelected) {
+        this.tableNumber = tableNumber;
+        this.maxPersonCount = maxPersonCount;
+        this.isSelected = isSelected;
+        this.dinnerType = DinnerType.Evening;
+        this.bookDesc = "";
+        this.date = "";
+        this.tableType = TableType.Room;
+        this.isDiningTableBean = true;
+        this.originDesc = "";
+    }
+
+    public DiningTableBean(String tableNumber, int maxPersonCount, boolean isSelected, String date) {
+        this.tableNumber = tableNumber;
+        this.maxPersonCount = maxPersonCount;
+        this.isSelected = isSelected;
+        this.dinnerType = DinnerType.Evening;
+        this.bookDesc = "";
+        this.date = date;
+        this.tableType = TableType.Room;
+        this.isDiningTableBean = true;
+        this.originDesc = "";
+    }
+
+    public DiningTableBean(String tableNumber, int maxPersonCount, boolean isSelected, DinnerType dinnerType, String bookDesc, String date, TableType tableType) {
+        this.tableNumber = tableNumber;
+        this.maxPersonCount = maxPersonCount;
+        this.isSelected = isSelected;
+        this.dinnerType = dinnerType;
+        this.bookDesc = bookDesc;
+        this.date = date;
+        this.tableType = tableType;
+        this.isDiningTableBean = true;
+        this.originDesc = "";
+    }
+
+    public DiningTableBean(boolean isSelected, boolean isDiningTableBean, String originDesc) {
+        this.tableNumber = "";
+        this.maxPersonCount = 0;
+        this.isSelected = isSelected;
+        this.dinnerType = DinnerType.Evening;
+        this.bookDesc = "";
+        this.date = "";
+        this.tableType = TableType.Room;
+        this.isDiningTableBean = isDiningTableBean;
+        this.originDesc = originDesc;
+    }
+
+    public void setOriginDesc(String originDesc) {
+        this.originDesc = originDesc;
+    }
+
+    public String getOriginDesc() {
+        return originDesc;
+    }
+
+    public void setIsDiningTableBean(boolean isDiningTableBean) {
+        this.isDiningTableBean = isDiningTableBean;
+    }
+
+    public boolean isDiningTableBean() {
+        return isDiningTableBean;
+    }
+
+    public void setTableType(TableType tableType) {
+        this.tableType = tableType;
+    }
+
+    public TableType getTableType() {
+        return tableType;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDinnerType(DinnerType dinnerType) {
+        this.dinnerType = dinnerType;
+    }
+
+    public DinnerType getDinnerType() {
+        return dinnerType;
+    }
+
+
+    public void setBookDesc(String bookDesc) {
+        this.bookDesc = bookDesc;
+    }
+
+    public String getBookDesc() {
+        return bookDesc;
+    }
+
+    public void setIsSelected(boolean isSelected) {
+        this.isSelected = isSelected;
+    }
+
+    public boolean getIsSelected() {
+        return isSelected;
+    }
+
+    public void setTableNumber(String tableNumber) {
+        this.tableNumber = tableNumber;
+    }
+
+    public String getTableNumber() {
+        return tableNumber;
+    }
+
+    public void setMaxPersonCount(int maxPersonCount) {
+        this.maxPersonCount = maxPersonCount;
+    }
+
+    public int getMaxPersonCount() {
+        return maxPersonCount;
+    }
+
+    @Override
+    public String getName() {
+        return DiningTableBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        DiningTableBean bean = this;
+        jsonWriter.name("tableNumber").value(bean.getTableNumber());
+        jsonWriter.name("maxPersonCount").value(bean.getMaxPersonCount());
+        jsonWriter.name("isSelected").value(bean.getTableNumber());
+        jsonWriter.name("dinnerType").value(bean.getDinnerType().ordinal());
+        jsonWriter.name("bookDesc").value(bean.getBookDesc());
+        jsonWriter.name("date").value(bean.getDate());
+        jsonWriter.name("tableType").value(bean.getTableType().ordinal());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("tableNumber")) {
+                setTableNumber(jsonReader.nextString());
+            } else if (name.equals("maxPersonCount")) {
+                setMaxPersonCount(jsonReader.nextInt());
+            } else if (name.equals("isSelected")) {
+                setIsSelected(jsonReader.nextBoolean());
+            } else if (name.equals("dinnerType")) {
+                setDinnerType(DinnerType.values()[jsonReader.nextInt()]);
+            } else if (name.equals("bookDesc")) {
+                setBookDesc(jsonReader.nextString());
+            } else if (name.equals("date")) {
+                setDate(jsonReader.nextString());
+            } else if (name.equals("tableType")) {
+                setTableType(TableType.values()[jsonReader.nextInt()]);
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+
+}

stallhelper/src/main/java/cc/winboll/studio/stallhelper/beans/TaskSchedulerBean.java

@@ -0,0 +1,117 @@
+package cc.winboll.studio.stallhelper.beans;
+
+/**
+ * @Author ZhanGSKen
+ * @Date 2026/05/18
+ * @Describe 任务排档数据模型
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
+import java.io.IOException;
+
+public class TaskSchedulerBean extends BaseBean {
+
+    public static final String TAG = "TaskSchedulerBean";
+
+    // 任务排档名称
+    String taskName;
+    // 备注
+    String remark;
+    // 当前排档时间（时间戳）
+    long currentScheduleTime;
+    // 排档时间幅度（分钟）- 用于计算下一个任务的起始时间
+    int durationMinutes;
+
+    public TaskSchedulerBean() {
+        this.taskName = "";
+        this.remark = "";
+        this.currentScheduleTime = 0;
+        this.durationMinutes = 0;
+    }
+
+    public TaskSchedulerBean(String taskName, String remark, long currentScheduleTime, int durationMinutes) {
+        this.taskName = taskName;
+        this.remark = remark;
+        this.currentScheduleTime = currentScheduleTime;
+        this.durationMinutes = durationMinutes;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public long getCurrentScheduleTime() {
+        return currentScheduleTime;
+    }
+
+    public void setCurrentScheduleTime(long currentScheduleTime) {
+        this.currentScheduleTime = currentScheduleTime;
+    }
+
+    public int getDurationMinutes() {
+        return durationMinutes;
+    }
+
+    public void setDurationMinutes(int durationMinutes) {
+        this.durationMinutes = durationMinutes;
+    }
+
+    @Override
+    public String getName() {
+        return TaskSchedulerBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        TaskSchedulerBean bean = this;
+        jsonWriter.name("taskName").value(bean.getTaskName());
+        jsonWriter.name("remark").value(bean.getRemark());
+        jsonWriter.name("startTime").value(bean.getCurrentScheduleTime());
+        jsonWriter.name("durationMinutes").value(bean.getDurationMinutes());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("taskName")) {
+                setTaskName(jsonReader.nextString());
+            } else if (name.equals("remark")) {
+                setRemark(jsonReader.nextString());
+            } else if (name.equals("startTime")) {
+                setCurrentScheduleTime(jsonReader.nextLong());
+            } else if (name.equals("durationMinutes")) {
+                setDurationMinutes(jsonReader.nextInt());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public TaskSchedulerBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        jsonReader.endObject();
+        return this;
+    }
+}

stallhelper/src/main/res/drawable/bg_frame.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > 
+    <!-- 阴影部分 --> 
+    <!-- 个人觉得更形象的表达：top代表下边的阴影高度，left代表右边的阴影宽度。其实也就是相对应的offset，solid中的颜色是阴影的颜色，也可以设置角度等等 --> 
+    <item 
+        android:left="2dp" 
+        android:top="2dp" 
+        android:right="2dp" 
+        android:bottom="2dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="#0F000000" 
+                android:startColor="#0F000000" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+    <!-- 背景部分 --> 
+    <!-- 形象的表达：bottom代表背景部分在上边缘超出阴影的高度，right代表背景部分在左边超出阴影的宽度（相对应的offset） --> 
+    <item 
+        android:left="3dp" 
+        android:top="3dp" 
+        android:right="3dp" 
+        android:bottom="5dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="#0FFFFFFF" 
+                android:startColor="#FFFFFFFF" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+</layer-list>

stallhelper/src/main/res/drawable/bg_frame_black.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > 
+    <!-- 阴影部分 --> 
+    <!-- 个人觉得更形象的表达：top代表下边的阴影高度，left代表右边的阴影宽度。其实也就是相对应的offset，solid中的颜色是阴影的颜色，也可以设置角度等等 --> 
+    <item 
+        android:left="2dp" 
+        android:top="2dp" 
+        android:right="2dp" 
+        android:bottom="2dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="#0F000000" 
+                android:startColor="#0F000000" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+    <!-- 背景部分 --> 
+    <!-- 形象的表达：bottom代表背景部分在上边缘超出阴影的高度，right代表背景部分在左边超出阴影的宽度（相对应的offset） --> 
+    <item 
+        android:left="3dp" 
+        android:top="3dp" 
+        android:right="3dp" 
+        android:bottom="5dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="#AF000000" 
+                android:startColor="#AF000000" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+</layer-list>

stallhelper/src/main/res/drawable/bg_frame_white.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > 
+    <!-- 阴影部分 --> 
+    <!-- 个人觉得更形象的表达：top代表下边的阴影高度，left代表右边的阴影宽度。其实也就是相对应的offset，solid中的颜色是阴影的颜色，也可以设置角度等等 --> 
+    <item 
+        android:left="2dp" 
+        android:top="2dp" 
+        android:right="2dp" 
+        android:bottom="2dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="#0FFFFFFF" 
+                android:startColor="#0FFFFFFF" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+    <!-- 背景部分 --> 
+    <!-- 形象的表达：bottom代表背景部分在上边缘超出阴影的高度，right代表背景部分在左边超出阴影的宽度（相对应的offset） --> 
+    <item 
+        android:left="3dp" 
+        android:top="3dp" 
+        android:right="3dp" 
+        android:bottom="5dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="#CFFFFFFF" 
+                android:startColor="#CFFFFFFF" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+</layer-list>

stallhelper/src/main/res/drawable/bg_shadow.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > 
+    <!-- 阴影部分 --> 
+    <!-- 个人觉得更形象的表达：top代表下边的阴影高度，left代表右边的阴影宽度。其实也就是相对应的offset，solid中的颜色是阴影的颜色，也可以设置角度等等 --> 
+    <item 
+        android:left="2dp" 
+        android:top="2dp" 
+        android:right="2dp" 
+        android:bottom="2dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="#0F000000" 
+                android:startColor="#0F000000" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+    <!-- 背景部分 --> 
+    <!-- 形象的表达：bottom代表背景部分在上边缘超出阴影的高度，right代表背景部分在左边超出阴影的宽度（相对应的offset） --> 
+    <item 
+        android:left="3dp" 
+        android:top="3dp" 
+        android:right="3dp" 
+        android:bottom="5dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="@color/colorAccent" 
+                android:startColor="@color/colorAccent" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+</layer-list>

stallhelper/src/main/res/drawable/diningtable.xml

@@ -0,0 +1,69 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="256dp"
+    android:height="256dp"
+    android:viewportWidth="256"
+    android:viewportHeight="256">
+    <path
+        android:fillColor="#FF977A1F"
+        android:strokeColor="#FF977A1F"
+        android:strokeWidth="2.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M67.56 132.48C67.56 132.48 196.61 132.48 196.61 132.48 196.61 132.48 196.61 140.79 196.61 140.79 196.61 140.79 67.56 140.79 67.56 140.79 67.56 140.79 67.56 132.48 67.56 132.48"/>
+    <path
+        android:fillColor="#FF977A1F"
+        android:strokeColor="#FF977A1F"
+        android:strokeWidth="2.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M100.51 140.79C100.51 140.79 108.38 140.79 108.38 140.79 108.38 140.79 108.38 211.22 108.38 211.22 108.38 211.22 100.51 211.22 100.51 211.22 100.51 211.22 100.51 140.79 100.51 140.79"/>
+    <path
+        android:fillColor="#FF977A1F"
+        android:strokeColor="#FF977A1F"
+        android:strokeWidth="2.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M157.4 140.79C157.4 140.79 165.72 140.79 165.72 140.79 165.72 140.79 165.72 211.22 165.72 211.22 165.72 211.22 157.4 211.22 157.4 211.22 157.4 211.22 157.4 140.79 157.4 140.79"/>
+    <path
+        android:fillColor="#FF977A1F"
+        android:strokeColor="#FF977A1F"
+        android:strokeWidth="2.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M32.05 85.46C32.05 85.46 38.61 85.46 38.61 85.46 38.61 85.46 38.61 211.22 38.61 211.22 38.61 211.22 32.05 211.22 32.05 211.22 32.05 211.22 32.05 85.46 32.05 85.46"/>
+    <path
+        android:fillColor="#FF977A1F"
+        android:strokeColor="#FF977A1F"
+        android:strokeWidth="2.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M38.61 160.26C38.61 160.26 77.24 160.26 77.24 160.26 77.24 160.26 77.24 165.51 77.24 165.51 77.24 165.51 38.61 165.51 38.61 165.51 38.61 165.51 38.61 160.26 38.61 160.26"/>
+    <path
+        android:fillColor="#FF977A1F"
+        android:strokeColor="#FF977A1F"
+        android:strokeWidth="2.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M73.52 160.26C73.52 160.26 80.96 160.26 80.96 160.26 80.96 160.26 80.96 211.22 80.96 211.22 80.96 211.22 73.52 211.22 73.52 211.22 73.52 211.22 73.52 160.26 73.52 160.26"/>
+    <path
+        android:fillColor="#FF977A1F"
+        android:strokeColor="#FF977A1F"
+        android:strokeWidth="2.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M226.71 85.46C226.71 85.46 233.27 85.46 233.27 85.46 233.27 85.46 233.27 211.22 233.27 211.22 233.27 211.22 226.71 211.22 226.71 211.22 226.71 211.22 226.71 85.46 226.71 85.46"/>
+    <path
+        android:fillColor="#FF977A1F"
+        android:strokeColor="#FF977A1F"
+        android:strokeWidth="2.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M188.08 157.64C188.08 157.64 226.71 157.64 226.71 157.64 226.71 157.64 226.71 162.89 226.71 162.89 226.71 162.89 188.08 162.89 188.08 162.89 188.08 162.89 188.08 157.64 188.08 157.64"/>
+    <path
+        android:fillColor="#FF977A1F"
+        android:strokeColor="#FF977A1F"
+        android:strokeWidth="2.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M188.08 157.64C188.08 157.64 195.52 157.64 195.52 157.64 195.52 157.64 195.52 208.59 195.52 208.59 195.52 208.59 188.08 208.59 188.08 208.59 188.08 208.59 188.08 157.64 188.08 157.64"/>
+</vector>

stallhelper/src/main/res/drawable/ic_launcher.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:clickable="true">
+    <item android:drawable="@drawable/ic_launcher_background"/> 
+    <item 
+        android:left="15dp" 
+        android:top="15dp" 
+        android:right="15dp" 
+        android:bottom="15dp"
+        android:drawable="@drawable/ic_launcher_foreground"/>
+</layer-list>

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

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

stallhelper/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16.61,15.15C16.15,15.15 15.77,14.78 15.77,14.32S16.15,13.5 16.61,13.5H16.61C17.07,13.5 17.45,13.86 17.45,14.32C17.45,14.78 17.07,15.15 16.61,15.15M7.41,15.15C6.95,15.15 6.57,14.78 6.57,14.32C6.57,13.86 6.95,13.5 7.41,13.5H7.41C7.87,13.5 8.24,13.86 8.24,14.32C8.24,14.78 7.87,15.15 7.41,15.15M16.91,10.14L18.58,7.26C18.67,7.09 18.61,6.88 18.45,6.79C18.28,6.69 18.07,6.75 18,6.92L16.29,9.83C14.95,9.22 13.5,8.9 12,8.91C10.47,8.91 9,9.24 7.73,9.82L6.04,6.91C5.95,6.74 5.74,6.68 5.57,6.78C5.4,6.87 5.35,7.08 5.44,7.25L7.1,10.13C4.25,11.69 2.29,14.58 2,18H22C21.72,14.59 19.77,11.7 16.91,10.14H16.91Z"/>
+</vector>