Remove ADsControlView from SettingsActivity layout

The class  was referenced in  but not present in the current module, causing an InflateException at runtime. The tag has been commented out to prevent the crash while preserving the UI layout structure. No other source files were changed.

.winboll/bashMergeProjects-to-Projects_Keeper.sh

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

.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh

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

.winboll/bashPublishAPKAddTagInTermux.sh

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

.winboll/bashPublishLIBAddTagInTermux.sh

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

libwinboll/.gitignore

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

libwinboll/build.gradle

@@ -1,55 +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
-    }
-    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.22'
-    //api 'cc.winboll.studio:libaes:15.20.12'
-	
-	// 备用库 jitpack.io 地址
-	api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.22'
-	api 'com.github.ZhanGSKen:libaes:aes-v15.20.12'
-	
-    api fileTree(dir: 'libs', include: ['*.jar'])
-}

libwinboll/build.properties

@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Tue Jun 02 01:32:02 GMT 2026
-stageCount=6
-libraryProject=libwinboll
-baseVersion=15.20
-publishVersion=15.20.5
-buildCount=3
-baseBetaVersion=15.20.6

libwinboll/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 *;
-#}

libwinboll/src/main/AndroidManifest.xml

@@ -1,12 +0,0 @@
-<?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

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

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

@@ -1,5 +0,0 @@
-<?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

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

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

settings.gradle-demo

@@ -72,7 +72,6 @@
 
 // WinBoLL 项目编译设置
 //include ':winboll'
-//include ':libwinboll'
 //rootProject.name = "winboll"
 
 // RegExpUtils 项目编译设置

winboll/build.gradle

@@ -18,9 +18,13 @@ def genVersionName(def versionName){
 }
 
 android {
-	// 适配MIUI12
+ 	// 适配MIUI12
-	compileSdkVersion 30
+     compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+ 	
+     compileOptions {
+         sourceCompatibility JavaVersion.VERSION_1_7
+         targetCompatibility JavaVersion.VERSION_1_7
+     }
  
     defaultConfig {
         applicationId "cc.winboll.studio.winboll"
@@ -36,21 +40,9 @@ android {
             versionName = genVersionName("${versionName}")
         }
     }
-
-	// 米盟 SDK
-    packagingOptions {
-         doNotStrip "*/*/libmimo_1011.so"
-    }
-	
-    sourceSets {
-        main {
-            jniLibs.srcDirs = ['libs'] // 若SO库放在libs目录下
-        }
-    }
 }
 
 dependencies {
-	api project(':libwinboll')
     api 'com.google.code.gson:gson:2.10.1'
 	
 	// 下拉控件
@@ -80,7 +72,7 @@ dependencies {
 	
 	
 	// 米盟
-	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+	//api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
      //注意：以下5个库必须要引入
     //implementation 'androidx.appcompat:appcompat:1.4.1'
     api 'androidx.recyclerview:recyclerview:1.0.0'
@@ -104,13 +96,16 @@ dependencies {
 	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.22'
+    api 'cc.winboll.studio:libappbase:15.20.34'
-    //api 'cc.winboll.studio:libaes:15.20.12'
+    api 'cc.winboll.studio:libaes:15.20.17'
 	
 	// 备用库 jitpack.io 地址
-	api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.22'
+	//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
-	api 'com.github.ZhanGSKen:libaes:aes-v15.20.12'
+	//api 'com.github.ZhanGSKen:libaes:aes-v15.20.16'
 	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }

winboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Jun 02 01:32:02 GMT 2026
+#Wed Jul 01 14:49:57 CST 2026
-stageCount=6
+stageCount=9
-libraryProject=libwinboll
+libraryProject=
 baseVersion=15.20
-publishVersion=15.20.5
+publishVersion=15.20.8
-buildCount=3
+buildCount=16
-baseBetaVersion=15.20.6
+baseBetaVersion=15.20.9

winboll/src/main/AndroidManifest.xml

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

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

@@ -14,7 +14,6 @@ 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;
@@ -22,8 +21,12 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.GlobalCrashActivity;
 import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -33,16 +36,16 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
-import java.util.ArrayList;
 
 public class App extends GlobalApplication {
 
@@ -59,32 +62,37 @@ public class App extends GlobalApplication {
 
     @Override
     public void onCreate() {
-        super.onCreate();
+		try {
-		//setIsDebugging(BuildConfig.DEBUG);
+			super.onCreate();
-		//setIsDebugging(false);
 
-		WinBoLLActivityManager.init(this);
+			ToastUtils.init(this);
 
-        // 初始化 AES 主题工具（注入当前应用命名空间的主题ID列表，按 ThemeType.ordinal() 顺序）
+			WinBoLLActivityManager.init(this);
-        ArrayList<Integer> themeStyleList = new ArrayList<Integer>();
-        themeStyleList.add(R.style.MyAppTheme);         // AES(0)
-        themeStyleList.add(R.style.MyDepthAppTheme);   // DEPTH(1)
-        themeStyleList.add(R.style.MySkyAppTheme);     // SKY(2)
-        themeStyleList.add(R.style.MyGoldenAppTheme);  // GOLDEN(3)
-        themeStyleList.add(R.style.MyBearingAppTheme); // BEARING(4)
-        themeStyleList.add(R.style.MyMemorAppTheme);   // MEMOR(5)
-        themeStyleList.add(R.style.MyTaoAppTheme);     // TAO(6)
-        AESThemeUtil.init(themeStyleList);
 			
-        // 初始化 Toast 框架
+			// 初始化 AES 主题工具（注入当前应用命名空间的主题ID列表，按 ThemeType.ordinal() 顺序）
-        ToastUtils.init(this);
+			ArrayList<Integer> themeStyleList = new ArrayList<Integer>();
-        // 设置 Toast 布局样式
+			themeStyleList.add(R.style.MyAppTheme);         // AES(0)
-        //ToastUtils.setView(R.layout.view_toast);
+			themeStyleList.add(R.style.MyDepthAppTheme);   // DEPTH(1)
-        //ToastUtils.setStyle(new WhiteToastStyle());
+			themeStyleList.add(R.style.MySkyAppTheme);     // SKY(2)
-        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+			themeStyleList.add(R.style.MyGoldenAppTheme);  // GOLDEN(3)
+			themeStyleList.add(R.style.MyBearingAppTheme); // BEARING(4)
+			themeStyleList.add(R.style.MyMemorAppTheme);   // MEMOR(5)
+			themeStyleList.add(R.style.MyTaoAppTheme);     // TAO(6)
+			AESThemeUtil.init(themeStyleList);
 
-        //CrashHandler.getInstance().registerGlobal(this);
+        } catch (Throwable e) {
-        //CrashHandler.getInstance().registerPart(this);
+            StringWriter sw = new StringWriter();
+            PrintWriter pw = new PrintWriter(sw);
+            e.printStackTrace(pw);
+            pw.close();
+            String stackTraceStr = sw.toString();
+            CrashHandleNotifyUtils.handleUncaughtException(
+                this,
+                getPackageName(),
+                stackTraceStr,
+                GlobalCrashActivity.class
+            );
+        }
     }
 
 	@Override

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

@@ -17,7 +17,7 @@ import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.winboll.R;
 import cc.winboll.studio.winboll.activities.AboutActivity;
 import cc.winboll.studio.winboll.activities.SettingsActivity;
-import cc.winboll.studio.winboll.applications.MyTermuxActivity;
+import cc.winboll.studio.winboll.termux.MyTermuxActivity;
 import cc.winboll.studio.winboll.fragments.BrowserFragment;
 import cc.winboll.studio.winboll.unittest.TermuxEnvTestActivity;
 import java.util.ArrayList;
@@ -193,9 +193,7 @@ public class MainActivity extends DrawerFragmentActivity {
             } else if (nItemId == R.id.item_termux_env_test) {
                 Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class);
                 WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
-            } else if (nItemId == R.id.item_library_activity) {
+
-                Intent intent = new Intent(getApplicationContext(), cc.winboll.studio.libwinboll.WinBoLLLibraryActivity.class);
-                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
             } else {
                 return super.onOptionsItemSelected(item);
             }

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

@@ -1,237 +0,0 @@
-package cc.winboll.studio.winboll.applications;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.winboll.R;
-import cc.winboll.studio.winboll.models.TermuxButtonManager;
-import cc.winboll.studio.winboll.models.TermuxButtonModel;
-import cc.winboll.studio.winboll.termux.TermuxCommandExecutor;
-import java.util.ArrayList;
-
-public class MyTermuxActivity extends AppCompatActivity {
-
-    public static final String TAG = "MyTermuxActivity";
-
-    private Toolbar mToolbar;
-    private ListView mListView;
-    private Button mBtnAdd;
-    private ButtonAdapter mAdapter;
-    private ArrayList<TermuxButtonModel> mButtonList;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_my_termux);
-
-        initToolbar();
-        initListView();
-        initAddButton();
-        refreshList();
-    }
-
-    private void initToolbar() {
-        mToolbar = findViewById(R.id.toolbar);
-        if (mToolbar != null) {
-            setSupportActionBar(mToolbar);
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    finish();
-                }
-            });
-        }
-    }
-
-    private void initListView() {
-        mListView = findViewById(R.id.list_termux_buttons);
-        mButtonList = new ArrayList<TermuxButtonModel>();
-        mAdapter = new ButtonAdapter();
-        mListView.setAdapter(mAdapter);
-
-        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                TermuxButtonModel model = mButtonList.get(position);
-                TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this,
-                    model.getExeCommand(), model.getWorkDir());
-            }
-        });
-
-        mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
-            @Override
-            public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-                showContextMenu(position);
-                return true;
-            }
-        });
-    }
-
-    private void initAddButton() {
-        mBtnAdd = findViewById(R.id.btn_add_termux_button);
-        mBtnAdd.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showButtonDialog(-1, null);
-            }
-        });
-    }
-
-    private void refreshList() {
-        mButtonList.clear();
-        ArrayList<TermuxButtonModel> loaded = TermuxButtonManager.loadButtons(this);
-        if (loaded != null) {
-            mButtonList.addAll(loaded);
-        }
-        mAdapter.notifyDataSetChanged();
-    }
-
-    private void showContextMenu(final int position) {
-        final TermuxButtonModel model = mButtonList.get(position);
-        String[] items = new String[]{
-            getString(R.string.menu_execute),
-            getString(R.string.menu_edit),
-            getString(R.string.menu_delete),
-            getString(R.string.menu_cancel)
-        };
-        new AlertDialog.Builder(this)
-            .setTitle(model.getButtonName())
-            .setItems(items, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    if (which == 0) {
-                        TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this,
-                            model.getExeCommand(), model.getWorkDir());
-                    } else if (which == 1) {
-                        showButtonDialog(position, model);
-                    } else if (which == 2) {
-                        showDeleteConfirmDialog(position);
-                    }
-                }
-            })
-            .show();
-    }
-
-    private void showDeleteConfirmDialog(final int position) {
-        new AlertDialog.Builder(this)
-            .setTitle(getString(R.string.dialog_delete_title))
-            .setMessage(getString(R.string.dialog_delete_message) + mButtonList.get(position).getButtonName())
-            .setPositiveButton(getString(R.string.dialog_confirm), new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    TermuxButtonManager.deleteButton(MyTermuxActivity.this, mButtonList, position);
-                    refreshList();
-                    Toast.makeText(MyTermuxActivity.this, R.string.toast_deleted, Toast.LENGTH_SHORT).show();
-                }
-            })
-            .setNegativeButton(getString(R.string.dialog_cancel), null)
-            .show();
-    }
-
-    private void showButtonDialog(final int index, final TermuxButtonModel model) {
-        final boolean isEdit = (model != null);
-
-        LinearLayout layout = new LinearLayout(this);
-        layout.setOrientation(LinearLayout.VERTICAL);
-        layout.setPadding(40, 20, 40, 20);
-
-        final EditText etName = new EditText(this);
-        etName.setHint(R.string.hint_button_name);
-        if (model != null) {
-            etName.setText(model.getButtonName());
-        }
-        layout.addView(etName);
-
-        final EditText etCommand = new EditText(this);
-        etCommand.setHint(R.string.hint_exe_command);
-        if (model != null) {
-            etCommand.setText(model.getExeCommand());
-        }
-        layout.addView(etCommand);
-
-        final EditText etWorkDir = new EditText(this);
-        etWorkDir.setHint(R.string.hint_work_dir);
-        if (model != null) {
-            etWorkDir.setText(model.getWorkDir());
-        }
-        layout.addView(etWorkDir);
-
-        int titleResId = isEdit ? R.string.dialog_edit_title : R.string.dialog_add_title;
-        new AlertDialog.Builder(this)
-            .setTitle(titleResId)
-            .setView(layout)
-            .setPositiveButton(getString(R.string.dialog_save), new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    String name = etName.getText().toString().trim();
-                    String command = etCommand.getText().toString().trim();
-                    String workDir = etWorkDir.getText().toString().trim();
-                    if (name.isEmpty() || command.isEmpty()) {
-                        Toast.makeText(MyTermuxActivity.this, R.string.toast_fields_required, Toast.LENGTH_SHORT).show();
-                        return;
-                    }
-                    TermuxButtonModel newModel = new TermuxButtonModel();
-                    newModel.setButtonName(name);
-                    newModel.setExeCommand(command);
-                    newModel.setWorkDir(workDir);
-                    if (isEdit) {
-                        TermuxButtonManager.updateButton(MyTermuxActivity.this, mButtonList, index, newModel);
-                    } else {
-                        TermuxButtonManager.addButton(MyTermuxActivity.this, mButtonList, newModel);
-                    }
-                    refreshList();
-                }
-            })
-            .setNegativeButton(getString(R.string.dialog_cancel), null)
-            .show();
-    }
-
-    private class ButtonAdapter extends BaseAdapter {
-        @Override
-        public int getCount() {
-            return mButtonList.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mButtonList.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            TextView tv;
-            if (convertView == null) {
-                tv = new TextView(MyTermuxActivity.this);
-                tv.setPadding(30, 20, 30, 20);
-                tv.setTextSize(16);
-                tv.setMinHeight(80);
-            } else {
-                tv = (TextView) convertView;
-            }
-
-            TermuxButtonModel model = mButtonList.get(position);
-            tv.setText(model.getButtonName() + "\n" + model.getExeCommand());
-            tv.setTextColor(getResources().getColor(android.R.color.white));
-            return tv;
-        }
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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