<aes>APK 15.20.7 release Publish.

版本号对齐APPBase。
Merge branch 'aes' into merge
2026-06-29 12:09:49 +08:00 · 2026-05-19 20:38:13 +08:00 · 2026-05-19 20:26:18 +08:00 · 2026-05-19 19:45:12 +08:00 · 2026-05-19 19:44:19 +08:00 · 2026-05-19 19:30:17 +08:00
61 changed files with 372 additions and 1178 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -99,38 +99,3 @@ lint-results.html
 /local.properties
 /settings.gradle
 /gradle.properties
-
-## WinBoLL-Demo 项目配置
-#.git
-#.gitignore
-#.gitmodules
-#.winboll
-#GenKeyStore
-#LICENSE
-#LICENSE-Private-Demo
-#LICENSE-Private-Demo_docs
-#README.md
-#aes
-#appbase
-autonfc
-#build.gradle
-contacts
-#debugtemp
-gallery
-gpsrelaysentinel
-#gradle
-#gradle.properties-android-demo
-#gradle.properties-androidx-demo
-#gradlew
-#libaes
-#libappbase
-#libdebugtemp
-libgpsrelaysentinel
-libwinboll
-#local.properties-demo
-mymessagemanager
-positions
-powerbell
-#settings.gradle-demo
-winboll
-#winboll.properties-demo
--- a/.winboll/bashMergeProjects-to-Projects_Keeper.sh
+++ b/.winboll/bashMergeProjects-to-Projects_Keeper.sh
@@ -0,0 +1,192 @@
+#!/system/bin/sh
+## 合并其他项目分支的模块源码到projects-keeper分支。
+
+# ====================== 0. 进入目标目录 ======================
+TARGET_DIR="/sdcard/AppProjects/Projects_Keeper"
+
+echo "切换工作目录到：$TARGET_DIR"
+if ! cd "$TARGET_DIR"; then
+    echo "=============================================="
+    echo "错误：无法进入目标目录 $TARGET_DIR"
+    echo "=============================================="
+    exit 1
+fi
+
+# ====================== 1. 拉取远程最新源码(失败直接退出) ======================
+echo "=============================================="
+echo "正在拉取远程最新源码..."
+echo "=============================================="
+if ! git pull; then
+    echo "=============================================="
+    echo "错误：拉取远程源码失败！"
+    echo "请检查网络、仓库冲突或手动处理 git 状态后再执行脚本。"
+    echo "=============================================="
+    exit 1
+fi
+echo "✅ 源码已拉取为最新状态"
+echo ""
+
+# ====================== 2. 目录路径检查 ======================
+CUR_DIR=$(pwd)
+if [ "$CUR_DIR" != "$TARGET_DIR" ]; then
+    echo "错误：当前目录不是项目根目录！"
+    echo "请先进入目录：$TARGET_DIR"
+    exit 1
+fi
+
+# ====================== 3. Git 分支检查 ======================
+CUR_BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null)
+TARGET_BRANCH="projects-keeper"
+
+if [ "$CUR_BRANCH" != "$TARGET_BRANCH" ]; then
+    echo "错误：当前不在 $TARGET_BRANCH 分支！"
+    echo "当前分支：$CUR_BRANCH"
+    echo "请先执行：git checkout $TARGET_BRANCH"
+    exit 1
+fi
+
+# ====================== 4. 预设标准模块列表 ======================
+MERGE_OBJECTS_LIST=(
+.git
+.gitignore
+.gitmodules
+.winboll
+GenKeyStore
+LICENSE
+LICENSE-Private-Demo
+LICENSE-Private-Demo_docs
+README.md
+aes
+appbase
+autonfc
+build.gradle
+contacts
+debugtemp
+gallery
+gpsrelaysentinel
+gradle
+gradle.properties-android-demo
+gradle.properties-androidx-demo
+gradlew
+libaes
+libappbase
+libdebugtemp
+libgpsrelaysentinel
+libwinboll
+local.properties-demo
+mymessagemanager
+positions
+powerbell
+settings.gradle-demo
+winboll
+winboll.properties-demo
+)
+
+# ====================== 5. 获取当前目录真实文件列表 ======================
+REAL_ITEMS=()
+while IFS= read -r line; do
+    if [[ "$line" != "." && "$line" != ".." ]]; then
+        REAL_ITEMS+=("$line")
+    fi
+done < <(ls -a)
+
+# ====================== 6. 差异比对函数 ======================
+check_diff() {
+    local missing=()
+    local extra=()
+
+    for item in "${MERGE_OBJECTS_LIST[@]}"; do
+        local found=0
+        for r in "${REAL_ITEMS[@]}"; do
+            if [[ "$item" == "$r" ]]; then
+                found=1
+                break
+            fi
+        done
+        if (( found == 0 )); then
+            missing+=("$item")
+        fi
+    done
+
+    for r in "${REAL_ITEMS[@]}"; do
+        local found=0
+        for item in "${MERGE_OBJECTS_LIST[@]}"; do
+            if [[ "$item" == "$r" ]]; then
+                found=1
+                break
+            fi
+        done
+        if (( found == 0 )); then
+            extra+=("$r")
+        fi
+    done
+
+    if [[ ${#missing[@]} -gt 0 || ${#extra[@]} -gt 0 ]]; then
+        echo "=============================================="
+        echo "【错误】合并环境与脚本预设列表不匹配！"
+        echo "请手动核对并修改合并脚本。"
+        echo "=============================================="
+
+        if [[ ${#missing[@]} -gt 0 ]]; then
+            echo -e "\n👉 本地缺失项目："
+            for m in "${missing[@]}"; do echo "  $m"; done
+        fi
+
+        if [[ ${#extra[@]} -gt 0 ]]; then
+            echo -e "\n👉 本地多余项目："
+            for e in "${extra[@]}"; do echo "  $e"; done
+        fi
+
+        echo -e "\n=============================================="
+        exit 1
+    fi
+}
+
+# 执行差异校验
+check_diff
+
+# ====================== 全部校验通过，继续执行合并 ======================
+echo -e "#@@@ 开始合并模块源码 @@@#
+## 目标合并对象列表："
+
+for item in "${MERGE_OBJECTS_LIST[@]}"; do
+    echo "$item"
+done
+
+echo -e "## 对象列表结束
+"
+
+## 合并 APP 项目
+MERGE_APP_PROJECT_LIST=(
+DemoAPP
+)
+echo -e "#@@@ 开始合并应用型模块源码 @@@#
+## 目标合并对象列表："
+
+for item in "${MERGE_APP_PROJECT_LIST[@]}"; do
+    echo "正在合并 $item 项目 ..."
+    item_lower=$(echo "$item" | tr 'A-Z' 'a-z')
+git checkout origin/$item_lower $item_lower
+    git add .
+    git commit -m "合并 $item 项目"
+done
+
+## 合并 LIB 项目
+MERGE_LIB_PROJECT_LIST=(
+WinBoLL
+APPBase
+AES
+)
+echo -e "#@@@ 开始合并类库型模块源码 @@@#
+## 目标合并对象列表："
+
+for item in "${MERGE_LIB_PROJECT_LIST[@]}"; do
+    echo "正在合并 $item 项目 ..."
+    item_lower=$(echo "$item" | tr 'A-Z' 'a-z')
+git checkout origin/$item_lower $item_lower lib$item_lower
+    git add .
+    git commit -m "合并 $item 项目"
+done
+
+echo '正在推送 Projects_Keeper 项目'
+git push
--- a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
+++ b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
@@ -0,0 +1,145 @@
+#!/system/bin/sh
+## 逻辑：按时间取最新标签 → 拉取该标签目录合并
+
+# 按创建时间取模块最新标签（最新打的标签排最后）
+get_latest_module_tag(){
+    local mod=$1
+    git for-each-ref --sort=-creatordate --format='%(refname)' refs/tags/${mod}-* \
+    | grep -v '\^{}' \
+    | head -1 \
+    | sed 's/refs\/tags\///'
+}
+
+# 通过标签获取commit
+get_commit_from_tag(){
+    local tag=$1
+    git rev-parse --short "${tag}^{commit}"
+}
+
+# 工作目录
+TARGET_DIR="/sdcard/AppProjects/Projects_Keeper_Tag"
+echo "进入目录：${TARGET_DIR}"
+cd "${TARGET_DIR}" || exit 1
+
+# 同步远程
+echo "========================================"
+echo "同步远程分支与全部版本标签"
+echo "========================================"
+git fetch origin --prune
+git fetch origin --tags
+echo "同步完成"
+echo ""
+
+# 校验目标分支
+NOW_BRANCH=$(git symbolic-ref --short HEAD)
+TARGET_BRANCH="projects_keeper_tag"
+if [ "${NOW_BRANCH}" != "${TARGET_BRANCH}" ];then
+    echo "错误：请先切换到 ${TARGET_BRANCH} 分支"
+    exit 1
+fi
+
+# 目录结构校验
+MERGE_OBJECTS_LIST=(
+.git
+.gitignore
+.gitmodules
+.winboll
+GenKeyStore
+LICENSE
+LICENSE-Private-Demo
+LICENSE-Private-Demo_docs
+README.md
+aes
+appbase
+autonfc
+build.gradle
+contacts
+debugtemp
+gallery
+gpsrelaysentinel
+gradle
+gradle.properties-android-demo
+gradle.properties-androidx-demo
+gradlew
+libaes
+libappbase
+libdebugtemp
+libgpsrelaysentinel
+libwinboll
+local.properties-demo
+mymessagemanager
+positions
+powerbell
+settings.gradle-demo
+winboll
+winboll.properties-demo
+)
+
+REAL_ITEMS=()
+while IFS= read -r line; do
+    [[ $line != "." && $line != ".." ]] && REAL_ITEMS+=("$line")
+done < <(ls -a)
+
+check_diff(){
+    local miss=() extra=()
+    for i in "${MERGE_OBJECTS_LIST[@]}";do
+        [[ ! " ${REAL_ITEMS[@]} " =~ " ${i} " ]] && miss+=("$i")
+    done
+    for i in "${REAL_ITEMS[@]}";do
+        [[ ! " ${MERGE_OBJECTS_LIST[@]} " =~ " ${i} " ]] && extra+=("$i")
+    done
+    if [[ ${#miss[@]} -gt 0 || ${#extra[@]} -gt 0 ]];then
+        echo "本地目录结构不一致，终止运行"
+        exit 1
+    fi
+}
+check_diff
+
+echo -e "#@@@ 按时间获取最新标签合并模块源码 @@@#"
+
+# 应用型模块
+MERGE_APP_PROJECT_LIST=(DemoAPP)
+echo -e "---------- 应用型模块 ----------"
+for name in "${MERGE_APP_PROJECT_LIST[@]}";do
+    low_name=$(echo "$name" | tr 'A-Z' 'a-z')
+    tag=$(get_latest_module_tag "${low_name}")
+    if [[ -z "${tag}" ]];then
+        echo "跳过 ${low_name}：无远程标签"
+        continue
+    fi
+    commit=$(get_commit_from_tag "${tag}")
+    if [[ -z "${commit}" ]];then
+        echo "跳过 ${low_name}：标签无有效提交点"
+        continue
+    fi
+    echo "模块:${low_name} 最新时间标签:${tag} 提交ID:${commit}"
+    # 强制拉取覆盖
+    git checkout -f "${tag}" -- "${low_name}"
+    git add "${low_name}"
+    git commit -m "合并模块${name} 同步最新时间标签${tag}"
+done
+
+# 类库模块
+MERGE_LIB_PROJECT_LIST=(WinBoLL APPBase AES)
+echo -e "---------- 类库模块 ----------"
+for name in "${MERGE_LIB_PROJECT_LIST[@]}";do
+    low_name=$(echo "$name" | tr 'A-Z' 'a-z')
+    tag=$(get_latest_module_tag "${low_name}")
+    if [[ -z "${tag}" ]];then
+        echo "跳过 ${low_name}：无远程标签"
+        continue
+    fi
+    commit=$(get_commit_from_tag "${tag}")
+    if [[ -z "${commit}" ]];then
+        echo "跳过 ${low_name}：标签无有效提交点"
+        continue
+    fi
+    echo "模块:${low_name} 最新时间标签:${tag} 提交ID:${commit}"
+    git checkout -f "${tag}" -- "${low_name}" "lib${low_name}"
+    git add "${low_name}" "lib${low_name}"
+    git commit -m "合并模块${name} 同步最新时间标签${tag}"
+done
+
+echo "全部模块合并执行完毕"
+echo "执行推送：git push"
+git push
--- a/aes/build.gradle
+++ b/aes/build.gradle
@@ -26,7 +26,10 @@ android {
        applicationId "cc.winboll.studio.aes"
        minSdkVersion 26
        targetSdkVersion 30
-        versionCode 1
+        //1. Android 官方规则
+		//-  versionCode  类型：int 整型
+		//- Java int 最大值：2147483647
+        versionCode 1520000
        // versionName 更新后需要手动设置 
        // 项目模块目录的 build.gradle 文件的 stageCount=0
        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
--- a/aes/build.properties
+++ b/aes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 13:11:28 HKT 2026
-stageCount=4
+#Tue May 19 20:38:13 HKT 2026
+stageCount=8
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.3
+publishVersion=15.20.7
 buildCount=0
-baseBetaVersion=15.20.4
+baseBetaVersion=15.20.8
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -26,7 +26,10 @@ android {
        applicationId "cc.winboll.studio.appbase"
        minSdkVersion 26
        targetSdkVersion 30
-        versionCode 1
+		//1. Android 官方规则
+		//-  versionCode  类型：int 整型
+		//- Java int 最大值：2147483647
+        versionCode 1520000
        // versionName 更新后需要手动设置 
        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 09:17:15 HKT 2026
-stageCount=10
+#Tue May 19 18:54:18 HKT 2026
+stageCount=17
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.9
+publishVersion=15.20.16
 buildCount=0
-baseBetaVersion=15.20.10
+baseBetaVersion=15.20.17
--- a/debugtemp/README.md
+++ b/debugtemp/README.md
@@ -1,37 +0,0 @@
-# WinBoLL
-
-#### 介绍
-WinBoLL 应用编译功能临时调试项目
-
-#### 软件架构
-适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
-也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
-
-
-#### Gradle 编译说明
-调试版编译命令 ：gradle assembleBetaDebug
-阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh debugtemp
-
-#### 使用说明
-3. Termux应用配置：
- 已安装Termux（包名 com.termux ）；
- 执行  echo "allow-external-apps = true" > ~/.termux/termux.properties
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
-4.  新建 Pull Request
-
-
-#### 特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
-5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
-
-#### 参考文档
--- a/debugtemp/app_update_description.txt
+++ b/debugtemp/app_update_description.txt
@@ -1 +0,0 @@
-
--- a/debugtemp/build.gradle
+++ b/debugtemp/build.gradle
@@ -1,59 +0,0 @@
-apply plugin: 'com.android.application'
-apply from: '../.winboll/winboll_app_build.gradle'
-apply from: '../.winboll/winboll_lint_build.gradle'
-
-def genVersionName(def versionName){
-    // 检查编译标志位配置
-    assert (winbollBuildProps['stageCount'] != null)
-    assert (winbollBuildProps['baseVersion'] != null)
-    // 保存基础版本号
-    winbollBuildProps.setProperty("baseVersion", "${versionName}");
-    //保存编译标志配置
-    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
-    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
-    fos.close();
-    
-    // 返回编译版本号
-    return "${versionName}." + winbollBuildProps['stageCount']
-}
-
-android {
-	// 适配MIUI12
-	compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-	
-    defaultConfig {
-        applicationId "cc.winboll.studio.debugtemp"
-	    minSdkVersion 26
-		// 适配MIUI12
-        targetSdkVersion 30
-        versionCode 1
-        // versionName 更新后需要手动设置 
-        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
-        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.20"
-        if(true) {
-            versionName = genVersionName("${versionName}")
-        }
-    }
-
-	// 确保 Java 7 兼容性（已适配项目技术栈）
-     compileOptions {
-         sourceCompatibility JavaVersion.VERSION_1_7
-         targetCompatibility JavaVersion.VERSION_1_7
-     }
-}
-
-dependencies {
-	api project(':libdebugtemp')
-	
-	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.20.3'
-    api 'cc.winboll.studio:libappbase:15.20.9'
-	
-	// WinBoLL备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:AES:aes-v15.20.3'
-	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.20.9'
-	
-	api fileTree(dir: 'libs', include: ['*.jar'])
-}
--- a/debugtemp/build.properties
+++ b/debugtemp/build.properties
@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Fri May 01 17:09:11 HKT 2026
-stageCount=0
-libraryProject=libdebugtemp
-baseVersion=15.20
-publishVersion=15.20.0
-buildCount=0
-baseBetaVersion=15.20.1
--- a/debugtemp/proguard-rules.pro
+++ b/debugtemp/proguard-rules.pro
@@ -1,137 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\tools\adt-bundle-windows-x86_64-20131030\sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# ============================== 基础通用规则 ==============================
-# 保留系统组件
-keep public class * extends android.app.Activity
-keep public class * extends android.app.Service
-keep public class * extends android.content.BroadcastReceiver
-keep public class * extends android.content.ContentProvider
-keep public class * extends android.app.backup.BackupAgentHelper
-keep public class * extends android.preference.Preference
-
-# 保留 WinBoLL 核心包及子类（合并简化规则）
-keep class cc.winboll.studio.** { *; }
-keepclassmembers class cc.winboll.studio.** { *; }
-
-# 保留所有类中的 public static final String TAG 字段（便于日志定位）
-keepclassmembers class * {
-    public static final java.lang.String TAG;
-}
-
-# 保留序列化类（避免Parcelable/Gson解析异常）
-keep class * implements android.os.Parcelable {
-    public static final android.os.Parcelable$Creator *;
-}
-keepclassmembers class * implements java.io.Serializable {
-    static final long serialVersionUID;
-    private static final java.io.ObjectStreamField[] serialPersistentFields;
-    private void writeObject(java.io.ObjectOutputStream);
-    private void readObject(java.io.ObjectInputStream);
-    java.lang.Object writeReplace();
-    java.lang.Object readResolve();
-}
-
-# 保留 R 文件（避免资源ID混淆）
-keepclassmembers class **.R$* {
-    public static <fields>;
-}
-
-# 保留 native 方法（避免JNI调用失败）
-keepclasseswithmembernames class * {
-    native <methods>;
-}
-
-# 保留注解和泛型（避免反射/序列化异常）
-keepattributes *Annotation*
-keepattributes Signature
-
-# 屏蔽 Java 8+ 警告（适配 Java 7 语法）
-dontwarn java.lang.invoke.*
-dontwarn android.support.v8.renderscript.*
-dontwarn java.util.function.**
-
-# ============================== 第三方框架专项规则 ==============================
-# OkHttp 4.4.1（米盟广告请求依赖，完善Lambda兼容）
-keep class okhttp3.** { *; }
-keep interface okhttp3.** { *; }
-keep class okhttp3.internal.** { *; }
-keep class okio.** { *; }
-dontwarn okhttp3.internal.platform.**
-dontwarn okio.**
-
-# Glide 4.9.0（米盟广告图片加载依赖）
-keep public class * implements com.bumptech.glide.module.GlideModule
-keep public class * extends com.bumptech.glide.module.AppGlideModule
-keep public enum com.bumptech.glide.load.ImageHeaderParser$ImageType {
-    **[] $VALUES;
-    public *;
-}
-keepclassmembers class * implements com.bumptech.glide.module.AppGlideModule {
-    <init>();
-}
-dontwarn com.bumptech.glide.**
-
-# Gson 2.8.5（米盟广告数据序列化依赖）
-keep class com.google.gson.** { *; }
-keep interface com.google.gson.** { *; }
-keepclassmembers class * {
-    @com.google.gson.annotations.SerializedName <fields>;
-}
-
-# 米盟 SDK（核心广告组件，完整保留避免加载失败）
-keep class com.miui.zeus.** { *; }
-keep interface com.miui.zeus.** { *; }
-# 保留米盟日志字段（便于广告加载失败排查）
-keepclassmembers class com.miui.zeus.mimo.sdk.** {
-    public static final java.lang.String TAG;
-}
-
-# RecyclerView 1.0.0（米盟广告布局渲染依赖）
-keep class androidx.recyclerview.** { *; }
-keep interface androidx.recyclerview.** { *; }
-keepclassmembers class androidx.recyclerview.widget.RecyclerView$Adapter {
-    public *;
-}
-
-# 其他第三方框架（按引入依赖保留，无则可删除）
-# XXPermissions 18.63
-keep class com.hjq.permissions.** { *; }
-keep interface com.hjq.permissions.** { *; }
-
-# ZXing 二维码（核心解析组件）
-keep class com.google.zxing.** { *; }
-keep class com.journeyapps.zxing.** { *; }
-
-# Jsoup HTML解析
-keep class org.jsoup.** { *; }
-
-# Pinyin4j 拼音搜索
-keep class net.sourceforge.pinyin4j.** { *; }
-
-# JSch SSH组件
-keep class com.jcraft.jsch.** { *; }
-
-# AndroidX 基础组件
-keep class androidx.appcompat.** { *; }
-keep interface androidx.appcompat.** { *; }
-
-# ============================== 优化与调试配置 ==============================
-# 优化级别（平衡混淆效果与性能）
-optimizationpasses 5
-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
-
-# 调试辅助（保留行号便于崩溃定位）
-verbose
-dontpreverify
-dontusemixedcaseclassnames
-keepattributes SourceFile,LineNumberTable
-
--- a/debugtemp/src/beta/AndroidManifest.xml
+++ b/debugtemp/src/beta/AndroidManifest.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
-
-    <application>
-
-        <!-- Put flavor specific code here -->
-
-    </application>
-
-</manifest>
-
--- a/debugtemp/src/beta/res/values/strings.xml
+++ b/debugtemp/src/beta/res/values/strings.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">DebugTemp☆</string>
-
-</resources>
--- a/debugtemp/src/main/AndroidManifest.xml
+++ b/debugtemp/src/main/AndroidManifest.xml
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.debugtemp">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:label="@string/app_name"
-        android:theme="@style/MyAppTheme"
-        android:resizeableActivity="true"
-        android:name=".App">
-
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name">
-
-            <intent-filter>
-
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-
-            </intent-filter>
-
-        </activity>
-
-        <meta-data
-            android:name="android.max_aspect"
-            android:value="4.0"/>
-
-        <activity android:name=".GlobalApplication$CrashActivity"/>
-
-    </application>
-
-</manifest>
--- a/debugtemp/src/main/java/cc/winboll/studio/debugtemp/App.java
+++ b/debugtemp/src/main/java/cc/winboll/studio/debugtemp/App.java
@@ -1,340 +0,0 @@
-package cc.winboll.studio.debugtemp;
-
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.widget.HorizontalScrollView;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.ToastUtils;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class App extends GlobalApplication {
-
-    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
-		
-        //CrashHandler.getInstance().registerGlobal(this);
-        //CrashHandler.getInstance().registerPart(this);
-    }
-
-    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();
-        }
-    }
-}
--- a/debugtemp/src/main/java/cc/winboll/studio/debugtemp/MainActivity.java
+++ b/debugtemp/src/main/java/cc/winboll/studio/debugtemp/MainActivity.java
@@ -1,38 +0,0 @@
-package cc.winboll.studio.debugtemp;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.LibraryActivity;
-import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.ToastUtils;
-
-public class MainActivity extends AppCompatActivity {
-
-	LogView mLogView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-		Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
-		setSupportActionBar(toolbar);
-
-        mLogView = findViewById(R.id.logview);
-
-        ToastUtils.show("onCreate");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-
-    public void onLibraryActivity(View view) {
-		startActivity(new Intent(this, LibraryActivity.class));
-    }
-}
--- a/debugtemp/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/debugtemp/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>
--- a/debugtemp/src/main/res/drawable/ic_launcher_background.xml
+++ b/debugtemp/src/main/res/drawable/ic_launcher_background.xml
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillColor="#26A69A"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-</vector>
--- a/debugtemp/src/main/res/layout/activity_main.xml
+++ b/debugtemp/src/main/res/layout/activity_main.xml
@@ -1,57 +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">
-
-	<com.google.android.material.appbar.AppBarLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-		<androidx.appcompat.widget.Toolbar
-			android:id="@+id/toolbar"
-			android:layout_width="match_parent"
-			android:layout_height="?attr/actionBarSize"
-			app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
-	</com.google.android.material.appbar.AppBarLayout>
-
-	<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="DebugTemp"
-			android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-		<Button
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Open LibraryActivity"
-			android:onClick="onLibraryActivity"/>
-
-	</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>
-
--- a/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
--- a/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
--- a/debugtemp/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/debugtemp/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/debugtemp/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/debugtemp/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/debugtemp/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/debugtemp/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/debugtemp/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/debugtemp/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/debugtemp/src/main/res/values/colors.xml
+++ b/debugtemp/src/main/res/values/colors.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#009688</color>
-    <color name="colorPrimaryDark">#00796B</color>
-    <color name="colorAccent">#FF9800</color>
-</resources>
--- a/debugtemp/src/main/res/values/strings.xml
+++ b/debugtemp/src/main/res/values/strings.xml
@@ -1,4 +0,0 @@
-<resources>
-    <string name="app_name">DebugTemp</string>
-    
-</resources>
--- a/debugtemp/src/main/res/values/styles.xml
+++ b/debugtemp/src/main/res/values/styles.xml
@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>
--- a/debugtemp/src/stage/AndroidManifest.xml
+++ b/debugtemp/src/stage/AndroidManifest.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
-
-    <application>
-
-        <!-- Put flavor specific code here -->
-
-    </application>
-
-</manifest>
-
--- a/debugtemp/src/stage/res/values/strings.xml
+++ b/debugtemp/src/stage/res/values/strings.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Put flavor specific strings here -->
-
-</resources>
--- a/libaes/build.gradle
+++ b/libaes/build.gradle
@@ -21,6 +21,11 @@ android {
    }
 	
    // 米盟 SDK
+     compileOptions {
+         sourceCompatibility JavaVersion.VERSION_1_7
+         targetCompatibility JavaVersion.VERSION_1_7
+     }
+
    packagingOptions {
         doNotStrip "*/*/libmimo_1011.so"
    }
--- a/libaes/build.properties
+++ b/libaes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 13:11:09 HKT 2026
-stageCount=4
+#Tue May 19 20:38:13 HKT 2026
+stageCount=8
 libraryProject=libaes
 baseVersion=15.20
-publishVersion=15.20.3
+publishVersion=15.20.7
 buildCount=0
-baseBetaVersion=15.20.4
+baseBetaVersion=15.20.8
--- a/libaes/src/main/res/layout/view_adscontrol.xml
+++ b/libaes/src/main/res/layout/view_adscontrol.xml
@@ -50,7 +50,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:visibility="gone"
-        android:layout_marginTop="0dp"> <!-- 移除顶部多余间距 -- android:background="@drawable/bg_container_border">
+        android:layout_marginTop="0dp"> <!-- 移除顶部多余间距 - android:background="@drawable/bg_container_border" -->

        <ImageView
            android:id="@+id/iv_winboll_store"
--- a/libaes/src/main/res/values-night/colors.xml
+++ b/libaes/src/main/res/values-night/colors.xml
@@ -28,6 +28,6 @@
    <color name="toolbarTextColor">#FFFFFFFF</color>
    <color name="mainWindowBackgroundColor">#FF2C2C2C</color>
    <color name="mainWindowTextColor">#FFFFFFFF</color>
-    <color name="debugTextColor">#FFFF0000</color>
+    <color name="debugTextColor">#FFAAAAAA</color>

 </resources>
--- a/libaes/src/main/res/values/colors.xml
+++ b/libaes/src/main/res/values/colors.xml
@@ -28,6 +28,6 @@
    <color name="toolbarTextColor">#FFFFFFFF</color>
    <color name="mainWindowBackgroundColor">#FFFFFFFF</color>
    <color name="mainWindowTextColor">#FF000000</color>
-    <color name="debugTextColor">#FFFF0000</color>
+    <color name="debugTextColor">#FF808080</color>

 </resources>
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -25,14 +25,5 @@ android {
 }

 dependencies {
-	// 网络连接类库
-    api 'com.squareup.okhttp3:okhttp:4.4.1'
-	// Gson
-	api 'com.google.code.gson:gson:2.8.9'
-    // Html 解析
-    api 'org.jsoup:jsoup:1.13.1'
-	// 添加JSch依赖（SFTP核心，com.jcraft:jsch:0.1.54）
-	api 'com.jcraft:jsch:0.1.54'
-
    api fileTree(dir: 'libs', include: ['*.jar'])
 }
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 12 09:16:45 HKT 2026
-stageCount=10
+#Tue May 19 18:54:18 HKT 2026
+stageCount=17
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.9
+publishVersion=15.20.16
 buildCount=0
-baseBetaVersion=15.20.10
+baseBetaVersion=15.20.17
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -3,18 +3,6 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    package="cc.winboll.studio.libappbase">

-    <!-- 拥有完全的网络访问权限 -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-
-    <!-- 读取您共享存储空间中的内容 -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-
-    <!-- 修改或删除您共享存储空间中的内容 -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <!-- MANAGE_EXTERNAL_STORAGE -->
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
-
    <application
        android:requestLegacyExternalStorage="true"
        android:networkSecurityConfig="@xml/network_security_config">
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java
@@ -135,8 +135,8 @@ public class LogUtils {
            return;
        }

-        final long MAX_FILE_SIZE = 6291456L;
-        final long KEEP_FILE_SIZE = 3145728L;
+		final long KEEP_FILE_SIZE = 25000L; // ~25KB 确保剪贴板可完整复制
+        final long MAX_FILE_SIZE = 2*KEEP_FILE_SIZE;
        final long fileSize = _mfLogCatchFile.length();

        if (fileSize <= MAX_FILE_SIZE) {
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java
@@ -12,13 +12,11 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.R;
 import cc.winboll.studio.libappbase.ToastUtils;
 import cc.winboll.studio.libappbase.dialogs.DebugHostDialog;
-import cc.winboll.studio.libappbase.dialogs.APPValidationDialog;
 import cc.winboll.studio.libappbase.models.APPInfo;

 /**
@@ -328,14 +326,7 @@ public class AboutView extends LinearLayout {
 					ToastUtils.show("已取消调试状态，重启应用可生效。");
 				}
 			});
-		// 正版校验弹窗
-        ibSigngetDialog.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					LogUtils.d(TAG, "ibSigngetDialog onClick：唤起应用正版校验弹窗");
-					new APPValidationDialog(mContext, mszAppName, mszAppVersionName).show();
-				}
-			});
+        
        // 调试地址配置弹窗
        ibWinBoLLHostDialog.setOnClickListener(new OnClickListener() {
 				@Override
--- a/libdebugtemp/.gitignore
+++ b/libdebugtemp/.gitignore
@@ -1 +0,0 @@
-/build
--- a/libdebugtemp/build.gradle
+++ b/libdebugtemp/build.gradle
@@ -1,24 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
-apply from: '../.winboll/winboll_lib_build.gradle'
-apply from: '../.winboll/winboll_lint_build.gradle'
-
-android {
-	// 适配MIUI12
-	compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-
-    defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 30
-    }
-	
-    compileOptions {
-         sourceCompatibility JavaVersion.VERSION_1_7
-         targetCompatibility JavaVersion.VERSION_1_7
-     }
-}
-
-dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-}
--- a/libdebugtemp/build.properties
+++ b/libdebugtemp/build.properties
@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Fri May 01 17:09:11 HKT 2026
-stageCount=57
-libraryProject=libdebugtemp
-baseVersion=15.0
-publishVersion=15.0.56
-buildCount=0
-baseBetaVersion=15.0.57
--- a/libdebugtemp/proguard-rules.pro
+++ b/libdebugtemp/proguard-rules.pro
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:/tools/adt-bundle-windows-x86_64-20131030/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
--- a/libdebugtemp/src/main/AndroidManifest.xml
+++ b/libdebugtemp/src/main/AndroidManifest.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio" >
-
-    <application>
-        <activity
-            android:name=".LibraryActivity"
-            android:label="@string/lib_name" >
-        </activity>
-    </application>
-
-</manifest>
-
--- a/libdebugtemp/src/main/java/cc/winboll/studio/LibraryActivity.java
+++ b/libdebugtemp/src/main/java/cc/winboll/studio/LibraryActivity.java
@@ -1,12 +0,0 @@
-package cc.winboll.studio;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class LibraryActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.library);
-    }
-}
--- a/libdebugtemp/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/libdebugtemp/src/main/res/drawable-hdpi/ic_launcher.png
--- a/libdebugtemp/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/libdebugtemp/src/main/res/drawable-mdpi/ic_launcher.png
--- a/libdebugtemp/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/libdebugtemp/src/main/res/drawable-xhdpi/ic_launcher.png
--- a/libdebugtemp/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/libdebugtemp/src/main/res/drawable-xxhdpi/ic_launcher.png
--- a/libdebugtemp/src/main/res/layout/library.xml
+++ b/libdebugtemp/src/main/res/layout/library.xml
@@ -1,11 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center">
-
-    <TextView
-        android:text="@string/text_libraryactivity"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
--- a/libdebugtemp/src/main/res/values-v21/styles.xml
+++ b/libdebugtemp/src/main/res/values-v21/styles.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="@android:style/Theme.Material.Light">
-	</style>
-</resources>
--- a/libdebugtemp/src/main/res/values/strings.xml
+++ b/libdebugtemp/src/main/res/values/strings.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="lib_name">libdebugtemp</string>
-    <string name="hello_world">Hello world!</string>
-    <string name="text_libraryactivity">LibraryActivity</string>
-
-</resources>
--- a/libdebugtemp/src/main/res/values/styles.xml
+++ b/libdebugtemp/src/main/res/values/styles.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="@android:style/Theme.Holo.Light">
-	</style>
-</resources>
Author	SHA1	Message	Date
ZhanGSKen	9c3963822e	<aes>APK 15.20.7 release Publish.	2026-05-19 20:38:13 +08:00
ZhanGSKen	30532f8e8d	版本号对齐APPBase。	2026-05-19 20:26:18 +08:00
ZhanGSKen	2b98149e0f	Merge branch 'aes' into merge	2026-05-19 19:45:12 +08:00
ZhanGSKen	80d9b764ee	Merge branch 'projects_keeper_tag' into merge	2026-05-19 19:44:19 +08:00
ZhanGSKen	d4f24a9b0c	Merge branch 'aes' into merge	2026-05-19 19:30:17 +08:00
ZhanGSKen	f357e353ee	Merge branch 'projects_keeper_tag' into merge	2026-05-19 19:30:12 +08:00
QingLong	edd312a525	合并模块APPBase 同步最新时间标签appbase-v15.20.16	2026-05-19 19:00:01 +08:00
QingLong	aec680e36e	合并模块AES 同步最新时间标签aes-v15.20.6	2026-05-19 01:53:02 +08:00
ZhanGSKen	937f90aa07	<libaes>Library Release 15.20.6	2026-05-19 01:52:54 +08:00
ZhanGSKen	643e91bd71	<aes>APK 15.20.6 release Publish.	2026-05-19 01:52:47 +08:00
QingLong	1c6f7783e5	合并模块AES 同步最新时间标签aes-v15.20.5	2026-05-19 01:49:06 +08:00
ZhanGSKen	f4c6cea623	<libaes>Library Release 15.20.5	2026-05-19 01:48:56 +08:00
ZhanGSKen	a0309ce98a	<aes>APK 15.20.5 release Publish.	2026-05-19 01:48:43 +08:00
qinglong	193011a80d	合并模块AES 同步最新时间标签aes-v15.20.4	2026-05-17 21:00:01 +08:00
ZhanGSKen	931671d85a	<libaes>Library Release 15.20.4	2026-05-17 20:53:51 +08:00
ZhanGSKen	580fa87773	<aes>APK 15.20.4 release Publish.	2026-05-17 20:53:39 +08:00
LaizyBoy	a26276e169	fix: 将libaes模块debugTextColor从红色改为灰色 - libaes普通模式debugTextColor改为#FF808080（灰色） - libaes深色模式debugTextColor改为#FFAAAAAA（浅灰）	2026-05-17 20:49:19 +08:00
LaizyBoy	a3bf1087aa	fix: 修复libaes模块Java 7兼容性问题及XML注释语法错误 - 为libaes添加compileOptions，指定Java 7源码与目标兼容级别 - 修复view_adscontrol.xml中XML注释包含非法"--"及缺少关闭符的问题 - 更新aes与libaes的build.properties编译计数	2026-05-17 20:30:41 +08:00
ZhanGSKen	1e5295df95	Merge keeper tag branch sources.	2026-05-17 20:15:50 +08:00
ZhanGSKen	8cb9ea5cae	清理源码冗余模块	2026-05-17 20:07:28 +08:00
qinglong	eb3d8f4806	合并模块APPBase 同步最新时间标签appbase-v15.20.15	2026-05-17 16:20:01 +08:00
ZhanGSKen	aa1b701c8b	合并模块APPBase 同步最新时间标签appbase-v15.20.14	2026-05-17 15:55:39 +08:00
ZhanGSKen	fc20bd56b4	合并模块APPBase 同步最新时间标签appbase-v15.20.13	2026-05-17 15:52:14 +08:00
ZhanGSKen	e92538850f	合并模块APPBase 同步最新时间标签appbase-v15.20.12	2026-05-17 15:46:18 +08:00
ZhanGSKen	81b7af0ec4	1. 排序规则彻底换掉不再按版本号排序，按标签创建时间从新到旧，永远拿到最后发布的最新标签 2. 增加 -f 强制覆盖，确保拉取最新文件 3. 你现在 appbase-v15.20.12 是后打的标签，脚本会直接优先抓取它 4. 无差异也会正常同步最新标签版本文件	2026-05-17 15:45:57 +08:00
ZhanGSKen	e2b4bddb61	BugFix	2026-05-17 15:43:18 +08:00
ZhanGSKen	cbca61ad84	1. 删掉手动拼接标签逻辑，直接取用远程完整标签名，杜绝 appbase- 空格版本 2. 使用 git rev-parse --verify 标签^{commit} 精准拿远程标签commit 3. 合并来源强制指定 origin/模块名远程分支 4. 空标签直接跳过，不再出现 xxx- 非法标签 5. 检出语法标准： git checkout 远程分支 commit -- 目录	2026-05-17 15:37:37 +08:00
ZhanGSKen	28bc3a86e3	1. 版本排序彻底修复按大版本.中版本.小版本.迭代号分段数字排序，优先抓取 appbase-v15.20.12 而不是旧版 2. 检出命令修正统一使用 git checkout 提交哈希 -- 目录语法，不再报路径不存在	2026-05-17 15:34:14 +08:00
ZhanGSKen	79f7f682b3	合并模块APPBase 来源最新标签:appbase-v15.20.11 提交点:c7184ad6df0092106e535308ba486a9503395042	2026-05-17 15:25:41 +08:00
ZhanGSKen	8fa09a9f99	demoapp、winboll、aes 没有 xxx-版本号格式标签，跳过属于正常 2. appbase 成功抓到标签和commit，只是命令语法错导致拉取失败，改完即可正常合并	2026-05-17 15:25:10 +08:00
ZhanGSKen	555c5deef9	1. get_module_latest_tag → 抓取远程该模块最新Tag 2. get_commit_by_tag → 用最新Tag查出唯一对应提交Commit 3. 校验Tag/Commit非空 4. 执行合并命令git checkout origin/模块名 commit哈希:模块文件夹 5. 仅添加对应目录，生成带标签+commit的提交日志 6. 无标签直接跳过，不产生任何操作	2026-05-17 15:22:31 +08:00
ZhanGSKen	3707891e0b	1. 调用函数 → 查出模块标签 + 标签绑定提交Commit哈希 2. 判定标签/Commit为空直接跳过 3. 合并命令： git checkout origin/模块名 commit哈希:模块文件夹 4. 仅添加当前模块目录，精准提交 5. 提交日志同时记录标签名+提交哈希，方便回溯	2026-05-17 15:17:40 +08:00
ZhanGSKen	0c9c6c9fd4	1. 调试日志重定向 >&2 彻底杜绝调试文字混入标签变量， MOD_TAG 只存纯净标签名 2. 拉取标签写法修正旧： git checkout 标签名目录新： git checkout origin/tags/标签名 -- 目录直接从远程标签仓库拉取对应提交点文件夹，100%命中标签代码 3. 精准add提交放弃 git add . ，只添加当前合并的模块文件夹，避免乱提交 4. 强制全量同步标签脚本开头双重 fetch --tags ，保证本地能读取所有远程版本标签 5. 空标签直接拦截匹配不到标签完全跳过，不产生空提交、无效覆盖 6. 严格锁定本地分支，防止合并错分支	2026-05-17 15:11:21 +08:00
ZhanGSKen	be3d042ade	设置合并最新标签的模块文件夹。取消合并最新提交的文件夹。	2026-05-17 14:22:14 +08:00
qinglong	33dc49267e	合并 APPBase 项目，调试：模块[appbase] 远程分支最新Commit = `74299bf9b2`	2026-05-17 13:00:02 +08:00
ZhanGSKen	e3166b639e	操作步骤调整	2026-05-17 12:13:50 +08:00
ZhanGSKen	3d26bbe090	提交内容整理	2026-05-17 12:08:22 +08:00
ZhanGSKen	cd375cefc5	直接取远程分支 origin/xxx 最新全量 Commit，不限制子目录 2. 优化标签匹配：只要标签前缀是模块名- 就匹配 3. 保留你原有全部脚本结构，只改 get_module_latest_tag 函数	2026-05-17 11:35:41 +08:00
ZhanGSKen	025c095bcd	提交备注自动带上标签名	2026-05-17 11:18:06 +08:00
ZhanGSKen	c88a0a52a8	修复标签获取bug	2026-05-17 11:09:45 +08:00
ZhanGSKen	dc4eeefa55	更正分支环境检测名称	2026-05-17 11:04:46 +08:00
ZhanGSKen	c7d79e160b	添加Projects_Keeper_Tag仓库合并管理脚本	2026-05-17 10:50:04 +08:00
qinglong	771f591a3a	合并 APPBase 项目	2026-05-16 17:30:01 +08:00
ZhanGSKen	8aaec10d74	更新输出提示，区分合并的项目类型	2026-05-16 11:17:41 +08:00
ZhanGSKen	a3d5031cdc	添加推送命令	2026-05-16 10:44:24 +08:00
ZhanGSKen	9a7f651d80	合并 APPBase 项目	2026-05-16 10:23:40 +08:00
ZhanGSKen	ba3877f3cc	合并 WinBoLL 项目	2026-05-16 10:23:40 +08:00
ZhanGSKen	7e2f48f33a	添加projects-keeper分支项目自动合并脚本。	2026-05-16 10:23:05 +08:00