Compare commits
51 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a8587fd636 | |||
| cc1e148608 | |||
| 5ec65f7c89 | |||
| b3a3a58348 | |||
| 5bf588f44d | |||
| 301227c330 | |||
| 033b9aec67 | |||
| eebb21d041 | |||
| 332c5420b7 | |||
| 3fc3fbe14f | |||
| e51a80751a | |||
| 7f4679a46a | |||
| 33d832f8df | |||
| 3bc37b637f | |||
| 0ecdda7127 | |||
| c65fa63545 | |||
| 231de80efa | |||
| 5d49185752 | |||
| a9ac51eb12 | |||
| bd03705240 | |||
| 8641196cdf | |||
| 49acdd7022 | |||
| 70ab6d02c3 | |||
| cb11da95ed | |||
| 73ea9147aa | |||
| 8556d3a253 | |||
| 34b982de8a | |||
| 2b37edd2b2 | |||
| fd713f5906 | |||
| 3e4044ac9c | |||
| bcbdde2197 | |||
| 54d8257e9c | |||
| 4c7dd3b3a6 | |||
| 188dcb0648 | |||
| cd41c13bd6 | |||
| 78642d7d23 | |||
| 8ba85fa51d | |||
| 589e62279d | |||
| f78caf762c | |||
| cc0ea4861d | |||
| 3ca34b513a | |||
| 780054d909 | |||
| 5028780d90 | |||
| 38da5d18d8 | |||
| 052c887177 | |||
| 5c20c6af73 | |||
| eac283319c | |||
| 7fd7a84889 | |||
| c2890807cf | |||
| 1ba5b113eb | |||
| ba6b27c15c |
@@ -0,0 +1,224 @@
|
||||
exit
|
||||
#!/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"
|
||||
|
||||
# ==================== 函数定义 ====================
|
||||
# 检查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
|
||||
echo "---------------------------------------------"
|
||||
echo " 步骤2:编译Stage Release APK"
|
||||
echo "---------------------------------------------"
|
||||
echo "[INFO] 开始执行Gradle任务:${GRADLE_TASK_PUBLISH}"
|
||||
# 调试用(注释正式任务,启用调试任务)
|
||||
# bash gradlew :${APP_NAME}:${GRADLE_TASK_DEBUG}
|
||||
bash gradlew :${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}
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -122,7 +122,6 @@ android {
|
||||
// 如果正在调试,就拷贝到 WinBoLL 备份管理文件夹
|
||||
//
|
||||
if(variant.flavorName == "beta"&&variant.buildType.name == "debug"){
|
||||
//File outBuildBckDir = new File(fWinBoLLStudioDir, "/${rootProject.name}/${variant.buildType.name}")
|
||||
File outBuildBckDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/${variant.buildType.name}")
|
||||
// 创建目标路径目录
|
||||
if(!outBuildBckDir.exists()) {
|
||||
@@ -130,6 +129,7 @@ android {
|
||||
println "Output Folder Created.(WinBoLLStudio) : " + outBuildBckDir.getAbsolutePath()
|
||||
}
|
||||
if(outBuildBckDir.exists()) {
|
||||
def targetApkFile = new File(outBuildBckDir, outputFileName)
|
||||
copy{
|
||||
from file.outputFile
|
||||
into outBuildBckDir
|
||||
@@ -138,6 +138,14 @@ android {
|
||||
}
|
||||
println "Output APK (WinBoLLStudio): " + outBuildBckDir.getAbsolutePath() + "/${outputFileName}"
|
||||
}
|
||||
// ========== 设置文件权限为775 ==========
|
||||
if(targetApkFile.exists()){
|
||||
exec {
|
||||
commandLine 'chmod', '775', targetApkFile.absolutePath
|
||||
}
|
||||
println "Set file permission to 775 : ${targetApkFile.absolutePath}"
|
||||
}
|
||||
|
||||
// 检查编译标志位配置
|
||||
assert (winbollBuildProps['buildCount'] != null)
|
||||
assert (winbollBuildProps['libraryProject'] != null)
|
||||
@@ -160,8 +168,7 @@ android {
|
||||
assert(libraryProjectBuildPropsFile.exists())
|
||||
java.nio.file.Path sourceFilePath = winbollBuildPropsFile.toPath();
|
||||
java.nio.file.Path targetFilePath = libraryProjectBuildPropsFile.toPath();
|
||||
// 使用copyTo()方法复制文件,如果目标文件存在会被覆盖,可选参数可以选择不覆盖
|
||||
java.nio.file.Files.copy(sourceFilePath, targetFilePath, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
|
||||
java.nio.file.Files.copy(sourceFilePath, targetFilePath, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
|
||||
|
||||
println "\n\n>>> Library Project build.properties saved.\n\n";
|
||||
}
|
||||
@@ -172,16 +179,12 @@ android {
|
||||
//
|
||||
if(variant.flavorName == "stage"&&variant.buildType.name == "release"){
|
||||
// 发布 APK 文件
|
||||
//
|
||||
// 截取版本号的版本字段为短版本名
|
||||
String szVersionName = "${versionName}"
|
||||
String[] szlistTemp = szVersionName.split("-")
|
||||
String szShortVersionName = szlistTemp[0]
|
||||
//String szCommonTagAPKName = "${rootProject.name}_" + szShortVersionName + ".apk"
|
||||
String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk"
|
||||
println "CommonTagAPKName is : " + szCommonTagAPKName
|
||||
|
||||
//File outTagDir = new File(fWinBoLLStudioDir, "/${rootProject.name}/tag/")
|
||||
File outTagDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/tag/")
|
||||
// 创建目标路径目录
|
||||
if(!outTagDir.exists()) {
|
||||
@@ -192,12 +195,10 @@ android {
|
||||
if(outTagDir.exists()) {
|
||||
File targetAPK = new File(outTagDir, "${szCommonTagAPKName}")
|
||||
if(targetAPK.exists()) {
|
||||
// 标签版本APK文件已经存在,构建拷贝任务停止
|
||||
assert (!targetAPK.exists())
|
||||
// 可选择删除并继续输出APK文件
|
||||
//delete targetAPK
|
||||
}
|
||||
// 复制一个备份
|
||||
// 复制完整版APK
|
||||
def fullApkFile = new File(outTagDir, outputFileName)
|
||||
copy{
|
||||
from file.outputFile
|
||||
into outTagDir
|
||||
@@ -206,7 +207,16 @@ android {
|
||||
}
|
||||
println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${outputFileName}"
|
||||
}
|
||||
// 复制一个并重命名为短版本名
|
||||
// 设置权限775。
|
||||
if(fullApkFile.exists()){
|
||||
exec {
|
||||
commandLine 'chmod', '775', fullApkFile.absolutePath
|
||||
}
|
||||
println "Set file permission to 775 : ${fullApkFile.absolutePath}"
|
||||
}
|
||||
|
||||
// 复制短版本名APK
|
||||
def shortApkFile = new File(outTagDir, szCommonTagAPKName)
|
||||
copy{
|
||||
from file.outputFile
|
||||
into outTagDir
|
||||
@@ -215,6 +225,14 @@ android {
|
||||
}
|
||||
println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${szCommonTagAPKName}"
|
||||
}
|
||||
// 设置权限775。
|
||||
if(shortApkFile.exists()){
|
||||
exec {
|
||||
commandLine 'chmod', '775', shortApkFile.absolutePath
|
||||
}
|
||||
println "Set file permission to 775 : ${shortApkFile.absolutePath}"
|
||||
}
|
||||
|
||||
// 检查编译标志位配置
|
||||
assert (winbollBuildProps['stageCount'] != null)
|
||||
assert (winbollBuildProps['publishVersion'] != null)
|
||||
@@ -239,14 +257,11 @@ android {
|
||||
fos.close();
|
||||
|
||||
if(winbollBuildProps['libraryProject'] != "") {
|
||||
// 如果应用 build.properties 文件设置了类库模块项目文件名
|
||||
// 就拷贝一份新的编译标志配置到类库项目文件夹
|
||||
File libraryProjectBuildPropsFile = new File("$RootProjectDir/" + winbollBuildProps['libraryProject'] + "/build.properties")
|
||||
assert(winbollBuildPropsFile.exists())
|
||||
assert(libraryProjectBuildPropsFile.exists())
|
||||
java.nio.file.Path sourceFilePath = winbollBuildPropsFile.toPath();
|
||||
java.nio.file.Path targetFilePath = libraryProjectBuildPropsFile.toPath();
|
||||
// 使用copyTo()方法复制文件,如果目标文件存在会被覆盖,可选参数可以选择不覆盖
|
||||
java.nio.file.Files.copy(sourceFilePath, targetFilePath, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
|
||||
}
|
||||
|
||||
@@ -263,17 +278,12 @@ android {
|
||||
// 如果正在调试发布版,就只生成和输出APK文件,不处理 Git 仓库提交与更新问题。
|
||||
//
|
||||
if(variant.flavorName == "stage"&&variant.buildType.name == "debug"){
|
||||
// 发布 APK 文件
|
||||
//
|
||||
// 截取版本号的版本字段为短版本名
|
||||
String szVersionName = "${versionName}"
|
||||
String[] szlistTemp = szVersionName.split("-")
|
||||
String szShortVersionName = szlistTemp[0]
|
||||
//String szCommonTagAPKName = "${rootProject.name}_" + szShortVersionName + ".apk"
|
||||
String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk"
|
||||
println "CommonTagAPKName is : " + szCommonTagAPKName
|
||||
|
||||
//File outTagDir = new File(fWinBoLLStudioDir, "/${rootProject.name}/tag/")
|
||||
File outTagDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/${variant.buildType.name}/")
|
||||
// 创建目标路径目录
|
||||
if(!outTagDir.exists()) {
|
||||
@@ -284,13 +294,11 @@ android {
|
||||
if(outTagDir.exists()) {
|
||||
File targetAPK = new File(outTagDir, "${szCommonTagAPKName}")
|
||||
if(targetAPK.exists()) {
|
||||
// 标签版本APK文件已经存在,构建拷贝任务停止
|
||||
println '如果是在调试 Stage 版应用包构建,请删除(注:在debug目录)现有的 Stage 应用包('+targetAPK.getAbsolutePath()+')。再编译一次。'
|
||||
assert (!targetAPK.exists())
|
||||
// 可选择删除并继续输出APK文件
|
||||
//delete targetAPK
|
||||
}
|
||||
// 复制一个备份
|
||||
// 复制完整版APK
|
||||
def debugFullApk = new File(outTagDir, outputFileName)
|
||||
copy{
|
||||
from file.outputFile
|
||||
into outTagDir
|
||||
@@ -299,7 +307,16 @@ android {
|
||||
}
|
||||
println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${outputFileName}"
|
||||
}
|
||||
// 复制一个并重命名为短版本名
|
||||
// 权限设为775。
|
||||
if(debugFullApk.exists()){
|
||||
exec {
|
||||
commandLine 'chmod', '775', debugFullApk.absolutePath
|
||||
}
|
||||
println "Set file permission to 775 : ${debugFullApk.absolutePath}"
|
||||
}
|
||||
|
||||
// 复制短版本名APK
|
||||
def debugShortApk = new File(outTagDir, szCommonTagAPKName)
|
||||
copy{
|
||||
from file.outputFile
|
||||
into outTagDir
|
||||
@@ -308,8 +325,13 @@ android {
|
||||
}
|
||||
println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${szCommonTagAPKName}"
|
||||
}
|
||||
|
||||
//不保存编译标志配置
|
||||
// 权限设为775
|
||||
if(debugShortApk.exists()){
|
||||
exec {
|
||||
commandLine 'chmod', '775', debugShortApk.absolutePath
|
||||
}
|
||||
println "Set file permission to 775 : ${debugShortApk.absolutePath}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -328,6 +350,13 @@ android {
|
||||
}
|
||||
println "Output APK (Common): " + outCommonDir.getAbsolutePath() + "/${commandAPKName}"
|
||||
}
|
||||
// 额外输出文件设置775权限
|
||||
if(apkFile.exists()){
|
||||
exec {
|
||||
commandLine 'chmod', '775', apkFile.absolutePath
|
||||
}
|
||||
println "Set file permission to 775 : ${apkFile.absolutePath}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ android {
|
||||
// versionName 更新后需要手动设置
|
||||
// .winboll/winbollBuildProps.properties 文件的 stageCount=0
|
||||
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
||||
versionName "15.20"
|
||||
versionName "15.21"
|
||||
if(true) {
|
||||
versionName = genVersionName("${versionName}")
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Wed Jun 03 20:17:02 HKT 2026
|
||||
stageCount=27
|
||||
#Tue Jul 21 14:10:49 HKT 2026
|
||||
stageCount=4
|
||||
libraryProject=libappbase
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.26
|
||||
baseVersion=15.21
|
||||
publishVersion=15.21.3
|
||||
buildCount=0
|
||||
baseBetaVersion=15.20.27
|
||||
baseBetaVersion=15.21.4
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools" >
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<!-- 拥有完全的网络访问权限 -->
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
|
||||
<application
|
||||
tools:replace="android:icon"
|
||||
tools:replace="android:icon"
|
||||
android:icon="@drawable/ic_winboll_beta">
|
||||
|
||||
<!-- Put flavor specific code here -->
|
||||
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
|
||||
</manifest>
|
||||
@@ -22,15 +22,17 @@
|
||||
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
|
||||
|
||||
<intent-filter>
|
||||
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
|
||||
<category android:name="android.intent.category.LAUNCHER"/>
|
||||
|
||||
<category android:name="android.intent.category.DEFAULT"/>
|
||||
|
||||
</intent-filter>
|
||||
|
||||
</activity>
|
||||
|
||||
|
||||
|
||||
<activity
|
||||
android:name=".Main2Activity"
|
||||
android:label="@string/app_name"
|
||||
@@ -52,6 +54,9 @@
|
||||
|
||||
<activity android:name=".AboutActivity"/>
|
||||
|
||||
<activity android:name="cc.winboll.studio.appbase.develop.APPExcetionMailSettingsActivity"
|
||||
android:exported="true"/>
|
||||
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
|
||||
@@ -37,7 +37,7 @@ public class AboutActivity extends Activity {
|
||||
appInfo.setAppName("APPBase");
|
||||
appInfo.setAppIcon(R.drawable.ic_winboll);
|
||||
appInfo.setAppDescription(getString(R.string.app_description));
|
||||
appInfo.setAppGitName("APPBase");
|
||||
appInfo.setAppGitName("WinBoLL");
|
||||
appInfo.setAppGitOwner("Studio");
|
||||
appInfo.setAppGitAPPBranch(branchName);
|
||||
appInfo.setAppGitAPPSubProjectFolder(branchName);
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
package cc.winboll.studio.appbase;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.ShortcutInfo;
|
||||
import android.content.pm.ShortcutManager;
|
||||
import android.graphics.drawable.Icon;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.view.Menu;
|
||||
@@ -11,6 +15,7 @@ import android.view.View;
|
||||
import android.widget.Toolbar;
|
||||
import cc.winboll.studio.appbase.R;
|
||||
import cc.winboll.studio.appbase.model.TestBean;
|
||||
import cc.winboll.studio.appbase.develop.APPExcetionMailSettingsActivity;
|
||||
import cc.winboll.studio.libappbase.LogActivity;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import cc.winboll.studio.libappbase.ToastUtils;
|
||||
@@ -45,6 +50,7 @@ public class MainActivity extends Activity {
|
||||
setActionBar(mToolbar); // 将 Toolbar 替代系统默认 ActionBar
|
||||
|
||||
initTestData();
|
||||
setupShortcuts();
|
||||
}
|
||||
|
||||
void initTestData() {
|
||||
@@ -60,6 +66,36 @@ public class MainActivity extends Activity {
|
||||
return "/BaseBaen/"+TestBean.class.getName()+".json";
|
||||
}
|
||||
|
||||
/**
|
||||
* 注册桌面图标静态快捷方式
|
||||
* 长按桌面图标后显示快捷菜单,点击可直接打开异常邮件接收设置页面
|
||||
*/
|
||||
private void setupShortcuts() {
|
||||
if (!"cc.winboll.studio.appbase.beta".equals(getPackageName())) {
|
||||
return;
|
||||
}
|
||||
|
||||
ShortcutManager shortcutManager = getSystemService(ShortcutManager.class);
|
||||
if (shortcutManager == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
Intent intent = new Intent(this, APPExcetionMailSettingsActivity.class);
|
||||
intent.setAction(Intent.ACTION_VIEW);
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
|
||||
ShortcutInfo shortcut = new ShortcutInfo.Builder(this, "exception_mail_settings")
|
||||
.setShortLabel("邮件设置")
|
||||
.setLongLabel("异常邮件接收设置")
|
||||
.setIcon(Icon.createWithResource(this, R.drawable.ic_winboll))
|
||||
.setIntent(intent)
|
||||
.build();
|
||||
|
||||
shortcutManager.setDynamicShortcuts(
|
||||
java.util.Arrays.asList(shortcut)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建菜单时回调(加载工具栏菜单)
|
||||
* 初始化 ActionBar 菜单,加载自定义菜单布局
|
||||
|
||||
+162
@@ -0,0 +1,162 @@
|
||||
package cc.winboll.studio.appbase.develop;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.EditText;
|
||||
import android.widget.Toast;
|
||||
import cc.winboll.studio.appbase.R;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import cc.winboll.studio.libappbase.utils.SMTPUtils;
|
||||
|
||||
/**
|
||||
* @Author 豆包&BigPickle&MiMo&ZhanGSKen<zhangsken@qq.com>
|
||||
* @Date 2026/07/21 12:44
|
||||
* @Describe 应用异常信息邮件接收账号设置
|
||||
* 配置SMTP服务器参数,用于通过邮件发送异常报告
|
||||
*/
|
||||
public class APPExcetionMailSettingsActivity extends Activity {
|
||||
|
||||
public static final String TAG = "APPExcetionMailSettingsActivity";
|
||||
|
||||
private static final String PREF_NAME = "smtp_config";
|
||||
private static final String KEY_SMTP_SERVER = "smtp_server";
|
||||
private static final String KEY_SMTP_PORT = "smtp_port";
|
||||
private static final String KEY_SENDER_EMAIL = "sender_email";
|
||||
private static final String KEY_AUTH_CODE = "auth_code";
|
||||
private static final String KEY_RECIPIENT_EMAIL = "recipient_email";
|
||||
|
||||
private EditText mEtSmtpServer;
|
||||
private EditText mEtSmtpPort;
|
||||
private EditText mEtSenderEmail;
|
||||
private EditText mEtAuthCode;
|
||||
private EditText mEtRecipientEmail;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_appexcetionmailsettings);
|
||||
|
||||
mEtSmtpServer = (EditText) findViewById(R.id.et_smtp_server);
|
||||
mEtSmtpPort = (EditText) findViewById(R.id.et_smtp_port);
|
||||
mEtSenderEmail = (EditText) findViewById(R.id.et_sender_email);
|
||||
mEtAuthCode = (EditText) findViewById(R.id.et_auth_code);
|
||||
mEtRecipientEmail = (EditText) findViewById(R.id.et_recipient_email);
|
||||
|
||||
loadConfig();
|
||||
|
||||
Button btnSave = (Button) findViewById(R.id.btn_save);
|
||||
btnSave.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
saveConfig();
|
||||
}
|
||||
});
|
||||
|
||||
Button btnTest = (Button) findViewById(R.id.btn_test);
|
||||
btnTest.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
testSendMail();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void loadConfig() {
|
||||
SharedPreferences sp = getSharedPreferences(PREF_NAME, MODE_PRIVATE);
|
||||
String server = sp.getString(KEY_SMTP_SERVER, "smtp.qq.com");
|
||||
String port = sp.getString(KEY_SMTP_PORT, "465");
|
||||
String sender = sp.getString(KEY_SENDER_EMAIL, "");
|
||||
String auth = sp.getString(KEY_AUTH_CODE, "");
|
||||
String recipient = sp.getString(KEY_RECIPIENT_EMAIL, "");
|
||||
|
||||
mEtSmtpServer.setText(server);
|
||||
mEtSmtpPort.setText(port);
|
||||
mEtSenderEmail.setText(sender);
|
||||
mEtAuthCode.setText(auth);
|
||||
mEtRecipientEmail.setText(recipient);
|
||||
}
|
||||
|
||||
private void saveConfig() {
|
||||
String server = mEtSmtpServer.getText().toString().trim();
|
||||
String port = mEtSmtpPort.getText().toString().trim();
|
||||
String sender = mEtSenderEmail.getText().toString().trim();
|
||||
String auth = mEtAuthCode.getText().toString().trim();
|
||||
String recipient = mEtRecipientEmail.getText().toString().trim();
|
||||
|
||||
SharedPreferences.Editor editor = getSharedPreferences(PREF_NAME, MODE_PRIVATE).edit();
|
||||
editor.putString(KEY_SMTP_SERVER, server);
|
||||
editor.putString(KEY_SMTP_PORT, port);
|
||||
editor.putString(KEY_SENDER_EMAIL, sender);
|
||||
editor.putString(KEY_AUTH_CODE, auth);
|
||||
editor.putString(KEY_RECIPIENT_EMAIL, recipient);
|
||||
editor.apply();
|
||||
|
||||
Toast.makeText(this, "设置已保存", Toast.LENGTH_SHORT).show();
|
||||
LogUtils.d(TAG, "saveConfig success, server=" + server + ", port=" + port + ", sender=" + sender);
|
||||
}
|
||||
|
||||
private void testSendMail() {
|
||||
String server = mEtSmtpServer.getText().toString().trim();
|
||||
String portStr = mEtSmtpPort.getText().toString().trim();
|
||||
String sender = mEtSenderEmail.getText().toString().trim();
|
||||
String auth = mEtAuthCode.getText().toString().trim();
|
||||
String recipient = mEtRecipientEmail.getText().toString().trim();
|
||||
|
||||
if (server.isEmpty()) {
|
||||
Toast.makeText(this, "请输入SMTP服务器地址", Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
if (portStr.isEmpty()) {
|
||||
Toast.makeText(this, "请输入SMTP端口", Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
if (sender.isEmpty()) {
|
||||
Toast.makeText(this, "请输入发件人邮箱", Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
if (auth.isEmpty()) {
|
||||
Toast.makeText(this, "请输入邮箱授权码", Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
if (recipient.isEmpty()) {
|
||||
Toast.makeText(this, "请输入收件人邮箱", Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
|
||||
Toast.makeText(this, "正在发送测试邮件...", Toast.LENGTH_SHORT).show();
|
||||
|
||||
final String finalRecipient = recipient;
|
||||
final String finalSender = sender;
|
||||
final String finalAuth = auth;
|
||||
|
||||
new Thread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
final boolean success = SMTPUtils.sendTextMail(
|
||||
finalRecipient,
|
||||
"APPBase 测试邮件",
|
||||
"这是一封来自APPBase的测试邮件。\n\n发送时间: " + System.currentTimeMillis(),
|
||||
finalSender,
|
||||
finalAuth);
|
||||
|
||||
new Handler(Looper.getMainLooper()).post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (success) {
|
||||
Toast.makeText(APPExcetionMailSettingsActivity.this,
|
||||
"测试邮件发送成功", Toast.LENGTH_SHORT).show();
|
||||
} else {
|
||||
Toast.makeText(APPExcetionMailSettingsActivity.this,
|
||||
"测试邮件发送失败,请检查设置", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}).start();
|
||||
}
|
||||
}
|
||||
@@ -12,6 +12,6 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Main2Activity"
|
||||
android:textSize="24sp"
|
||||
android:textColor="@color/gray_900"/>
|
||||
android:textColor="#212121"/>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,150 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ScrollView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="#FAFAFA"
|
||||
android:padding="16dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="SMTP 邮件发送设置"
|
||||
android:textSize="18sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="#333333"
|
||||
android:layout_marginBottom="16dp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="SMTP 服务器"
|
||||
android:textSize="13sp"
|
||||
android:textColor="#666666"
|
||||
android:layout_marginBottom="4dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_smtp_server"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textUri"
|
||||
android:hint="smtp.qq.com"
|
||||
android:textSize="15sp"
|
||||
android:textColor="#000000"
|
||||
android:textColorHint="#999999"
|
||||
android:background="#FFFFFF"
|
||||
android:padding="12dp"
|
||||
android:layout_marginBottom="12dp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="SMTP 端口"
|
||||
android:textSize="13sp"
|
||||
android:textColor="#666666"
|
||||
android:layout_marginBottom="4dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_smtp_port"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:hint="465"
|
||||
android:textSize="15sp"
|
||||
android:textColor="#000000"
|
||||
android:textColorHint="#999999"
|
||||
android:background="#FFFFFF"
|
||||
android:padding="12dp"
|
||||
android:layout_marginBottom="12dp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="发件人邮箱(QQ邮箱地址)"
|
||||
android:textSize="13sp"
|
||||
android:textColor="#666666"
|
||||
android:layout_marginBottom="4dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_sender_email"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textEmailAddress"
|
||||
android:hint="123456@qq.com"
|
||||
android:textSize="15sp"
|
||||
android:textColor="#000000"
|
||||
android:textColorHint="#999999"
|
||||
android:background="#FFFFFF"
|
||||
android:padding="12dp"
|
||||
android:layout_marginBottom="12dp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="邮箱授权码(非QQ密码,在QQ邮箱设置中获取)"
|
||||
android:textSize="13sp"
|
||||
android:textColor="#666666"
|
||||
android:layout_marginBottom="4dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_auth_code"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPassword"
|
||||
android:hint="请输入授权码"
|
||||
android:textSize="15sp"
|
||||
android:textColor="#000000"
|
||||
android:textColorHint="#999999"
|
||||
android:background="#FFFFFF"
|
||||
android:padding="12dp"
|
||||
android:layout_marginBottom="12dp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="收件人邮箱"
|
||||
android:textSize="13sp"
|
||||
android:textColor="#666666"
|
||||
android:layout_marginBottom="4dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_recipient_email"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textEmailAddress"
|
||||
android:hint="123456@qq.com"
|
||||
android:textSize="15sp"
|
||||
android:textColor="#000000"
|
||||
android:textColorHint="#999999"
|
||||
android:background="#FFFFFF"
|
||||
android:padding="12dp"
|
||||
android:layout_marginBottom="24dp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_save"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="保存设置"
|
||||
android:textSize="16sp"
|
||||
android:textColor="#FFFFFF"
|
||||
android:background="#007AFF"
|
||||
android:padding="14dp"
|
||||
android:layout_marginBottom="12dp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_test"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="发送测试邮件"
|
||||
android:textSize="16sp"
|
||||
android:textColor="#007AFF"
|
||||
android:background="#FFFFFF"
|
||||
android:padding="14dp"/>
|
||||
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
@@ -9,6 +9,6 @@
|
||||
<item name="colorTittleBackgound">?attr/toolbarBackgroundColor</item>
|
||||
<item name="colorText">?attr/debugTextColor</item>
|
||||
<item name="colorTextBackgound">?attr/mainWindowDarkBackgroundColor</item>
|
||||
<item name="toolbarTextColor">@color/toolbarTextColor</item>
|
||||
<item name="toolbarTextColor">#FF000000</item>
|
||||
</style>
|
||||
</resources>
|
||||
@@ -1,7 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="colorPrimary">#FF00B322</color>
|
||||
<color name="colorPrimaryDark">#FF005C12</color>
|
||||
<color name="colorAccent">#FF8DFFA2</color>
|
||||
<color name="colorText">#FFFFFB8D</color>
|
||||
</resources>
|
||||
@@ -9,6 +9,6 @@
|
||||
<item name="colorTittleBackgound">?attr/toolbarBackgroundColor</item>
|
||||
<item name="colorText">?attr/debugTextColor</item>
|
||||
<item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
|
||||
<item name="toolbarTextColor">@color/toolbarTextColor</item>
|
||||
<item name="toolbarTextColor">#FF000000</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
+5
-10
@@ -1,9 +1,6 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
buildscript {
|
||||
repositories {
|
||||
maven { url 'https://maven.aliyun.com/repository/public/' }
|
||||
maven { url 'https://maven.aliyun.com/repository/google/' }
|
||||
maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
|
||||
maven { url 'https://dl.bintray.com/ppartisan/maven/' }
|
||||
maven { url "https://clojars.org/repo/" }
|
||||
maven { url "https://jitpack.io" }
|
||||
@@ -17,9 +14,9 @@ buildscript {
|
||||
|
||||
// Nexus Maven 库地址
|
||||
// "WinBoLL Release"
|
||||
maven { url "https://nexus.winboll.cc/repository/maven-public/" }
|
||||
maven { url "https://nexus.zhangsken.cc/repository/maven-public/" }
|
||||
// "WinBoLL Snapshot"
|
||||
maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
|
||||
maven { url "https://nexus.zhangsken.cc/repository/maven-snapshots/" }
|
||||
}
|
||||
dependencies {
|
||||
// 适配MIUI12
|
||||
@@ -31,9 +28,6 @@ buildscript {
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
maven { url 'https://maven.aliyun.com/repository/public/' }
|
||||
maven { url 'https://maven.aliyun.com/repository/google/' }
|
||||
maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
|
||||
maven { url 'https://dl.bintray.com/ppartisan/maven/' }
|
||||
maven { url "https://clojars.org/repo/" }
|
||||
maven { url "https://jitpack.io" }
|
||||
@@ -47,9 +41,9 @@ allprojects {
|
||||
|
||||
// Nexus Maven 库地址
|
||||
// "WinBoLL Release"
|
||||
maven { url "https://nexus.winboll.cc/repository/maven-public/" }
|
||||
maven { url "https://nexus.zhangsken.cc/repository/maven-public/" }
|
||||
// "WinBoLL Snapshot"
|
||||
maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
|
||||
maven { url "https://nexus.zhangsken.cc/repository/maven-snapshots/" }
|
||||
}
|
||||
ext {
|
||||
// 定义全局变量,常用于版本管理
|
||||
@@ -95,6 +89,7 @@ allprojects {
|
||||
subprojects {
|
||||
tasks.withType(JavaCompile) {
|
||||
options.encoding = "UTF-8"
|
||||
options.compilerArgs << '-Xlint:-options'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,3 +19,4 @@ android.useAndroidX=false
|
||||
android.enableJetifier=false
|
||||
# 保持与旧版Gradle插件的兼容
|
||||
android.disableAutomaticComponentCreation=true
|
||||
#org.gradle.daemon=false
|
||||
|
||||
@@ -19,3 +19,4 @@ android.useAndroidX=false
|
||||
android.enableJetifier=false
|
||||
# 保持与旧版Gradle插件的兼容
|
||||
android.disableAutomaticComponentCreation=true
|
||||
org.gradle.daemon=false
|
||||
|
||||
@@ -19,3 +19,4 @@ android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
# 保持与旧版Gradle插件的兼容
|
||||
android.disableAutomaticComponentCreation=true
|
||||
org.gradle.daemon=false
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Wed Jun 03 20:17:02 HKT 2026
|
||||
stageCount=27
|
||||
#Tue Jul 21 14:10:49 HKT 2026
|
||||
stageCount=4
|
||||
libraryProject=libappbase
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.26
|
||||
baseVersion=15.21
|
||||
publishVersion=15.21.3
|
||||
buildCount=0
|
||||
baseBetaVersion=15.20.27
|
||||
baseBetaVersion=15.21.4
|
||||
|
||||
@@ -14,6 +14,7 @@ import android.widget.HorizontalScrollView;
|
||||
import android.widget.ScrollView;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
import cc.winboll.studio.libappbase.common.ViewColorTable;
|
||||
|
||||
public final class CrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
|
||||
private static final int MENUITEM_COPY = 0;
|
||||
@@ -35,13 +36,13 @@ public final class CrashActivity extends Activity implements MenuItem.OnMenuItem
|
||||
contentView.setFillViewport(true);
|
||||
|
||||
HorizontalScrollView hw = new HorizontalScrollView(this);
|
||||
hw.setBackgroundColor(0xFFF5F5F5);
|
||||
hw.setBackgroundColor(ViewColorTable.ListItemBgPressedColor);
|
||||
|
||||
TextView message = new TextView(this);
|
||||
final int padding = dp2px(16);
|
||||
message.setPadding(padding, padding, padding, padding);
|
||||
message.setText(mLog);
|
||||
message.setTextColor(0xFF000000);
|
||||
message.setTextColor(ViewColorTable.TextPrimaryColor);
|
||||
message.setTextIsSelectable(true);
|
||||
|
||||
hw.addView(message);
|
||||
|
||||
@@ -2,7 +2,6 @@ package cc.winboll.studio.libappbase;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.TypedArray;
|
||||
import android.graphics.Color;
|
||||
import android.text.SpannableString;
|
||||
import android.text.style.ForegroundColorSpan;
|
||||
import android.util.AttributeSet;
|
||||
@@ -12,6 +11,7 @@ import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toolbar;
|
||||
import cc.winboll.studio.libappbase.R;
|
||||
import cc.winboll.studio.libappbase.common.ViewColorTable;
|
||||
import android.content.res.Resources;
|
||||
|
||||
/**
|
||||
@@ -179,9 +179,9 @@ public class GlobalCrashReportView extends LinearLayout {
|
||||
// 设置默认配色(使用 debugTextColor 属性)
|
||||
Resources.Theme theme = mContext.getTheme();
|
||||
mTitleColor = theme.getResources().getColor(android.R.color.holo_green_dark);
|
||||
mTitleBackgroundColor = Color.GRAY;
|
||||
mTitleBackgroundColor = ViewColorTable.SwitchTrackNormalColor;
|
||||
mTextColor = obtainDebugTextColor(theme);
|
||||
mTextBackgroundColor = Color.WHITE;
|
||||
mTextBackgroundColor = ViewColorTable.CardSurfaceColor;
|
||||
// 加载布局
|
||||
inflateView();
|
||||
// 初始化控件样式
|
||||
@@ -196,11 +196,11 @@ public class GlobalCrashReportView extends LinearLayout {
|
||||
if (themeResId != 0) {
|
||||
int[] debugAttrs = new int[] { cc.winboll.studio.libappbase.R.attr.debugTextColor };
|
||||
TypedArray debugTypedArray = theme.obtainStyledAttributes(themeResId, debugAttrs);
|
||||
int color = debugTypedArray.getColor(0, Color.GRAY);
|
||||
int color = debugTypedArray.getColor(0, ViewColorTable.TextSecondaryColor);
|
||||
debugTypedArray.recycle();
|
||||
return color;
|
||||
}
|
||||
return Color.GRAY;
|
||||
return ViewColorTable.TextSecondaryColor;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -219,16 +219,16 @@ public class GlobalCrashReportView extends LinearLayout {
|
||||
// 读取自定义属性值(无设置时使用默认值)
|
||||
mTitleColor = typedArray.getColor(
|
||||
R.styleable.GlobalCrashActivity_colorTittle,
|
||||
Color.BLACK
|
||||
ViewColorTable.TextPrimaryColor
|
||||
);
|
||||
mTitleBackgroundColor = typedArray.getColor(
|
||||
R.styleable.GlobalCrashActivity_colorTittleBackgound, // 注:原拼写错误(Backgound→Background),保持与 attrs.xml 一致
|
||||
Color.BLACK
|
||||
ViewColorTable.TextPrimaryColor
|
||||
);
|
||||
mTextColor = obtainDebugTextColor(mContext.getTheme());
|
||||
mTextBackgroundColor = typedArray.getColor(
|
||||
R.styleable.GlobalCrashActivity_colorTextBackgound, // 注:原拼写错误,保持与 attrs.xml 一致
|
||||
Color.WHITE
|
||||
ViewColorTable.CardSurfaceColor
|
||||
);
|
||||
|
||||
// 回收 TypedArray,避免内存泄漏
|
||||
|
||||
@@ -28,6 +28,7 @@ import android.widget.ScrollView;
|
||||
import android.widget.TextView;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import cc.winboll.studio.libappbase.R;
|
||||
import cc.winboll.studio.libappbase.common.ViewColorTable;
|
||||
import cc.winboll.studio.libappbase.views.HorizontalListView;
|
||||
import cc.winboll.studio.libappbase.widget.LogTagSpinner;
|
||||
import java.text.Collator;
|
||||
@@ -117,7 +118,7 @@ public class LogView extends RelativeLayout {
|
||||
// 获取Log Level spinner实例
|
||||
mLogLevelSpinner = findViewById(cc.winboll.studio.libappbase.R.id.viewlogSpinner1);
|
||||
|
||||
metTagSearch.setTextColor(mContext.getResources().getColor(R.color.white));
|
||||
metTagSearch.setTextColor(ViewColorTable.EditTextContentColor);
|
||||
metTagSearch.addTextChangedListener(new TextWatcher() {
|
||||
|
||||
@Override
|
||||
@@ -250,7 +251,7 @@ public class LogView extends RelativeLayout {
|
||||
mSelectAllTAGCheckBox.setLayoutParams(layoutParams2);
|
||||
//mSelectAllTAGCheckBox.setPadding(0,0,0,0);
|
||||
TypedArray ta1 = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor });
|
||||
int toolbarTextColor1 = ta1.getColor(0, mContext.getResources().getColor(R.color.white));
|
||||
int toolbarTextColor1 = ta1.getColor(0, ViewColorTable.ToolbarTitleTextColor);
|
||||
ta1.recycle();
|
||||
mSelectAllTAGCheckBox.setTextColor(toolbarTextColor1);
|
||||
mSelectAllTAGCheckBox.setOnClickListener(new View.OnClickListener(){
|
||||
@@ -507,14 +508,14 @@ public class LogView extends RelativeLayout {
|
||||
holder.tvText.setLayoutParams(layoutParams);
|
||||
holder.tvText.setPadding(0,0,0,0);
|
||||
TypedArray ta2 = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor });
|
||||
int toolbarTextColor2 = ta2.getColor(0, mContext.getResources().getColor(R.color.white));
|
||||
int toolbarTextColor2 = ta2.getColor(0, ViewColorTable.ToolbarTitleTextColor);
|
||||
ta2.recycle();
|
||||
holder.tvText.setTextColor(toolbarTextColor2);
|
||||
holder.cbChecked.setChecked(item.isChecked());
|
||||
holder.cbChecked.setLayoutParams(layoutParams);
|
||||
holder.cbChecked.setPadding(0,0,0,0);
|
||||
TypedArray ta3 = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor });
|
||||
int toolbarTextColor3 = ta3.getColor(0, mContext.getResources().getColor(R.color.white));
|
||||
int toolbarTextColor3 = ta3.getColor(0, ViewColorTable.ToolbarTitleTextColor);
|
||||
ta3.recycle();
|
||||
holder.cbChecked.setTextColor(toolbarTextColor3);
|
||||
holder.cbChecked.setOnClickListener(new View.OnClickListener(){
|
||||
|
||||
@@ -0,0 +1,202 @@
|
||||
package cc.winboll.studio.libappbase.common;
|
||||
|
||||
import android.graphics.Color;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
|
||||
/**
|
||||
* @Author 豆包&Big Pickle&MiMo&ZhanGSKen<zhangsken@qq.com>
|
||||
* @CreateDate 2026/07/21 11:55:00
|
||||
* @LastEditDate 2026/07/21 11:56:46
|
||||
* @Describe 全局静态控件颜色常量表
|
||||
* 命名规范:控件类型+状态/用途+Color
|
||||
* 全部常量基于android.graphics.Color原生色值定义,统一控件前缀命名规则,无实例化入口,纯静态常量工具类
|
||||
* Java7兼容标准,无高版本语法特性,所有函数入参、内部临时变量强制final修饰
|
||||
*/
|
||||
public final class ViewColorTable {
|
||||
|
||||
// 私有构造,禁止外部实例化
|
||||
private ViewColorTable() {
|
||||
final String errMsg = "Cannot instantiate static class ViewColorTable";
|
||||
LogUtils.e("ViewColorTable", "constructor invoke failed, msg = " + errMsg);
|
||||
throw new AssertionError(errMsg);
|
||||
}
|
||||
|
||||
// ====================== TextView 文本控件颜色常量 ======================
|
||||
// 主文本
|
||||
public static final int TextPrimaryColor = Color.BLACK;
|
||||
// 次要说明文本
|
||||
public static final int TextSecondaryColor = Color.GRAY;
|
||||
// 提示占位文字
|
||||
public static final int TextHintColor = Color.LTGRAY;
|
||||
// 错误警告文本
|
||||
public static final int TextErrorColor = Color.RED;
|
||||
// 链接可点击文本
|
||||
public static final int TextLinkColor = Color.parseColor("#007AFF");
|
||||
// 禁用置灰文本
|
||||
public static final int TextDisabledColor = Color.DKGRAY;
|
||||
// 标题大号文本
|
||||
public static final int TextTitleColor = Color.BLACK;
|
||||
// 白色背景下浅色标题
|
||||
public static final int TextTitleLightColor = Color.WHITE;
|
||||
|
||||
// ====================== Button 普通按钮颜色常量 ======================
|
||||
// 按钮正常文字
|
||||
public static final int ButtonTextNormalColor = Color.WHITE;
|
||||
// 按钮按下文字
|
||||
public static final int ButtonTextPressedColor = Color.LTGRAY;
|
||||
// 按钮禁用文字
|
||||
public static final int ButtonTextDisabledColor = Color.GRAY;
|
||||
// 边框按钮文字(空心按钮)
|
||||
public static final int ButtonStrokeTextColor = Color.parseColor("#007AFF");
|
||||
|
||||
// ====================== Switch 原生开关控件颜色常量 ======================
|
||||
// 开关滑块文字
|
||||
public static final int SwitchTextColor = Color.WHITE;
|
||||
// 开关轨道 关闭状态
|
||||
public static final int SwitchTrackNormalColor = Color.GRAY;
|
||||
// 开关轨道 开启状态
|
||||
public static final int SwitchTrackCheckedColor = Color.parseColor("#34C759");
|
||||
// 开关滑块
|
||||
public static final int SwitchThumbColor = Color.WHITE;
|
||||
|
||||
// ====================== EditText 输入框颜色常量 ======================
|
||||
// 输入正文文字
|
||||
public static final int EditTextContentColor = Color.BLACK;
|
||||
// 输入框提示文字
|
||||
public static final int EditTextHintColor = Color.GRAY;
|
||||
// 输入框光标
|
||||
public static final int EditTextCursorColor = Color.parseColor("#007AFF");
|
||||
// 输入框底部线 正常
|
||||
public static final int EditTextLineNormalColor = Color.LTGRAY;
|
||||
// 输入框底部线 聚焦
|
||||
public static final int EditTextLineFocusedColor = Color.parseColor("#007AFF");
|
||||
// 输入框底部线 错误
|
||||
public static final int EditTextLineErrorColor = Color.RED;
|
||||
|
||||
// ====================== CheckBox 多选框颜色常量 ======================
|
||||
// 多选框文字
|
||||
public static final int CheckBoxTextColor = Color.BLACK;
|
||||
// 多选框勾选状态
|
||||
public static final int CheckBoxCheckedColor = Color.parseColor("#007AFF");
|
||||
// 多选框未勾选边框
|
||||
public static final int CheckBoxUnCheckStrokeColor = Color.GRAY;
|
||||
|
||||
// ====================== RadioButton 单选框颜色常量 ======================
|
||||
public static final int RadioTextColor = Color.BLACK;
|
||||
public static final int RadioCheckedCircleColor = Color.parseColor("#007AFF");
|
||||
public static final int RadioUnCheckedStrokeColor = Color.GRAY;
|
||||
|
||||
// ====================== ProgressBar 进度条颜色常量 ======================
|
||||
// 进度底色
|
||||
public static final int ProgressTrackColor = Color.LTGRAY;
|
||||
// 已完成进度
|
||||
public static final int ProgressValueColor = Color.parseColor("#34C759");
|
||||
// 缓冲进度(视频/文件下载)
|
||||
public static final int ProgressBufferColor = Color.GRAY;
|
||||
|
||||
// ====================== SeekBar 拖动条颜色常量 ======================
|
||||
public static final int SeekBarTrackNormalColor = Color.LTGRAY;
|
||||
public static final int SeekBarTrackProgressColor = Color.parseColor("#007AFF");
|
||||
public static final int SeekBarThumbColor = Color.parseColor("#007AFF");
|
||||
|
||||
// ====================== TabLayout 标签栏颜色常量 ======================
|
||||
// Tab未选中文字
|
||||
public static final int TabTextNormalColor = Color.GRAY;
|
||||
// Tab选中文字
|
||||
public static final int TabTextSelectedColor = Color.parseColor("#007AFF");
|
||||
// Tab底部指示器
|
||||
public static final int TabIndicatorColor = Color.parseColor("#007AFF");
|
||||
|
||||
// ====================== Divider 分割线颜色常量 ======================
|
||||
public static final int DividerLineColor = Color.parseColor("#EEEEEE");
|
||||
public static final int DividerDarkLineColor = Color.parseColor("#DDDDDD");
|
||||
|
||||
// ====================== CardView 卡片颜色常量 ======================
|
||||
// 卡片背景
|
||||
public static final int CardSurfaceColor = Color.WHITE;
|
||||
// 卡片边框
|
||||
public static final int CardStrokeColor = Color.parseColor("#EEEEEE");
|
||||
|
||||
// ====================== Dialog / Popup 弹窗颜色常量 ======================
|
||||
// 弹窗标题文字
|
||||
public static final int DialogTitleTextColor = Color.BLACK;
|
||||
// 弹窗内容文字
|
||||
public static final int DialogContentTextColor = Color.GRAY;
|
||||
// 弹窗取消按钮文字
|
||||
public static final int DialogCancelTextColor = Color.GRAY;
|
||||
// 弹窗确认按钮文字
|
||||
public static final int DialogConfirmTextColor = Color.parseColor("#007AFF");
|
||||
// 弹窗遮罩背景
|
||||
public static final int DialogMaskBgColor = 0xCC000000;
|
||||
|
||||
// ====================== Toolbar / TopBar 顶部栏颜色常量 ======================
|
||||
public static final int ToolbarTitleTextColor = Color.WHITE;
|
||||
public static final int ToolbarSubTitleTextColor = Color.LTGRAY;
|
||||
public static final int ToolbarIconTintColor = Color.WHITE;
|
||||
|
||||
// ====================== StatusBar / NavigationBar 系统栏颜色常量 ======================
|
||||
// 浅色状态栏(黑文字)
|
||||
public static final int StatusBarLightBgColor = Color.WHITE;
|
||||
// 深色状态栏(白文字)
|
||||
public static final int StatusBarDarkBgColor = Color.parseColor("#212121");
|
||||
public static final int NavBarBgLightColor = Color.WHITE;
|
||||
public static final int NavBarBgDarkColor = Color.parseColor("#212121");
|
||||
|
||||
// ====================== SwitchCompat AppCompat兼容开关颜色常量 ======================
|
||||
public static final int SwitchCompatTrackOffColor = Color.GRAY;
|
||||
public static final int SwitchCompatTrackOnColor = Color.parseColor("#34C759");
|
||||
public static final int SwitchCompatThumbNormalColor = Color.WHITE;
|
||||
|
||||
// ====================== Chip 标签气泡控件颜色常量 ======================
|
||||
public static final int ChipTextNormalColor = Color.parseColor("#007AFF");
|
||||
public static final int ChipBgNormalColor = Color.parseColor("#E6F0FF");
|
||||
public static final int ChipCloseIconTintColor = Color.GRAY;
|
||||
|
||||
// ====================== FloatingActionButton 悬浮按钮颜色常量 ======================
|
||||
public static final int FabIconTintColor = Color.WHITE;
|
||||
public static final int FabBgNormalColor = Color.parseColor("#007AFF");
|
||||
public static final int FabBgPressedColor = Color.parseColor("#005CC8");
|
||||
|
||||
// ====================== RadioGroup/CheckBoxGroup 选择组颜色常量 ======================
|
||||
public static final int GroupLabelTextColor = Color.BLACK;
|
||||
|
||||
// ====================== RecyclerView 列表颜色常量 ======================
|
||||
// 列表条目背景
|
||||
public static final int ListItemBgNormalColor = Color.WHITE;
|
||||
// 列表条目按压背景
|
||||
public static final int ListItemBgPressedColor = Color.parseColor("#F5F5F5");
|
||||
// 列表条目禁用背景
|
||||
public static final int ListItemBgDisabledColor = Color.parseColor("#FAFAFA");
|
||||
|
||||
// ====================== Badge 角标红点颜色常量 ======================
|
||||
public static final int BadgeDotBgColor = Color.RED;
|
||||
public static final int BadgeTextColor = Color.WHITE;
|
||||
|
||||
// ====================== 静态工具函数区域 ======================
|
||||
/**
|
||||
* 调试打印指定颜色常量十六进制字符串
|
||||
* @param color 目标颜色值,强制final
|
||||
* @param tag 颜色标识标签,强制final
|
||||
* @return 格式化十六进制颜色字符串
|
||||
*/
|
||||
public static String getColorHex(final int color, final String tag) {
|
||||
LogUtils.d("ViewColorTable", "getColorHex invoke, tag = " + tag + ", rawColorInt = " + color);
|
||||
final String hexStr = String.format("#%06X", 0xFFFFFF & color);
|
||||
LogUtils.d("ViewColorTable", "getColorHex result hex = " + hexStr);
|
||||
return hexStr;
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验颜色值是否为透明色
|
||||
* @param color 待校验颜色值,强制final
|
||||
* @return true=完全透明,false=非透明
|
||||
*/
|
||||
public static boolean isColorTransparent(final int color) {
|
||||
LogUtils.d("ViewColorTable", "isColorTransparent invoke, checkColor = " + color);
|
||||
final int alpha = Color.alpha(color);
|
||||
final boolean result = alpha == 0;
|
||||
LogUtils.d("ViewColorTable", "isColorTransparent alpha = " + alpha + ", result = " + result);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,274 @@
|
||||
package cc.winboll.studio.libappbase.utils;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.OutputStream;
|
||||
import java.net.Socket;
|
||||
import javax.net.ssl.SSLSocketFactory;
|
||||
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
|
||||
/**
|
||||
* @Author 豆包&BigPickle&MiMo&ZhanGSKen<zhangsken@qq.com>
|
||||
* @CreateDate 2026/07/21
|
||||
* @LastEditDate 2026/07/21
|
||||
* @Describe SMTP邮件发送工具类(原生Socket实现,零外部依赖)
|
||||
* 基于QQ SMTP服务(smtp.qq.com:465 SSL),支持纯文本和HTML邮件
|
||||
* Java7兼容标准,无高版本语法特性
|
||||
*/
|
||||
public final class SMTPUtils {
|
||||
|
||||
private static final String TAG = "SMTPUtils";
|
||||
|
||||
// QQ SMTP 服务器地址
|
||||
private static final String DEFAULT_SMTP_HOST = "smtp.qq.com";
|
||||
// QQ SMTP SSL 端口
|
||||
private static final int DEFAULT_SMTP_PORT = 465;
|
||||
|
||||
// 私有构造,禁止实例化
|
||||
private SMTPUtils() {
|
||||
final String errMsg = "Cannot instantiate static class SMTPUtils";
|
||||
LogUtils.e(TAG, "constructor invoke failed, msg = " + errMsg);
|
||||
throw new AssertionError(errMsg);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送纯文本邮件(QQ SMTP SSL)
|
||||
* @param to收件人邮箱地址
|
||||
* @param subject 邮件主题
|
||||
* @param body 邮件正文(纯文本)
|
||||
* @param from 发件人QQ邮箱地址
|
||||
* @param authCode QQ邮箱授权码(非QQ密码)
|
||||
* @return true=发送成功,false=发送失败
|
||||
*/
|
||||
public static boolean sendTextMail(
|
||||
final String to,
|
||||
final String subject,
|
||||
final String body,
|
||||
final String from,
|
||||
final String authCode) {
|
||||
return sendMail(to, subject, body, from, authCode, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送HTML邮件(QQ SMTP SSL)
|
||||
* @param to 收件人邮箱地址
|
||||
* @param subject 邮件主题
|
||||
* @param body 邮件正文(HTML格式)
|
||||
* @param from 发件人QQ邮箱地址
|
||||
* @param authCode QQ邮箱授权码(非QQ密码)
|
||||
* @return true=发送成功,false=发送失败
|
||||
*/
|
||||
public static boolean sendHtmlMail(
|
||||
final String to,
|
||||
final String subject,
|
||||
final String body,
|
||||
final String from,
|
||||
final String authCode) {
|
||||
return sendMail(to, subject, body, from, authCode, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送邮件核心方法(QQ SMTP SSL)
|
||||
* @param to 收件人邮箱地址
|
||||
* @param subject 邮件主题
|
||||
* @param body 邮件正文
|
||||
* @param from 发件人QQ邮箱地址
|
||||
* @param authCode QQ邮箱授权码
|
||||
* @param isHtml 是否HTML格式
|
||||
* @return true=发送成功,false=发送失败
|
||||
*/
|
||||
private static boolean sendMail(
|
||||
final String to,
|
||||
final String subject,
|
||||
final String body,
|
||||
final String from,
|
||||
final String authCode,
|
||||
final boolean isHtml) {
|
||||
|
||||
LogUtils.d(TAG, "sendMail invoke, to=" + to + ", subject=" + subject + ", isHtml=" + isHtml);
|
||||
|
||||
// 参数校验
|
||||
if (to == null || to.isEmpty()) {
|
||||
LogUtils.e(TAG, "sendMail failed, reason: recipient address is empty");
|
||||
return false;
|
||||
}
|
||||
if (from == null || from.isEmpty()) {
|
||||
LogUtils.e(TAG, "sendMail failed, reason: sender address is empty");
|
||||
return false;
|
||||
}
|
||||
if (authCode == null || authCode.isEmpty()) {
|
||||
LogUtils.e(TAG, "sendMail failed, reason: auth code is empty");
|
||||
return false;
|
||||
}
|
||||
|
||||
Socket socket = null;
|
||||
BufferedReader reader = null;
|
||||
OutputStream output = null;
|
||||
|
||||
try {
|
||||
// 1. 创建SSL连接
|
||||
LogUtils.d(TAG, " connecting to " + DEFAULT_SMTP_HOST + ":" + DEFAULT_SMTP_PORT);
|
||||
SSLSocketFactory factory = (SSLSocketFactory) SSLSocketFactory.getDefault();
|
||||
socket = factory.createSocket(DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT);
|
||||
socket.setSoTimeout(10000);
|
||||
|
||||
reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), "UTF-8"));
|
||||
output = socket.getOutputStream();
|
||||
|
||||
// 2. 读取服务器欢迎信息
|
||||
String response = readResponse(reader);
|
||||
LogUtils.d(TAG, "S: " + response);
|
||||
if (!response.startsWith("220")) {
|
||||
LogUtils.e(TAG, "sendMail failed, SMTP server greeting error: " + response);
|
||||
return false;
|
||||
}
|
||||
|
||||
// 3. EHLO 握手
|
||||
sendCommand(output, "EHLO localhost", reader);
|
||||
|
||||
// 4. AUTH LOGIN
|
||||
sendCommand(output, "AUTH LOGIN", reader);
|
||||
|
||||
// 5. 发送Base64编码的用户名(发件人邮箱)
|
||||
sendCommand(output, base64Encode(from), reader);
|
||||
|
||||
// 6. 发送Base64编码的授权码
|
||||
sendCommand(output, base64Encode(authCode), reader);
|
||||
|
||||
// 7. 设置发件人
|
||||
sendCommand(output, "MAIL FROM:<" + from + ">", reader);
|
||||
|
||||
// 8. 设置收件人
|
||||
sendCommand(output, "RCPT TO:<" + to + ">", reader);
|
||||
|
||||
// 9. 开始数据传输
|
||||
sendCommand(output, "DATA", reader);
|
||||
|
||||
// 10. 构建邮件内容
|
||||
String contentType = isHtml ? "text/html; charset=UTF-8" : "text/plain; charset=UTF-8";
|
||||
StringBuilder mailContent = new StringBuilder();
|
||||
mailContent.append("From: ").append(from).append("\r\n");
|
||||
mailContent.append("To: ").append(to).append("\r\n");
|
||||
mailContent.append("Subject: ").append(subject).append("\r\n");
|
||||
mailContent.append("Content-Type: ").append(contentType).append("\r\n");
|
||||
mailContent.append("\r\n");
|
||||
mailContent.append(body).append("\r\n");
|
||||
mailContent.append(".\r\n");
|
||||
|
||||
// 11. 发送邮件内容
|
||||
output.write(mailContent.toString().getBytes("UTF-8"));
|
||||
output.flush();
|
||||
response = readResponse(reader);
|
||||
LogUtils.d(TAG, "S: " + response);
|
||||
|
||||
// 12. QUIT 退出
|
||||
sendCommand(output, "QUIT", reader);
|
||||
|
||||
LogUtils.d(TAG, "sendMail success, to=" + to + ", subject=" + subject);
|
||||
return true;
|
||||
|
||||
} catch (Exception e) {
|
||||
LogUtils.e(TAG, "sendMail exception: " + e.getMessage(), e);
|
||||
return false;
|
||||
} finally {
|
||||
// 关闭资源
|
||||
try {
|
||||
if (output != null) output.close();
|
||||
} catch (Exception e) {
|
||||
LogUtils.e(TAG, "close output exception: " + e.getMessage());
|
||||
}
|
||||
try {
|
||||
if (reader != null) reader.close();
|
||||
} catch (Exception e) {
|
||||
LogUtils.e(TAG, "close reader exception: " + e.getMessage());
|
||||
}
|
||||
try {
|
||||
if (socket != null) socket.close();
|
||||
} catch (Exception e) {
|
||||
LogUtils.e(TAG, "close socket exception: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送SMTP命令并读取多行响应
|
||||
* @param output 输出流
|
||||
* @param command SMTP命令
|
||||
* @param reader 输入流
|
||||
* @return 服务器响应字符串
|
||||
*/
|
||||
private static String sendCommand(
|
||||
final OutputStream output,
|
||||
final String command,
|
||||
final BufferedReader reader) throws Exception {
|
||||
|
||||
LogUtils.d(TAG, "C: " + command);
|
||||
output.write((command + "\r\n").getBytes("UTF-8"));
|
||||
output.flush();
|
||||
return readResponse(reader);
|
||||
}
|
||||
|
||||
/**
|
||||
* 读取SMTP服务器多行响应
|
||||
* SMTP协议:以"数字 "开头表示最后一行,以"数字-"开头表示后续还有行
|
||||
* @param reader 输入流
|
||||
* @return 完整的服务器响应字符串
|
||||
*/
|
||||
private static String readResponse(final BufferedReader reader) throws Exception {
|
||||
StringBuilder response = new StringBuilder();
|
||||
String line;
|
||||
while ((line = reader.readLine()) != null) {
|
||||
response.append(line).append("\n");
|
||||
// 最后一行:第4位是空格(如 "250 OK")
|
||||
if (line.length() >= 4 && line.charAt(3) == ' ') {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return response.toString().trim();
|
||||
}
|
||||
|
||||
/**
|
||||
* 标准Base64编码(Java7兼容,无第三方依赖)
|
||||
* @param input 待编码字符串
|
||||
* @return Base64编码后的字符串
|
||||
*/
|
||||
static String base64Encode(final String input) {
|
||||
if (input == null || input.isEmpty()) {
|
||||
return "";
|
||||
}
|
||||
try {
|
||||
byte[] data = input.getBytes("UTF-8");
|
||||
final String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
StringBuilder result = new StringBuilder();
|
||||
int i;
|
||||
// 每3字节一组处理
|
||||
for (i = 0; i + 2 < data.length; i += 3) {
|
||||
int triple = ((data[i] & 0xFF) << 16)
|
||||
| ((data[i + 1] & 0xFF) << 8)
|
||||
| (data[i + 2] & 0xFF);
|
||||
result.append(alphabet.charAt((triple >> 18) & 0x3F));
|
||||
result.append(alphabet.charAt((triple >> 12) & 0x3F));
|
||||
result.append(alphabet.charAt((triple >> 6) & 0x3F));
|
||||
result.append(alphabet.charAt(triple & 0x3F));
|
||||
}
|
||||
// 处理剩余字节
|
||||
if (i < data.length) {
|
||||
int remaining = data[i] & 0xFF;
|
||||
result.append(alphabet.charAt((remaining >> 2) & 0x3F));
|
||||
if (i + 1 < data.length) {
|
||||
remaining = ((remaining << 8) | (data[i + 1] & 0xFF));
|
||||
result.append(alphabet.charAt((remaining >> 4) & 0x3F));
|
||||
result.append(alphabet.charAt((remaining << 2) & 0x3F));
|
||||
} else {
|
||||
result.append(alphabet.charAt((remaining << 4) & 0x3F));
|
||||
result.append('=');
|
||||
}
|
||||
}
|
||||
return result.toString();
|
||||
} catch (Exception e) {
|
||||
LogUtils.e(TAG, "base64Encode exception: " + e.getMessage(), e);
|
||||
return "";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,7 @@ 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.common.ViewColorTable;
|
||||
import cc.winboll.studio.libappbase.dialogs.DebugHostDialog;
|
||||
import cc.winboll.studio.libappbase.models.APPInfo;
|
||||
|
||||
@@ -465,10 +466,10 @@ public class AboutView extends LinearLayout {
|
||||
*/
|
||||
private android.graphics.drawable.Drawable create_item_background() {
|
||||
android.graphics.drawable.GradientDrawable drawable = new android.graphics.drawable.GradientDrawable();
|
||||
drawable.setStroke(1, mItemContext.getResources().getColor(R.color.gray_300));
|
||||
drawable.setStroke(1, ViewColorTable.DividerDarkLineColor);
|
||||
drawable.setCornerRadius(4);
|
||||
boolean isNightMode = (mItemContext.getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
|
||||
drawable.setColor(isNightMode ? mItemContext.getResources().getColor(R.color.gray_800) : mItemContext.getResources().getColor(android.R.color.white));
|
||||
drawable.setColor(isNightMode ? ViewColorTable.StatusBarDarkBgColor : ViewColorTable.CardSurfaceColor);
|
||||
return drawable;
|
||||
}
|
||||
|
||||
@@ -495,7 +496,7 @@ public class AboutView extends LinearLayout {
|
||||
tvTitle.setText(mTitle);
|
||||
tvTitle.setTextSize(16);
|
||||
boolean isNightMode = (mItemContext.getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
|
||||
tvTitle.setTextColor(isNightMode ? mItemContext.getResources().getColor(R.color.gray_500) : mItemContext.getResources().getColor(R.color.gray_900));
|
||||
tvTitle.setTextColor(isNightMode ? ViewColorTable.TextDisabledColor : ViewColorTable.TextPrimaryColor);
|
||||
llText.addView(tvTitle);
|
||||
// 内容
|
||||
TextView tvContent = new TextView(mItemContext);
|
||||
@@ -524,7 +525,7 @@ public class AboutView extends LinearLayout {
|
||||
|
||||
@Override
|
||||
protected int getContentTextColor() {
|
||||
return mItemContext.getResources().getColor(R.color.blue_normal);
|
||||
return ViewColorTable.TextLinkColor;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -567,7 +568,7 @@ public class AboutView extends LinearLayout {
|
||||
|
||||
@Override
|
||||
protected int getContentTextColor() {
|
||||
return mItemContext.getResources().getColor(R.color.blue_normal);
|
||||
return ViewColorTable.TextLinkColor;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+22
-1
@@ -9,6 +9,8 @@ import android.content.SharedPreferences;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.Toast;
|
||||
import java.util.HashMap;
|
||||
import java.util.UUID;
|
||||
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||
|
||||
@@ -24,12 +26,26 @@ public class DebugSwitchInfoImageView extends ImageView {
|
||||
// 连续点击计数
|
||||
private int mClickCount = 0;
|
||||
// 目标点击次数
|
||||
private static final int TARGET_CLICK_COUNT = 7;
|
||||
private static final int TARGET_CLICK_COUNT = 10;
|
||||
|
||||
private static String mDebugToken = null;
|
||||
private static final String SP_DEBUG_TOKEN = "debug_token_prefs";
|
||||
private static final String KEY_DEBUG_TOKEN = "debug_token";
|
||||
|
||||
private static final HashMap<Integer, String> NUMBER_WORDS = new HashMap<Integer, String>();
|
||||
static {
|
||||
NUMBER_WORDS.put(1, "one");
|
||||
NUMBER_WORDS.put(2, "two");
|
||||
NUMBER_WORDS.put(3, "three");
|
||||
NUMBER_WORDS.put(4, "four");
|
||||
NUMBER_WORDS.put(5, "five");
|
||||
NUMBER_WORDS.put(6, "six");
|
||||
NUMBER_WORDS.put(7, "seven");
|
||||
NUMBER_WORDS.put(8, "eight");
|
||||
NUMBER_WORDS.put(9, "nine");
|
||||
NUMBER_WORDS.put(10, "ten");
|
||||
}
|
||||
|
||||
public static String getDebugToken() {
|
||||
if (mDebugToken != null) {
|
||||
return mDebugToken;
|
||||
@@ -116,6 +132,11 @@ public class DebugSwitchInfoImageView extends ImageView {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
mClickCount++;
|
||||
String word = NUMBER_WORDS.get(mClickCount);
|
||||
if (word == null) {
|
||||
word = "One Piece!";
|
||||
}
|
||||
Toast.makeText(getContext(), word, Toast.LENGTH_SHORT).show();
|
||||
if (mClickCount >= TARGET_CLICK_COUNT) {
|
||||
mClickCount = 0;
|
||||
showDebugTokenDialog();
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package cc.winboll.studio.libappbase.widget;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Color;
|
||||
import android.text.TextUtils;
|
||||
import android.content.res.TypedArray;
|
||||
import android.util.AttributeSet;
|
||||
@@ -13,6 +12,7 @@ import android.widget.Spinner;
|
||||
import android.widget.TextView;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import cc.winboll.studio.libappbase.R;
|
||||
import cc.winboll.studio.libappbase.common.ViewColorTable;
|
||||
|
||||
/**
|
||||
* @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
|
||||
@@ -105,7 +105,7 @@ public class LogTagSpinner extends Spinner {
|
||||
setLayoutParams(layoutParams);
|
||||
|
||||
// 统一背景色(外部可通过 setBackground 手动覆盖)
|
||||
setBackgroundColor(this.mContext.getColor(R.color.btn_gray_normal));
|
||||
setBackgroundColor(ViewColorTable.SwitchTrackNormalColor);
|
||||
}
|
||||
|
||||
|
||||
@@ -156,10 +156,10 @@ public class LogTagSpinner extends Spinner {
|
||||
//itemTv.setGravity(View.GRAVITY_CENTER_VERTICAL | View.GRAVITY_START);
|
||||
// 5. 文字颜色(使用主题属性 ?attr/toolbarTextColor)
|
||||
TypedArray ta = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor });
|
||||
int toolbarTextColor = ta.getColor(0, mContext.getResources().getColor(R.color.white));
|
||||
int toolbarTextColor = ta.getColor(0, ViewColorTable.ToolbarTitleTextColor);
|
||||
ta.recycle();
|
||||
itemTv.setTextColor(toolbarTextColor);
|
||||
itemTv.setBackgroundColor(this.mContext.getResources().getColor(R.color.btn_gray_normal));
|
||||
itemTv.setBackgroundColor(ViewColorTable.SwitchTrackNormalColor);
|
||||
// 6. 文字溢出处理(最多 2 行,超出省略,避免长标签换行过多)
|
||||
itemTv.setSingleLine(false);
|
||||
itemTv.setMaxLines(2);
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
<shape android:shape="rectangle" >
|
||||
<gradient
|
||||
android:angle="270"
|
||||
android:endColor="@color/colorPrimary"
|
||||
android:startColor="@color/colorPrimary" />
|
||||
android:endColor="#FF00B322"
|
||||
android:startColor="#FF00B322" />
|
||||
<corners
|
||||
android:bottomLeftRadius="6dip"
|
||||
android:bottomRightRadius="6dip"
|
||||
@@ -29,8 +29,8 @@
|
||||
<shape android:shape="rectangle" >
|
||||
<gradient
|
||||
android:angle="270"
|
||||
android:endColor="@color/colorPrimary"
|
||||
android:startColor="@color/colorPrimary" />
|
||||
android:endColor="#FF00B322"
|
||||
android:startColor="#FF00B322" />
|
||||
<corners
|
||||
android:bottomLeftRadius="6dip"
|
||||
android:bottomRightRadius="6dip"
|
||||
|
||||
@@ -3,12 +3,12 @@
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<!-- 状态 1:按压时(手指按住)→ 深灰色 -->
|
||||
<item android:color="@color/btn_gray_pressed" android:state_pressed="true"/>
|
||||
<item android:color="#757575" android:state_pressed="true"/>
|
||||
|
||||
<!-- 状态 2:禁用时(setEnabled(false))→ 浅灰色 -->
|
||||
<item android:color="@color/btn_gray_disabled" android:state_enabled="false"/>
|
||||
<item android:color="#E0E0E0" android:state_enabled="false"/>
|
||||
|
||||
<!-- 状态 3:默认态(正常可点击)→ 常规灰色 -->
|
||||
<item android:color="@color/btn_gray_normal"/>
|
||||
<item android:color="#9E9E9E"/>
|
||||
|
||||
</selector>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
android:viewportWidth="108"
|
||||
android:viewportHeight="108">
|
||||
<path
|
||||
android:fillColor="@color/colorPrimary"
|
||||
android:fillColor="#FF00B322"
|
||||
android:pathData="M0,0h108v108h-108z" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
|
||||
<item name="dialogBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
|
||||
<item name="dialogTextColor">?attr/mainWindowDarkTextColor</item>
|
||||
<item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
|
||||
<item name="toolbarTextColor">@color/toolbarTextColor</item>
|
||||
<item name="toolbarBackgroundColor">#FF00B322</item>
|
||||
<item name="toolbarTextColor">#FF000000</item>
|
||||
<item name="textViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
|
||||
<item name="textViewTextColor">?attr/mainWindowDarkTextColor</item>
|
||||
<item name="editTextBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
|
||||
@@ -21,21 +21,21 @@
|
||||
<item name="scrollViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
|
||||
<item name="activityBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
|
||||
<item name="activityTextColor">?attr/mainWindowDarkTextColor</item>
|
||||
<item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||
<item name="mainWindowTextColor">@color/mainWindowTextColor</item>
|
||||
<item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||
<item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
|
||||
<item name="mainWindowBackgroundColor">#FFF5F5F5</item>
|
||||
<item name="mainWindowTextColor">#FF000000</item>
|
||||
<item name="mainWindowDarkBackgroundColor">#FFF5F5F5</item>
|
||||
<item name="mainWindowDarkTextColor">#FF000000</item>
|
||||
</style>
|
||||
|
||||
<!-- DebugActivityTheme 深色模式样式 -->
|
||||
<style name="DebugActivityTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
|
||||
<item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
|
||||
<item name="android:statusBarColor">#FF00B322</item>
|
||||
<item name="colorTittle">?attr/mainWindowDarkTextColor</item>
|
||||
<item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
|
||||
<item name="colorTittleBackgound">#FF00B322</item>
|
||||
<item name="colorText">?attr/debugTextColor</item>
|
||||
<item name="colorTextBackgound">?attr/mainWindowDarkBackgroundColor</item>
|
||||
<item name="debugTextColor">@color/debugTextColor</item>
|
||||
<item name="toolbarTextColor">@color/toolbarTextColor</item>
|
||||
<item name="debugTextColor">#FF808080</item>
|
||||
<item name="toolbarTextColor">#FF000000</item>
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="colorPrimary">#FF00B322</color>
|
||||
<color name="colorPrimaryDark">#FF008F1A</color>
|
||||
<color name="colorAccent">#FF8DFFA2</color>
|
||||
<color name="colorText">#FF000000</color>
|
||||
<color name="colorTextBackgound">#FFF5F5F5</color>
|
||||
|
||||
<!-- ============== 基础黑白(必含,适配文字/背景) ============== -->
|
||||
<color name="white">#FFFFFF</color>
|
||||
<color name="black">#000000</color>
|
||||
|
||||
<!-- ============== 基础色系(按钮/强调色常用) ============== -->
|
||||
<color name="blue_light">#4A90E2</color>
|
||||
<color name="blue_normal">#2196F3</color>
|
||||
<color name="blue_dark">#1976D2</color>
|
||||
<color name="green_light">#66BB6A</color>
|
||||
<color name="green_normal">#4CAF50</color>
|
||||
<color name="green_dark">#388E3C</color>
|
||||
<color name="red_light">#EF5350</color>
|
||||
<color name="red_normal">#F44336</color>
|
||||
<color name="red_dark">#D32F2F</color>
|
||||
<color name="yellow_light">#FFF59D</color>
|
||||
<color name="yellow_normal">#FFC107</color>
|
||||
<color name="yellow_dark">#FFA000</color>
|
||||
<color name="orange_normal">#FF9800</color>
|
||||
<color name="purple_normal">#9C27B0</color>
|
||||
|
||||
<!-- ============== 透明色(遮罩/背景叠加) ============== -->
|
||||
<color name="transparent">#00000000</color>
|
||||
<color name="black_transparent_50">#80000000</color>
|
||||
|
||||
<!-- ============== 不透明灰色(常用深浅梯度) ============== -->
|
||||
<color name="gray_100">#F5F5F5</color>
|
||||
<color name="gray_200">#EEEEEE</color>
|
||||
<color name="gray_300">#E0E0E0</color>
|
||||
<color name="gray_400">#BDBDBD</color>
|
||||
<color name="gray_500">#9E9E9E</color>
|
||||
<color name="gray_600">#757575</color>
|
||||
<color name="gray_700">#616161</color>
|
||||
<color name="gray_800">#424242</color>
|
||||
<color name="gray_900">#212121</color>
|
||||
|
||||
<!-- ============== 半透明灰色 ============== -->
|
||||
<color name="gray_transparent_30">#4D9E9E9E</color>
|
||||
<color name="gray_transparent_50">#809E9E9E</color>
|
||||
<color name="gray_transparent_70">#B39E9E9E</color>
|
||||
|
||||
<color name="gray_light">#EEE</color>
|
||||
<color name="gray_mid">#999</color>
|
||||
<color name="gray_dark">#666</color>
|
||||
<color name="gray_black">#333</color>
|
||||
|
||||
<!-- ============== 遮罩/蒙层 ============== -->
|
||||
<color name="mask_gray">#809E9E9E</color>
|
||||
<color name="bg_overlay_gray">#4D424242</color>
|
||||
|
||||
<!-- ============== 按钮灰色 ============== -->
|
||||
<color name="btn_gray_normal">#9E9E9E</color>
|
||||
<color name="btn_gray_pressed">#757575</color>
|
||||
<color name="btn_gray_disabled">#E0E0E0</color>
|
||||
|
||||
<!-- ============== 主题颜色 ============== -->
|
||||
<color name="mainWindowBackgroundColor">#FFF5F5F5</color>
|
||||
<color name="mainWindowTextColor">#FF000000</color>
|
||||
<color name="toolbarTextColor">#FF000000</color>
|
||||
<color name="toolbarBackgroundColor">#FF00B322</color>
|
||||
|
||||
<color name="debugTextColor">#FF808080</color>
|
||||
|
||||
</resources>
|
||||
@@ -12,8 +12,8 @@
|
||||
|
||||
<item name="dialogBackgroundColor">?attr/mainWindowBackgroundColor</item>
|
||||
<item name="dialogTextColor">?attr/mainWindowTextColor</item>
|
||||
<item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
|
||||
<item name="toolbarTextColor">@color/toolbarTextColor</item>
|
||||
<item name="toolbarBackgroundColor">#FF00B322</item>
|
||||
<item name="toolbarTextColor">#FF000000</item>
|
||||
<item name="textViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
|
||||
<item name="textViewTextColor">?attr/mainWindowTextColor</item>
|
||||
<item name="editTextBackgroundColor">?attr/mainWindowBackgroundColor</item>
|
||||
@@ -21,21 +21,21 @@
|
||||
<item name="scrollViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
|
||||
<item name="activityBackgroundColor">?attr/mainWindowBackgroundColor</item>
|
||||
<item name="activityTextColor">?attr/mainWindowTextColor</item>
|
||||
<item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||
<item name="mainWindowTextColor">@color/mainWindowTextColor</item>
|
||||
<item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||
<item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
|
||||
<item name="mainWindowBackgroundColor">#FFF5F5F5</item>
|
||||
<item name="mainWindowTextColor">#FF000000</item>
|
||||
<item name="mainWindowDarkBackgroundColor">#FFF5F5F5</item>
|
||||
<item name="mainWindowDarkTextColor">#FF000000</item>
|
||||
</style>
|
||||
|
||||
<!-- DebugActivityTheme 普通模式样式 -->
|
||||
<style name="DebugActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
|
||||
<item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
|
||||
<item name="android:statusBarColor">#FF00B322</item>
|
||||
<item name="colorTittle">?attr/mainWindowTextColor</item>
|
||||
<item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
|
||||
<item name="colorTittleBackgound">#FF00B322</item>
|
||||
<item name="colorText">?attr/debugTextColor</item>
|
||||
<item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
|
||||
<item name="debugTextColor">@color/debugTextColor</item>
|
||||
<item name="toolbarTextColor">@color/toolbarTextColor</item>
|
||||
<item name="debugTextColor">#FF808080</item>
|
||||
<item name="toolbarTextColor">#FF000000</item>
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user