Compare commits
40 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fe0f3cd713 | |||
| 34304e79f4 | |||
| b5c5110a51 | |||
| 7b1c0bf5f5 | |||
| 852a33c14e | |||
| c616be4f8a | |||
| 3bae2b3b9a | |||
| 90cb428ca2 | |||
| b8d32d900e | |||
| bd635425a1 | |||
| b50e4e02ea | |||
| 84f1c820cb | |||
| 0e60d75ac6 | |||
| 773cc9f6c1 | |||
| ca33dab4da | |||
| eee8809485 | |||
| 69f79549e9 | |||
| f204cd2608 | |||
| 2d3592690a | |||
| 576f8bb5e5 | |||
| e787697d6b | |||
| 3db3edcf2c | |||
| 643d08bf22 | |||
| beefb16c32 | |||
| 878009ec9f | |||
| 2d8b5d515b | |||
| 1453287667 | |||
| 5fc59f3305 | |||
| b6ba73126f | |||
| bdd8d1e2b6 | |||
| 138ca80e35 | |||
| 7a3b54b78b | |||
| db804d1897 | |||
| 039c8fcd98 | |||
| ae63d1ec0a | |||
| 9e9486b488 | |||
| 4b8967b253 | |||
| b1059c3f46 | |||
| f3d723fbee | |||
| e3c30ea9a3 |
@@ -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,10 +182,10 @@ echo -e "#@@@ 开始合并类库型模块源码 @@@#
|
||||
for item in "${MERGE_LIB_PROJECT_LIST[@]}"; do
|
||||
echo "正在合并 $item 项目 ..."
|
||||
item_lower=$(echo "$item" | tr 'A-Z' 'a-z')
|
||||
git checkout origin/$item_lower $item_lower lib$item_lower
|
||||
git checkout origin/$item_lower $item_lower lib$item_lower
|
||||
git add .
|
||||
git commit -m "合并 $item 项目"
|
||||
done
|
||||
|
||||
echo '正在推送 Projects_Keeper 项目'
|
||||
git push
|
||||
git push
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+6
-5
@@ -33,19 +33,20 @@ android {
|
||||
// versionName 更新后需要手动设置
|
||||
// 项目模块目录的 build.gradle 文件的 stageCount=0
|
||||
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
||||
versionName "15.20"
|
||||
versionName "15.21"
|
||||
if(true) {
|
||||
versionName = genVersionName("${versionName}")
|
||||
}
|
||||
}
|
||||
|
||||
// 米盟 SDK
|
||||
|
||||
packagingOptions {
|
||||
doNotStrip "*/*/libmimo_1011.so"
|
||||
exclude 'META-INF/NOTICE.md'
|
||||
exclude 'META-INF/LICENSE.md'
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api project(':libaes')
|
||||
api project(':libaes')
|
||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Wed May 20 20:04:49 HKT 2026
|
||||
stageCount=9
|
||||
#Mon Jul 27 05:47:39 HKT 2026
|
||||
stageCount=2
|
||||
libraryProject=libaes
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.8
|
||||
baseVersion=15.21
|
||||
publishVersion=15.21.1
|
||||
buildCount=0
|
||||
baseBetaVersion=15.20.9
|
||||
baseBetaVersion=15.21.2
|
||||
|
||||
Vendored
+10
@@ -120,6 +120,16 @@
|
||||
# JSch SSH组件
|
||||
-keep class com.jcraft.jsch.** { *; }
|
||||
|
||||
# JavaMail SMTP(邮件发送核心库,Release编译必须保留)
|
||||
-dontwarn javax.mail.**
|
||||
-keep class javax.mail.** { *; }
|
||||
-keep class javax.mail.internet.** { *; }
|
||||
-dontwarn javax.activation.**
|
||||
-keep class javax.activation.** { *; }
|
||||
-dontwarn com.sun.mail.**
|
||||
-keep class com.sun.mail.** { *; }
|
||||
-keepclassmembers class * extends javax.mail.Authenticator { *; }
|
||||
|
||||
# AndroidX 基础组件
|
||||
-keep class androidx.appcompat.** { *; }
|
||||
-keep interface androidx.appcompat.** { *; }
|
||||
|
||||
@@ -40,6 +40,8 @@
|
||||
|
||||
<activity android:name=".AboutActivity"/>
|
||||
|
||||
<activity android:name=".SMTPSettingsActivity" android:exported="true"/>
|
||||
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@@ -65,7 +65,7 @@ public class AboutActivity extends BaseWinBoLLActivity {
|
||||
appInfo.setAppName(getString(R.string.app_name));
|
||||
appInfo.setAppIcon(R.drawable.ic_winboll);
|
||||
appInfo.setAppDescription(getString(R.string.app_description));
|
||||
appInfo.setAppGitName("AES");
|
||||
appInfo.setAppGitName("WinBoLL");
|
||||
appInfo.setAppGitOwner("Studio");
|
||||
appInfo.setAppGitAPPBranch(branchName);
|
||||
appInfo.setAppGitAPPSubProjectFolder(branchName);
|
||||
|
||||
@@ -5,10 +5,14 @@ package cc.winboll.studio.aes;
|
||||
* @Date 2024/06/13 19:03:58
|
||||
* @Describe AES应用类
|
||||
*/
|
||||
import android.view.Gravity;
|
||||
import cc.winboll.studio.libaes.utils.AESThemeUtil;
|
||||
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
|
||||
import cc.winboll.studio.libappbase.CrashActivity;
|
||||
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||
import cc.winboll.studio.libappbase.ToastUtils;
|
||||
import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
|
||||
import java.io.PrintWriter;
|
||||
import java.io.StringWriter;
|
||||
|
||||
|
||||
public class App extends GlobalApplication {
|
||||
@@ -17,11 +21,25 @@ public class App extends GlobalApplication {
|
||||
|
||||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
WinBoLLActivityManager.init(this);
|
||||
try {
|
||||
super.onCreate();
|
||||
ToastUtils.init(this);
|
||||
WinBoLLActivityManager.init(this);
|
||||
AESThemeUtil.init(null);
|
||||
} catch (Throwable e) {
|
||||
StringWriter sw = new StringWriter();
|
||||
PrintWriter pw = new PrintWriter(sw);
|
||||
e.printStackTrace(pw);
|
||||
pw.close();
|
||||
String stackTraceStr = sw.toString();
|
||||
CrashHandleNotifyUtils.handleUncaughtException(
|
||||
this,
|
||||
getPackageName(),
|
||||
stackTraceStr,
|
||||
CrashActivity.class
|
||||
);
|
||||
}
|
||||
|
||||
// 初始化 Toast 框架
|
||||
ToastUtils.init(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -84,11 +84,12 @@ public class MainActivity extends DrawerFragmentActivity {
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
super.onCreateOptionsMenu(menu);
|
||||
getMenuInflater().inflate(R.menu.toolbar_main, menu);
|
||||
// if(App.isDebugging()) {
|
||||
// getMenuInflater().inflate(cc.winboll.studio.libaes.R.menu.toolbar_studio_debug, menu);
|
||||
// }
|
||||
return super.onCreateOptionsMenu(menu);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -182,6 +183,8 @@ public class MainActivity extends DrawerFragmentActivity {
|
||||
} else if (nItemId == R.id.item_settings) {
|
||||
Intent intent = new Intent(this, SettingsActivity.class);
|
||||
startActivity(intent);
|
||||
} else if (nItemId == R.id.item_smtp_settings) {
|
||||
WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, SMTPSettingsActivity.class);
|
||||
} else if (nItemId == R.id.item_about) {
|
||||
// Intent intent = new Intent(this, AboutActivity.class);
|
||||
// startActivity(intent);
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
package cc.winboll.studio.aes;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
|
||||
/**
|
||||
* @Author ZhanGSKen<zhangsken@qq.com>
|
||||
* @Date 2026/07/16
|
||||
* @Describe SMTP邮件设置窗口,使用SMTPConfigView控件进行配置操作
|
||||
*/
|
||||
public class SMTPSettingsActivity extends BaseWinBoLLActivity {
|
||||
|
||||
public static final String TAG = "SMTPSettingsActivity";
|
||||
|
||||
private Toolbar mToolbar;
|
||||
|
||||
@Override
|
||||
public String getTag() {
|
||||
return TAG;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_smtp_settings);
|
||||
|
||||
initToolbar();
|
||||
}
|
||||
|
||||
private void initToolbar() {
|
||||
LogUtils.d(TAG, "initToolbar() 开始初始化");
|
||||
mToolbar = findViewById(R.id.toolbar);
|
||||
if (mToolbar == null) {
|
||||
LogUtils.e(TAG, "initToolbar() | Toolbar未找到");
|
||||
return;
|
||||
}
|
||||
setSupportActionBar(mToolbar);
|
||||
mToolbar.setSubtitle(getTag());
|
||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
LogUtils.d(TAG, "导航栏 点击返回按钮");
|
||||
finish();
|
||||
}
|
||||
});
|
||||
LogUtils.d(TAG, "initToolbar() 配置完成");
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,7 @@
|
||||
package cc.winboll.studio.aes;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import cc.winboll.studio.libaes.views.ADsControlView;
|
||||
|
||||
/**
|
||||
* @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
|
||||
@@ -20,7 +16,7 @@ public class SettingsActivity extends Activity {
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_settings);
|
||||
ADsControlView adsControlView = (ADsControlView) findViewById(R.id.ads_control_view);
|
||||
//ADsControlView adsControlView = (ADsControlView) findViewById(R.id.ads_control_view);
|
||||
|
||||
// adsControlView.setOnAdsModeSelectedListener(new ADsControlView.OnAdsModeSelectedListener() {
|
||||
// @Override
|
||||
|
||||
@@ -6,12 +6,5 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" android:background="@drawable/bg_container_border">
|
||||
|
||||
<cc.winboll.studio.libaes.views.ADsControlView
|
||||
android:id="@+id/ads_control_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/bg_frame"
|
||||
android:padding="10dp"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/bg_container_border">
|
||||
|
||||
<cc.winboll.studio.libaes.views.ASupportToolbar
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/toolbar"/>
|
||||
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<cc.winboll.studio.libaes.views.SMTPConfigView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
</ScrollView>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -35,6 +35,9 @@
|
||||
<item
|
||||
android:id="@+id/item_settings"
|
||||
android:title="Settings"/>
|
||||
<item
|
||||
android:id="@+id/item_smtp_settings"
|
||||
android:title="SMTP设置"/>
|
||||
<item
|
||||
android:id="@+id/item_about"
|
||||
android:title="About"/>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
</style>
|
||||
|
||||
<style name="MyDebugActivityTheme" parent="Theme.AppCompat.NoActionBar">
|
||||
<item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
|
||||
<item name="colorTittle">@color/mainWindowTextColor</item>
|
||||
<item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
|
||||
<item name="colorText">@color/debugTextColor</item>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
</style>
|
||||
|
||||
<style name="MyDebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
|
||||
<item name="colorTittle">@color/mainWindowTextColor</item>
|
||||
<item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
|
||||
<item name="colorText">@color/debugTextColor</item>
|
||||
|
||||
+12
-2
@@ -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}")
|
||||
}
|
||||
@@ -44,10 +44,20 @@ android {
|
||||
sourceCompatibility JavaVersion.VERSION_1_7
|
||||
targetCompatibility JavaVersion.VERSION_1_7
|
||||
}
|
||||
packagingOptions {
|
||||
exclude 'META-INF/LICENSE.md'
|
||||
exclude 'META-INF/LICENSE.txt'
|
||||
exclude 'META-INF/NOTICE.md'
|
||||
exclude 'META-INF/NOTICE.txt'
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api project(':libappbase')
|
||||
|
||||
|
||||
// JavaMail SMTP (Android兼容版)
|
||||
api 'com.sun.mail:android-mail:1.6.7'
|
||||
api 'com.sun.mail:android-activation:1.6.7'
|
||||
|
||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Sun May 24 09:53:05 HKT 2026
|
||||
stageCount=22
|
||||
#Thu Jul 23 19:07:39 HKT 2026
|
||||
stageCount=5
|
||||
libraryProject=libappbase
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.21
|
||||
baseVersion=15.21
|
||||
publishVersion=15.21.4
|
||||
buildCount=0
|
||||
baseBetaVersion=15.20.22
|
||||
baseBetaVersion=15.21.5
|
||||
|
||||
Vendored
+4
@@ -73,6 +73,10 @@
|
||||
-dontwarn java.util.function.**
|
||||
|
||||
# ============================== 第三方框架规则 ==============================
|
||||
# JavaMail(libaes SMTPConfigView依赖)
|
||||
-keep class javax.mail.** { *; }
|
||||
-dontwarn javax.mail.**
|
||||
|
||||
# Retrofit + OkHttp
|
||||
-keep class retrofit2.** { *; }
|
||||
-keep interface retrofit2.** { *; }
|
||||
|
||||
@@ -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,13 @@
|
||||
package cc.winboll.studio.appbase;
|
||||
|
||||
import cc.winboll.studio.libappbase.CrashActivity;
|
||||
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import cc.winboll.studio.libappbase.ToastUtils;
|
||||
import cc.winboll.studio.libappbase.BuildConfig;
|
||||
import cc.winboll.studio.libappbase.utils.APPMSGMailUtils;
|
||||
import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
|
||||
import java.io.PrintWriter;
|
||||
import java.io.StringWriter;
|
||||
|
||||
/**
|
||||
* @Author ZhanGSKen<zhangsken@qq.com>
|
||||
@@ -15,16 +20,55 @@ public class App extends GlobalApplication {
|
||||
/** 当前应用类的日志 TAG(用于调试输出,标识日志来源) */
|
||||
public static final String TAG = "App";
|
||||
|
||||
/** SMTP配置 SharedPreferences 名称 */
|
||||
private static final String PREF_NAME = "smtp_config";
|
||||
|
||||
/**
|
||||
* 应用创建时回调(全局初始化入口)
|
||||
* 在应用进程启动时执行,仅调用一次,用于初始化全局工具类、第三方库等
|
||||
*/
|
||||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
|
||||
// 初始化 Toast 工具类(传入应用全局上下文,确保 Toast 可在任意地方调用)
|
||||
ToastUtils.init(getApplicationContext());
|
||||
try {
|
||||
super.onCreate();
|
||||
|
||||
// 初始化 Toast 工具类(传入应用全局上下文,确保 Toast 可在任意地方调用)
|
||||
ToastUtils.init(getApplicationContext());
|
||||
|
||||
// 调试异常捕获
|
||||
final String errorMsg = "初始化异常捕获调试信息,这个是调试异常捕获的测试数据。";
|
||||
LogUtils.e(TAG, errorMsg);
|
||||
throw new IllegalArgumentException(errorMsg);
|
||||
|
||||
} catch (Throwable e) {
|
||||
StringWriter sw = new StringWriter();
|
||||
PrintWriter pw = new PrintWriter(sw);
|
||||
e.printStackTrace(pw);
|
||||
pw.close();
|
||||
String stackTraceStr = sw.toString();
|
||||
|
||||
// 发送异常信息邮箱。
|
||||
sendExceptionMail(stackTraceStr);
|
||||
|
||||
// 前台通知栏提醒。
|
||||
CrashHandleNotifyUtils.handleUncaughtException(
|
||||
this,
|
||||
getPackageName(),
|
||||
stackTraceStr,
|
||||
CrashActivity.class
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送异常报告邮件
|
||||
* 读取SMTP配置,若配置完整则在子线程发送异常堆栈邮件
|
||||
* @param stackTraceStr 异常堆栈信息
|
||||
*/
|
||||
private void sendExceptionMail(final String stackTraceStr) {
|
||||
String subject = "Exception Report - " + getPackageName();
|
||||
String recipients = APPMSGMailUtils.getRecipient(this);
|
||||
APPMSGMailUtils.sendMail(this, subject, stackTraceStr, recipients);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -39,4 +83,3 @@ public class App extends GlobalApplication {
|
||||
ToastUtils.release();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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 菜单,加载自定义菜单布局
|
||||
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package cc.winboll.studio.appbase.develop;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.os.Bundle;
|
||||
import cc.winboll.studio.appbase.R;
|
||||
import cc.winboll.studio.libappbase.views.SMTPConfigView;
|
||||
|
||||
/**
|
||||
* @Author 豆包&BigPickle&MiMo&ZhanGSKen<zhangsken@qq.com>
|
||||
* @Date 2026/07/21 12:44
|
||||
* @Describe 应用异常信息邮件接收账号设置
|
||||
* 使用libaes的SMTPConfigView控件配置SMTP服务器参数
|
||||
*/
|
||||
public class APPExcetionMailSettingsActivity extends Activity {
|
||||
|
||||
public static final String TAG = "APPExcetionMailSettingsActivity";
|
||||
|
||||
private SMTPConfigView mSMTPConfigView;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_appexcetionmailsettings);
|
||||
|
||||
mSMTPConfigView = (SMTPConfigView) findViewById(R.id.smtp_config_view);
|
||||
}
|
||||
}
|
||||
@@ -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,13 @@
|
||||
<?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">
|
||||
|
||||
<cc.winboll.studio.libappbase.views.SMTPConfigView
|
||||
android:id="@+id/smtp_config_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
</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>
|
||||
@@ -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>
|
||||
|
||||
+10
-8
@@ -20,15 +20,11 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
// 米盟 SDK
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_7
|
||||
targetCompatibility JavaVersion.VERSION_1_7
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
doNotStrip "*/*/libmimo_1011.so"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -57,7 +53,7 @@ dependencies {
|
||||
//api 'androidx.fragment:fragment:1.1.0'
|
||||
|
||||
// 米盟
|
||||
api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
|
||||
//api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
|
||||
//注意:以下5个库必须要引入
|
||||
//implementation 'androidx.appcompat:appcompat:1.4.1'
|
||||
api 'androidx.recyclerview:recyclerview:1.0.0'
|
||||
@@ -66,9 +62,15 @@ dependencies {
|
||||
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
|
||||
|
||||
// WinBoLL库 nexus.winboll.cc 地址
|
||||
api 'cc.winboll.studio:libappbase:15.20.18'
|
||||
// 备用库 jitpack.io 地址
|
||||
//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'
|
||||
//api 'cc.winboll.studio:libappbase:15.21.+'
|
||||
api 'com.github.ZhanGSKen:libappbase:appbase-v15.21.+'
|
||||
|
||||
// 备用库 jitpack.io 地址
|
||||
//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
|
||||
|
||||
// JavaMail SMTP (Android兼容版)
|
||||
api 'com.sun.mail:android-mail:1.6.7'
|
||||
api 'com.sun.mail:android-activation:1.6.7'
|
||||
|
||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Wed May 20 20:04:49 HKT 2026
|
||||
stageCount=9
|
||||
#Mon Jul 27 05:47:39 HKT 2026
|
||||
stageCount=2
|
||||
libraryProject=libaes
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.8
|
||||
baseVersion=15.21
|
||||
publishVersion=15.21.1
|
||||
buildCount=0
|
||||
baseBetaVersion=15.20.9
|
||||
baseBetaVersion=15.21.2
|
||||
|
||||
Vendored
+7
@@ -9,6 +9,13 @@
|
||||
|
||||
# Add any project specific keep options here:
|
||||
|
||||
# JavaMail SMTP(邮件发送核心库,Release编译必须保留)
|
||||
-dontwarn javax.mail.**
|
||||
-keep class javax.mail.** { *; }
|
||||
-keep class javax.mail.internet.** { *; }
|
||||
-dontwarn com.sun.mail.**
|
||||
-keep class com.sun.mail.** { *; }
|
||||
|
||||
# If your project uses WebView with JS, uncomment the following
|
||||
# and specify the fully qualified class name to the JavaScript interface
|
||||
# class:
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
package="cc.winboll.studio.libaes">
|
||||
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-feature android:name="android.hardware.camera" android:required="true" />
|
||||
|
||||
<application
|
||||
|
||||
+66
-124
@@ -24,18 +24,18 @@ import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
import cc.winboll.studio.libaes.DrawerMenuDataAdapter;
|
||||
import cc.winboll.studio.libaes.R;
|
||||
import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
|
||||
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
|
||||
import cc.winboll.studio.libaes.models.AESThemeBean;
|
||||
import cc.winboll.studio.libaes.models.DrawerMenuBean;
|
||||
import cc.winboll.studio.libaes.utils.AESThemeUtil;
|
||||
import cc.winboll.studio.libaes.utils.DevelopUtils;
|
||||
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
|
||||
import cc.winboll.studio.libaes.views.ADrawerMenuListView;
|
||||
import cc.winboll.studio.libaes.views.ADsBannerView;
|
||||
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import com.baoyz.widget.PullRefreshLayout;
|
||||
import java.util.ArrayList;
|
||||
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
|
||||
|
||||
public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBoLLActivity, AdapterView.OnItemClickListener {
|
||||
|
||||
@@ -44,7 +44,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
|
||||
static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
|
||||
|
||||
//protected Context mContext;
|
||||
ActivityType mActivityType;
|
||||
ActionBarDrawerToggle mActionBarDrawerToggle;
|
||||
DrawerLayout mDrawerLayout;
|
||||
@@ -59,13 +58,14 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
public enum ActivityType { Main, Secondary }
|
||||
protected volatile AESThemeBean.ThemeType mThemeType;
|
||||
protected ArrayList<DrawerMenuBean> malDrawerMenuItem;
|
||||
|
||||
abstract protected ActivityType initActivityType();
|
||||
//abstract protected View initContentView(LayoutInflater inflater, ViewGroup rootView);
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
// 替换:使用工具类统一应用主题
|
||||
AESThemeUtil.applyAppCompatTheme(this);
|
||||
mThemeType = AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
|
||||
setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
|
||||
super.onCreate(savedInstanceState);
|
||||
WinBoLLActivityManager.getInstance().add(this);
|
||||
mActivityType = initActivityType();
|
||||
@@ -78,53 +78,32 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTag() {
|
||||
return TAG;
|
||||
}
|
||||
@Override
|
||||
public String getTag() {
|
||||
return TAG;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDestroy() {
|
||||
WinBoLLActivityManager.getInstance().registeRemove(this);
|
||||
WinBoLLActivityManager.getInstance().registeRemove(this);
|
||||
super.onDestroy();
|
||||
// 修复:释放广告资源,避免内存泄漏
|
||||
ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
|
||||
if (adsBannerView != null) {
|
||||
adsBannerView.releaseAdResources();
|
||||
}
|
||||
// 修复:释放广告资源,避免内存泄漏
|
||||
// ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
|
||||
// if (adsBannerView != null) {
|
||||
// adsBannerView.releaseAdResources();
|
||||
// }
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public Intent getIntent() {
|
||||
// TODO: Implement this method
|
||||
return super.getIntent();
|
||||
}
|
||||
|
||||
public Context getContext() {
|
||||
return this.mContext;
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public MenuInflater getMenuInflater() {
|
||||
// TODO: Implement this method
|
||||
return super.getMenuInflater();
|
||||
}
|
||||
|
||||
/*public void setSubtitle(CharSequence context) {
|
||||
// TODO: Implement this method
|
||||
getSupportActionBar().setSubtitle(context);
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public void recreate() {
|
||||
super.recreate();
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public boolean moveTaskToBack(boolean nonRoot) {
|
||||
return super.moveTaskToBack(nonRoot);
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public void startActivity(Intent intent) {
|
||||
super.startActivity(intent);
|
||||
@@ -135,26 +114,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
super.startActivityForResult(intent, requestCode, options);
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public FragmentManager getSupportFragmentManager() {
|
||||
return super.getSupportFragmentManager();
|
||||
}
|
||||
|
||||
public void setSubtitle(int resId) {
|
||||
// TODO: Implement this method
|
||||
getSupportActionBar().setSubtitle(resId);
|
||||
}
|
||||
|
||||
public void setTitle(CharSequence context) {
|
||||
// TODO: Implement this method
|
||||
getSupportActionBar().setTitle(context);
|
||||
}
|
||||
|
||||
public void setTitle(int resId) {
|
||||
// TODO: Implement this method
|
||||
getSupportActionBar().setTitle(resId);
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public SharedPreferences getSharedPreferences(String name, int mode) {
|
||||
return super.getSharedPreferences(name, mode);
|
||||
@@ -162,7 +121,6 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
|
||||
@Override
|
||||
public Context getApplicationContext() {
|
||||
// TODO: Implement this method
|
||||
return super.getApplicationContext();
|
||||
}
|
||||
|
||||
@@ -173,25 +131,27 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
if (AESThemeUtil.onAppThemeItemSelected(this, item)) {
|
||||
// 替换为 DrawerFragmentActivity 专属点击处理方法
|
||||
if (AESThemeUtil.onWinBoLLThemeItemSelected(this, item)) {
|
||||
recreate();
|
||||
} if (DevelopUtils.onDevelopItemSelected(this, item)) {
|
||||
LogUtils.d(TAG, String.format("onOptionsItemSelected item.getItemId() %d ", item.getItemId()));
|
||||
} else {
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
}
|
||||
if (DevelopUtils.onDevelopItemSelected(this, item)) {
|
||||
LogUtils.d(TAG, String.format("onOptionsItemSelected item.getItemId() %d ", item.getItemId()));
|
||||
} else {
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
|
||||
ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
|
||||
if (adsBannerView != null) {
|
||||
adsBannerView.resumeADs(DrawerFragmentActivity.this);
|
||||
}
|
||||
// ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
|
||||
// if (adsBannerView != null) {
|
||||
// adsBannerView.resumeADs(DrawerFragmentActivity.this);
|
||||
// }
|
||||
}
|
||||
|
||||
void initRootView() {
|
||||
@@ -213,14 +173,13 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
mPullRefreshLayout = findViewById(R.id.activitydrawerfragmentPullRefreshLayout1);
|
||||
|
||||
mPullRefreshLayout.setOnRefreshListener(new PullRefreshLayout.OnRefreshListener() {
|
||||
@Override
|
||||
public void onRefresh() {
|
||||
//LogUtils.d(TAG, "onRefresh");
|
||||
reinitDrawerMenuItemList(malDrawerMenuItem);
|
||||
mDrawerMenuDataAdapter.notifyDataSetChanged();
|
||||
mPullRefreshLayout.setRefreshing(false);
|
||||
}
|
||||
});
|
||||
@Override
|
||||
public void onRefresh() {
|
||||
reinitDrawerMenuItemList(malDrawerMenuItem);
|
||||
mDrawerMenuDataAdapter.notifyDataSetChanged();
|
||||
mPullRefreshLayout.setRefreshing(false);
|
||||
}
|
||||
});
|
||||
|
||||
malDrawerMenuItem = new ArrayList<DrawerMenuBean>();
|
||||
|
||||
@@ -236,68 +195,51 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
|
||||
mActionBarDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, mToolbar, R.string.lib_name, R.string.lib_name) {
|
||||
@Override
|
||||
public void onDrawerOpened(View drawerView) {//完全打开时触发
|
||||
public void onDrawerOpened(View drawerView) {
|
||||
super.onDrawerOpened(drawerView);
|
||||
mIsDrawerOpened = true;
|
||||
mIsDrawerOpening = false;
|
||||
//Toast.makeText(MainActivity.this,"onDrawerOpened",Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDrawerClosed(View drawerView) {//完全关闭时触发
|
||||
public void onDrawerClosed(View drawerView) {
|
||||
super.onDrawerClosed(drawerView);
|
||||
mIsDrawerOpened = false;
|
||||
mIsDrawerClosing = false;
|
||||
//Toast.makeText(MainActivity.this,"onDrawerClosed",Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
/**
|
||||
* 当抽屉被滑动的时候调用此方法
|
||||
* slideOffset表示 滑动的幅度(0-1)
|
||||
*/
|
||||
@Override
|
||||
public void onDrawerSlide(View drawerView, float slideOffset) {
|
||||
super.onDrawerSlide(drawerView, slideOffset);
|
||||
}
|
||||
|
||||
/**
|
||||
* 当抽屉滑动状态改变的时候被调用
|
||||
* 状态值是STATE_IDLE(闲置--0), STATE_DRAGGING(拖拽的--1), STATE_SETTLING(固定--2)中之一。
|
||||
*具体状态可以慢慢调试
|
||||
*/
|
||||
@Override
|
||||
public void onDrawerStateChanged(int newState) {
|
||||
super.onDrawerStateChanged(newState);
|
||||
}
|
||||
};
|
||||
|
||||
//设置显示旋转菜单
|
||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
//通过下面这句实现toolbar和Drawer的联动:如果没有这行代码,箭头是不会随着侧滑菜单的开关而变换的(或者没有箭头),
|
||||
// 可以尝试一下,不影响正常侧滑
|
||||
mActionBarDrawerToggle.syncState();
|
||||
mDrawerLayout.setDrawerListener(mActionBarDrawerToggle);
|
||||
|
||||
//去掉侧滑的默认图标(动画箭头图标),也可以选择不去,
|
||||
//不去的话把这一行注释掉或者改成true,然后把toolbar.setNavigationIcon注释掉就行了
|
||||
//mActionBarDrawerToggle.setDrawerIndicatorEnabled(false);
|
||||
mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (mIsDrawerOpened || mIsDrawerOpening) {
|
||||
mIsDrawerClosing = true;
|
||||
mIsDrawerOpening = false;
|
||||
mDrawerLayout.closeDrawer(mPullRefreshLayout);
|
||||
return;
|
||||
}
|
||||
if (!mIsDrawerOpened || mIsDrawerClosing) {
|
||||
mIsDrawerOpening = true;
|
||||
mIsDrawerClosing = false;
|
||||
mDrawerLayout.openDrawer(mPullRefreshLayout);
|
||||
return;
|
||||
}
|
||||
}
|
||||
});
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (mIsDrawerOpened || mIsDrawerOpening) {
|
||||
mIsDrawerClosing = true;
|
||||
mIsDrawerOpening = false;
|
||||
mDrawerLayout.closeDrawer(mPullRefreshLayout);
|
||||
return;
|
||||
}
|
||||
if (!mIsDrawerOpened || mIsDrawerClosing) {
|
||||
mIsDrawerOpening = true;
|
||||
mIsDrawerClosing = false;
|
||||
mDrawerLayout.openDrawer(mPullRefreshLayout);
|
||||
return;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
initDrawerMenuItemList(malDrawerMenuItem);
|
||||
}
|
||||
@@ -305,12 +247,11 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
void initSecondaryRootView() {
|
||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
//LogUtils.d(TAG, "onClick " + Integer.toString(v.getId()));
|
||||
finish();
|
||||
}
|
||||
});
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public <T extends Fragment> int removeFragment(T fragment) {
|
||||
@@ -375,13 +316,13 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
if (mActivityType == ActivityType.Main) {
|
||||
// 主题菜单
|
||||
AESThemeUtil.inflateMenu(this, menu);
|
||||
// 调试工具菜单
|
||||
if (GlobalApplication.isDebugging()) {
|
||||
DevelopUtils.inflateMenu(this, menu);
|
||||
}
|
||||
// 应用信息菜单
|
||||
// 替换为兼容版菜单加载方法
|
||||
AESThemeUtil.inflateCompatThemeMenu(this, menu);
|
||||
// 调试工具菜单
|
||||
if (GlobalApplication.isDebugging()) {
|
||||
DevelopUtils.inflateMenu(this, menu);
|
||||
}
|
||||
// 应用信息菜单
|
||||
getMenuInflater().inflate(R.menu.toolbar_drawerbase, menu);
|
||||
}
|
||||
return super.onCreateOptionsMenu(menu);
|
||||
@@ -392,3 +333,4 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
|
||||
super.onActivityResult(who, targetFragment, requestCode);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libaes.R;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class AESThemeBean extends BaseBean {
|
||||
|
||||
@@ -41,13 +42,28 @@ public class AESThemeBean extends BaseBean {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static void fillThemeStyleIDList(ArrayList<Integer> themeStyleIDList) {
|
||||
if (themeStyleIDList == null) {
|
||||
themeStyleIDList = new ArrayList<Integer>();
|
||||
|
||||
}
|
||||
themeStyleIDList.clear();
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.AESTheme);
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.DepthAESTheme);
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.SkyAESTheme);
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.GoldenAESTheme);
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.BearingAESTheme);
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.MemorAESTheme);
|
||||
themeStyleIDList.add(cc.winboll.studio.libaes.R.style.TaoAESTheme);
|
||||
}
|
||||
|
||||
// 保存当前主题
|
||||
int currentThemeStyleID = getThemeStyleID(ThemeType.AES);
|
||||
|
||||
|
||||
public AESThemeBean() {
|
||||
}
|
||||
|
||||
|
||||
public AESThemeBean(int currentThemeStyleID) {
|
||||
this.currentThemeStyleID = currentThemeStyleID;
|
||||
}
|
||||
@@ -59,7 +75,7 @@ public class AESThemeBean extends BaseBean {
|
||||
public int getCurrentThemeTypeID() {
|
||||
return this.currentThemeStyleID;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return AESThemeBean.class.getName();
|
||||
@@ -74,8 +90,7 @@ public class AESThemeBean extends BaseBean {
|
||||
|
||||
@Override
|
||||
public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
|
||||
if(super.initObjectsFromJsonReader(jsonReader, name)) { return true; }
|
||||
else{
|
||||
if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
|
||||
if (name.equals("currentThemeTypeID")) {
|
||||
setCurrentThemeTypeID(jsonReader.nextInt());
|
||||
} else {
|
||||
@@ -90,7 +105,7 @@ public class AESThemeBean extends BaseBean {
|
||||
jsonReader.beginObject();
|
||||
while (jsonReader.hasNext()) {
|
||||
String name = jsonReader.nextName();
|
||||
if(!initObjectsFromJsonReader(jsonReader, name)) {
|
||||
if (!initObjectsFromJsonReader(jsonReader, name)) {
|
||||
jsonReader.skipValue();
|
||||
}
|
||||
}
|
||||
|
||||
+4
-3
@@ -12,7 +12,6 @@ import androidx.appcompat.widget.Toolbar;
|
||||
import cc.winboll.studio.libaes.R;
|
||||
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
|
||||
import cc.winboll.studio.libaes.utils.AESThemeUtil;
|
||||
import cc.winboll.studio.libaes.views.ASupportToolbar;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
|
||||
public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBoLLActivity {
|
||||
@@ -28,11 +27,12 @@ public class TestASupportToolbarActivity extends AppCompatActivity implements IW
|
||||
public String getTag() {
|
||||
return TAG;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
LogUtils.d(TAG, "onCreate() start");
|
||||
AESThemeUtil.applyAppTheme(this);
|
||||
// 替换此处:原 applyAppTheme -> 新方法 applyAppCompatTheme
|
||||
AESThemeUtil.applyAppCompatTheme(this);
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_testasupporttoolbar);
|
||||
LogUtils.d(TAG, "setContentView() done");
|
||||
@@ -45,3 +45,4 @@ public class TestASupportToolbarActivity extends AppCompatActivity implements IW
|
||||
LogUtils.d(TAG, "onCreate() end");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,10 +14,11 @@ import cc.winboll.studio.libaes.utils.AESThemeUtil;
|
||||
public class TestAToolbarActivity extends Activity {
|
||||
|
||||
public static final String TAG = "TestAToolbarActivity";
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
AESThemeUtil.applyAppTheme(this);
|
||||
// 原生Activity 使用 applyTheme
|
||||
AESThemeUtil.applyTheme(this);
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_testatoolbar);
|
||||
Toolbar toolbar = findViewById(R.id.activitytestatoolbarAToolbar1);
|
||||
@@ -26,3 +27,4 @@ public class TestAToolbarActivity extends Activity {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -13,199 +13,159 @@ import androidx.appcompat.app.AppCompatActivity;
|
||||
import cc.winboll.studio.libaes.R;
|
||||
import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
|
||||
import cc.winboll.studio.libaes.models.AESThemeBean;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class AESThemeUtil {
|
||||
|
||||
public static final String TAG = "AESThemeUtil";
|
||||
private static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
|
||||
private static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
|
||||
|
||||
static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
|
||||
static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
|
||||
// 私有静态集合,外部不可直接修改
|
||||
private static ArrayList<Integer> themeStyleIDList = new ArrayList<>();
|
||||
|
||||
protected volatile AESThemeBean.ThemeType mThemeType;
|
||||
// 移除无用实例成员 mThemeType,工具类不保留实例字段
|
||||
|
||||
public static <T extends Context> int getThemeTypeID(T context) {
|
||||
AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
|
||||
return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES): bean.getCurrentThemeTypeID();
|
||||
/**
|
||||
* 初始化主题样式ID集合
|
||||
*/
|
||||
public static void init(ArrayList<Integer> themeStyleIDList) {
|
||||
|
||||
if (themeStyleIDList == null) {
|
||||
themeStyleIDList = new ArrayList<Integer>();
|
||||
AESThemeBean.fillThemeStyleIDList(themeStyleIDList);
|
||||
}
|
||||
AESThemeUtil.themeStyleIDList.clear();
|
||||
AESThemeUtil.themeStyleIDList.addAll(themeStyleIDList);
|
||||
}
|
||||
|
||||
public static <T extends Context> void saveThemeStyleID(T context, int nThemeTypeID) {
|
||||
AESThemeBean bean = new AESThemeBean(nThemeTypeID);
|
||||
/**
|
||||
* 获取当前主题样式ID
|
||||
*/
|
||||
public static int getThemeTypeID(Context context) {
|
||||
AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
|
||||
return bean == null ? getThemeStyleID(AESThemeBean.ThemeType.AES) : bean.getCurrentThemeTypeID();
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存主题样式ID
|
||||
*/
|
||||
public static void saveThemeStyleID(Context context, int themeTypeID) {
|
||||
AESThemeBean bean = new AESThemeBean(themeTypeID);
|
||||
AESThemeBean.saveBean(context, bean);
|
||||
}
|
||||
|
||||
public static <T extends Activity> void applyAppTheme(T activity) {
|
||||
// ====================== 应用主题 - 规范重载 ======================
|
||||
/**
|
||||
* 应用当前持久化主题(通用 Activity)
|
||||
*/
|
||||
public static void applyTheme(Activity activity) {
|
||||
activity.setTheme(getThemeTypeID(activity));
|
||||
}
|
||||
|
||||
public static <T extends AppCompatActivity> void applyAppCompatTheme(T activity) {
|
||||
/**
|
||||
* 应用指定主题(通用 Activity)
|
||||
*/
|
||||
public static void applyTheme(Activity activity, AESThemeBean.ThemeType themeType) {
|
||||
activity.setTheme(getThemeStyleID(themeType));
|
||||
}
|
||||
|
||||
/**
|
||||
* 应用当前持久化主题(AppCompat 兼容 Activity)
|
||||
*/
|
||||
public static void applyAppCompatTheme(AppCompatActivity activity) {
|
||||
activity.setTheme(getThemeTypeID(activity));
|
||||
}
|
||||
|
||||
/*public static <T extends WinBoLLActivity> void applyWinBoLLTheme(T activity) {
|
||||
activity.setTheme(getThemeTypeID(activity.getApplicationContext()));
|
||||
}*/
|
||||
|
||||
public static <T extends Activity> void applyAppTheme(Activity activity, AESThemeBean.ThemeType themeType) {
|
||||
activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
|
||||
/**
|
||||
* 应用指定主题(AppCompat 兼容 Activity)
|
||||
*/
|
||||
public static void applyAppCompatTheme(AppCompatActivity activity, AESThemeBean.ThemeType themeType) {
|
||||
activity.setTheme(getThemeStyleID(themeType));
|
||||
}
|
||||
|
||||
public static <T extends AppCompatActivity> void applyAppCompatTheme(Activity activity, AESThemeBean.ThemeType themeType) {
|
||||
activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
|
||||
}
|
||||
|
||||
/*public static <T extends WinBoLLActivity> void applyWinBoLLTheme(Activity activity, AESThemeBean.ThemeType themeType) {
|
||||
activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
|
||||
}*/
|
||||
|
||||
public static <T extends Activity> void inflateMenu(T activity, Menu menu) {
|
||||
// ====================== 加载菜单 ======================
|
||||
/**
|
||||
* 加载主题菜单(通用 Activity)
|
||||
*/
|
||||
public static void inflateThemeMenu(Activity activity, Menu menu) {
|
||||
activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
|
||||
}
|
||||
|
||||
public static <T extends AppCompatActivity> void inflateCompatMenu(T activity, Menu menu) {
|
||||
/**
|
||||
* 加载主题菜单(AppCompat Activity)
|
||||
*/
|
||||
public static void inflateCompatThemeMenu(AppCompatActivity activity, Menu menu) {
|
||||
activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
|
||||
}
|
||||
|
||||
/*public static <T extends WinBoLLActivity> void inflateWinBoLLMenu(T activity, Menu menu) {
|
||||
activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
|
||||
}*/
|
||||
|
||||
public static <T extends Activity> boolean onAppThemeItemSelected(T activity, MenuItem item) {
|
||||
int nThemeStyleID;
|
||||
if (R.id.item_depththeme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_skytheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_goldentheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_bearingtheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_memortheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_taotheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_defaulttheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
// ====================== 菜单点击统一核心逻辑(消除重复代码) ======================
|
||||
/**
|
||||
* 主题菜单项点击统一处理
|
||||
* @param context 上下文(用于持久化)
|
||||
* @param item 点击的菜单项
|
||||
* @return 是否消费点击事件
|
||||
*/
|
||||
public static boolean handleThemeMenuClick(Context context, MenuItem item) {
|
||||
int themeStyleId;
|
||||
int itemId = item.getItemId();
|
||||
if (R.id.item_depththeme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
|
||||
} else if (R.id.item_skytheme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.SKY);
|
||||
} else if (R.id.item_goldentheme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
|
||||
} else if (R.id.item_bearingtheme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.BEARING);
|
||||
} else if (R.id.item_memortheme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
|
||||
} else if (R.id.item_taotheme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.TAO);
|
||||
} else if (R.id.item_defaulttheme == itemId) {
|
||||
themeStyleId = getThemeStyleID(AESThemeBean.ThemeType.AES);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
saveThemeStyleID(context, themeStyleId);
|
||||
return true;
|
||||
}
|
||||
|
||||
public static <T extends AppCompatActivity> boolean onAppCompatThemeItemSelected(T activity, MenuItem item) {
|
||||
int nThemeStyleID;
|
||||
if (R.id.item_depththeme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_skytheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_goldentheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_bearingtheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_memortheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_taotheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_defaulttheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
|
||||
saveThemeStyleID(activity, nThemeStyleID);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
// 对外暴露不同 Activity 类型的入口,内部调用统一核心方法
|
||||
public static boolean onThemeItemSelected(Activity activity, MenuItem item) {
|
||||
return handleThemeMenuClick(activity, item);
|
||||
}
|
||||
|
||||
public static <T extends AppCompatActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) {
|
||||
int nThemeStyleID;
|
||||
if (R.id.item_depththeme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_skytheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_goldentheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_bearingtheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_memortheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_taotheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_defaulttheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
public static boolean onAppCompatThemeItemSelected(AppCompatActivity activity, MenuItem item) {
|
||||
return handleThemeMenuClick(activity, item);
|
||||
}
|
||||
|
||||
public static <T extends DrawerFragmentActivity> boolean onWinBoLLThemeItemSelected(T activity, MenuItem item) {
|
||||
int nThemeStyleID;
|
||||
if (R.id.item_depththeme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_skytheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_goldentheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_bearingtheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.BEARING);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_memortheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_taotheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
} else if (R.id.item_defaulttheme == item.getItemId()) {
|
||||
nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
|
||||
saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
|
||||
return true;
|
||||
}
|
||||
public static boolean onWinBoLLThemeItemSelected(AppCompatActivity activity, MenuItem item) {
|
||||
// 使用 Application 上下文保存,避免 Activity 泄漏
|
||||
return handleThemeMenuClick(activity.getApplicationContext(), item);
|
||||
}
|
||||
|
||||
return false;
|
||||
public static boolean onWinBoLLThemeItemSelected(DrawerFragmentActivity activity, MenuItem item) {
|
||||
return handleThemeMenuClick(activity.getApplicationContext(), item);
|
||||
}
|
||||
|
||||
// ====================== 主题类型转换工具 ======================
|
||||
/**
|
||||
* 根据枚举获取对应样式ID
|
||||
*/
|
||||
public static int getThemeStyleID(AESThemeBean.ThemeType themeType) {
|
||||
return themeStyleIDList.get(themeType.ordinal());
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据样式ID反向获取主题枚举
|
||||
*/
|
||||
public static AESThemeBean.ThemeType getThemeStyleType(int themeStyleID) {
|
||||
for (int i = 0; i < themeStyleIDList.size(); i++) {
|
||||
if (themeStyleIDList.get(i) == themeStyleID) {
|
||||
return AESThemeBean.ThemeType.values()[i];
|
||||
}
|
||||
}
|
||||
return AESThemeBean.ThemeType.values()[0];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,216 @@
|
||||
package cc.winboll.studio.libaes.utils;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.widget.Toast;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import java.util.Properties;
|
||||
import javax.mail.Authenticator;
|
||||
import javax.mail.Message;
|
||||
import javax.mail.PasswordAuthentication;
|
||||
import javax.mail.Session;
|
||||
import javax.mail.Transport;
|
||||
import javax.mail.internet.InternetAddress;
|
||||
import javax.mail.internet.MimeMessage;
|
||||
|
||||
/**
|
||||
* @Author ZhanGSKen<zhangsken@qq.com>
|
||||
* @Date 2026/07/16
|
||||
* @Describe APPMSG邮件发送工具类,使用QQ邮件SMTP服务发送邮件
|
||||
*/
|
||||
public class APPMSGMailUtils {
|
||||
|
||||
public static final String TAG = "APPMSGMailUtils";
|
||||
|
||||
//
|
||||
// SharedPreferences 配置
|
||||
//
|
||||
private static final String SP_NAME = "appmsg_mail_config";
|
||||
private static final String KEY_SMTP_SERVER = "smtp_server";
|
||||
private static final String KEY_SMTP_PORT = "smtp_port";
|
||||
private static final String KEY_SMTP_SENDER = "smtp_sender";
|
||||
private static final String KEY_SMTP_AUTH_CODE = "smtp_auth_code";
|
||||
private static final String KEY_SMTP_RECIPIENT = "smtp_recipient";
|
||||
private static final String KEY_SMTP_ENABLED = "smtp_enabled";
|
||||
|
||||
private static final String DEFAULT_SMTP_SERVER = "smtp.qq.com";
|
||||
private static final String DEFAULT_SMTP_PORT = "465";
|
||||
|
||||
//
|
||||
// 保存SMTP配置到SharedPreferences
|
||||
//
|
||||
public static void saveConfig(Context context, String server, String port,
|
||||
String sender, String authCode, String recipient) {
|
||||
LogUtils.d(TAG, "saveConfig: 开始保存SMTP配置");
|
||||
LogUtils.d(TAG, "saveConfig: server=" + server + ", port=" + port);
|
||||
LogUtils.d(TAG, "saveConfig: sender=" + sender + ", authCode长度=" + (authCode != null ? authCode.length() : 0));
|
||||
LogUtils.d(TAG, "saveConfig: recipient=" + recipient);
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
SharedPreferences.Editor editor = sp.edit();
|
||||
editor.putString(KEY_SMTP_SERVER, server);
|
||||
editor.putString(KEY_SMTP_PORT, port);
|
||||
editor.putString(KEY_SMTP_SENDER, sender);
|
||||
editor.putString(KEY_SMTP_AUTH_CODE, authCode);
|
||||
editor.putString(KEY_SMTP_RECIPIENT, recipient);
|
||||
editor.apply();
|
||||
LogUtils.d(TAG, "saveConfig: SMTP配置已保存完成");
|
||||
}
|
||||
|
||||
//
|
||||
// 从SharedPreferences读取SMTP配置
|
||||
//
|
||||
public static String getServer(Context context) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
String value = sp.getString(KEY_SMTP_SERVER, DEFAULT_SMTP_SERVER);
|
||||
LogUtils.d(TAG, "getServer: " + value);
|
||||
return value;
|
||||
}
|
||||
|
||||
public static String getPort(Context context) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
String value = sp.getString(KEY_SMTP_PORT, DEFAULT_SMTP_PORT);
|
||||
LogUtils.d(TAG, "getPort: " + value);
|
||||
return value;
|
||||
}
|
||||
|
||||
public static String getSender(Context context) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
String value = sp.getString(KEY_SMTP_SENDER, "");
|
||||
LogUtils.d(TAG, "getSender: " + value);
|
||||
return value;
|
||||
}
|
||||
|
||||
public static String getAuthCode(Context context) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
String value = sp.getString(KEY_SMTP_AUTH_CODE, "");
|
||||
LogUtils.d(TAG, "getAuthCode: 长度=" + (value != null ? value.length() : 0));
|
||||
return value;
|
||||
}
|
||||
|
||||
public static String getRecipient(Context context) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
String value = sp.getString(KEY_SMTP_RECIPIENT, "");
|
||||
LogUtils.d(TAG, "getRecipient: " + value);
|
||||
return value;
|
||||
}
|
||||
|
||||
//
|
||||
// SMTP邮件发送开关
|
||||
//
|
||||
public static void setEnabled(Context context, boolean enabled) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
SharedPreferences.Editor editor = sp.edit();
|
||||
editor.putBoolean(KEY_SMTP_ENABLED, enabled);
|
||||
editor.apply();
|
||||
LogUtils.d(TAG, "setEnabled: " + enabled);
|
||||
}
|
||||
|
||||
public static boolean isEnabled(Context context) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
return sp.getBoolean(KEY_SMTP_ENABLED, false);
|
||||
}
|
||||
|
||||
//
|
||||
// 发送邮件(异步,在后台线程执行)
|
||||
//
|
||||
public static void sendMail(final Context context, final String subject,
|
||||
final String content, final String recipients) {
|
||||
LogUtils.d(TAG, "sendMail: ====== 开始调用sendMail ======");
|
||||
LogUtils.d(TAG, "sendMail: subject=" + subject);
|
||||
LogUtils.d(TAG, "sendMail: content长度=" + (content != null ? content.length() : 0));
|
||||
LogUtils.d(TAG, "sendMail: recipients=" + recipients);
|
||||
boolean enabled = isEnabled(context);
|
||||
LogUtils.d(TAG, "sendMail: isEnabled=" + enabled);
|
||||
if (!enabled) {
|
||||
LogUtils.d(TAG, "sendMail: SMTP邮件发送已禁用,跳过操作");
|
||||
return;
|
||||
}
|
||||
final String server = getServer(context);
|
||||
final String port = getPort(context);
|
||||
final String sender = getSender(context);
|
||||
final String authCode = getAuthCode(context);
|
||||
LogUtils.d(TAG, "sendMail: server=" + server + ", port=" + port);
|
||||
LogUtils.d(TAG, "sendMail: sender=" + sender + ", authCode长度=" + (authCode != null ? authCode.length() : 0));
|
||||
LogUtils.d(TAG, "sendMail: recipients=" + recipients);
|
||||
|
||||
if (sender == null || sender.length() == 0) {
|
||||
LogUtils.w(TAG, "sendMail: 请先配置发件人邮箱");
|
||||
showToast(context, "请先配置发件人邮箱");
|
||||
return;
|
||||
}
|
||||
if (authCode == null || authCode.length() == 0) {
|
||||
LogUtils.w(TAG, "sendMail: 请先配置邮箱授权码");
|
||||
showToast(context, "请先配置邮箱授权码");
|
||||
return;
|
||||
}
|
||||
if (recipients == null || recipients.length() == 0) {
|
||||
LogUtils.w(TAG, "sendMail: 收件人不能为空");
|
||||
showToast(context, "收件人不能为空");
|
||||
return;
|
||||
}
|
||||
|
||||
LogUtils.d(TAG, "sendMail: 参数校验通过,准备启动发送线程");
|
||||
showToast(context, "正在发送邮件...");
|
||||
|
||||
new Thread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
LogUtils.d(TAG, "sendMail: 发送线程已启动");
|
||||
try {
|
||||
LogUtils.d(TAG, "sendMail: 创建邮件属性配置");
|
||||
Properties props = new Properties();
|
||||
props.put("mail.smtp.host", server);
|
||||
props.put("mail.smtp.port", port);
|
||||
props.put("mail.smtp.auth", "true");
|
||||
props.put("mail.smtp.socketFactory.port", port);
|
||||
props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
|
||||
|
||||
LogUtils.d(TAG, "sendMail: 创建邮件会话");
|
||||
Session session = Session.getInstance(props, new Authenticator() {
|
||||
@Override
|
||||
protected PasswordAuthentication getPasswordAuthentication() {
|
||||
LogUtils.d(TAG, "sendMail: 身份验证回调触发");
|
||||
return new PasswordAuthentication(sender, authCode);
|
||||
}
|
||||
});
|
||||
|
||||
LogUtils.d(TAG, "sendMail: 创建MimeMessage");
|
||||
MimeMessage message = new MimeMessage(session);
|
||||
message.setFrom(new InternetAddress(sender));
|
||||
message.setRecipients(Message.RecipientType.TO,
|
||||
InternetAddress.parse(recipients));
|
||||
message.setSubject(subject);
|
||||
message.setText(content);
|
||||
|
||||
LogUtils.d(TAG, "sendMail: 调用Transport.send开始发送");
|
||||
Transport.send(message);
|
||||
|
||||
LogUtils.d(TAG, "sendMail: 邮件发送成功");
|
||||
showToast(context, "邮件发送成功");
|
||||
} catch (Exception e) {
|
||||
LogUtils.e(TAG, "sendMail: 邮件发送异常", e);
|
||||
showToast(context, "邮件发送失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
}).start();
|
||||
LogUtils.d(TAG, "sendMail: ====== sendMail调用结束 ======");
|
||||
}
|
||||
|
||||
//
|
||||
// 在主线程显示Toast提示
|
||||
//
|
||||
private static void showToast(final Context context, final String message) {
|
||||
if (context == null || message == null) {
|
||||
return;
|
||||
}
|
||||
new Handler(Looper.getMainLooper()).post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
Toast.makeText(context.getApplicationContext(),
|
||||
message, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,113 @@
|
||||
package cc.winboll.studio.libaes.views;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.CompoundButton;
|
||||
import android.widget.EditText;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.Toast;
|
||||
import cc.winboll.studio.libaes.R;
|
||||
import cc.winboll.studio.libaes.utils.APPMSGMailUtils;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
|
||||
/**
|
||||
* @Author ZhanGSKen<zhangsken@qq.com>
|
||||
* @Date 2026/07/16
|
||||
* @Describe SMTP邮件配置视图控件,用于设置QQ邮件SMTP服务参数
|
||||
*/
|
||||
public class SMTPConfigView extends LinearLayout {
|
||||
|
||||
public static final String TAG = "SMTPConfigView";
|
||||
|
||||
private EditText mEtServer;
|
||||
private EditText mEtPort;
|
||||
private EditText mEtSender;
|
||||
private EditText mEtAuthCode;
|
||||
private EditText mEtRecipient;
|
||||
private CheckBox mCbEnabled;
|
||||
|
||||
public SMTPConfigView(Context context) {
|
||||
super(context);
|
||||
initView(context);
|
||||
}
|
||||
|
||||
public SMTPConfigView(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
initView(context);
|
||||
}
|
||||
|
||||
private void initView(Context context) {
|
||||
LogUtils.d(TAG, "initView: 初始化SMTP配置视图");
|
||||
View.inflate(context, R.layout.view_smtp_config, this);
|
||||
|
||||
mEtServer = (EditText) findViewById(R.id.et_smtp_server);
|
||||
mEtPort = (EditText) findViewById(R.id.et_smtp_port);
|
||||
mEtSender = (EditText) findViewById(R.id.et_smtp_sender);
|
||||
mEtAuthCode = (EditText) findViewById(R.id.et_smtp_auth_code);
|
||||
mEtRecipient = (EditText) findViewById(R.id.et_smtp_recipient);
|
||||
mCbEnabled = (CheckBox) findViewById(R.id.cb_smtp_enabled);
|
||||
|
||||
mCbEnabled.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||
@Override
|
||||
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
||||
APPMSGMailUtils.setEnabled(getContext(), isChecked);
|
||||
}
|
||||
});
|
||||
|
||||
// 加载已保存的配置
|
||||
loadConfig();
|
||||
|
||||
// 保存按钮点击事件
|
||||
findViewById(R.id.btn_smtp_save).setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
saveConfig();
|
||||
}
|
||||
});
|
||||
|
||||
// 发送测试邮件按钮点击事件
|
||||
findViewById(R.id.btn_smtp_test_send).setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
saveConfig();
|
||||
Context ctx = getContext();
|
||||
String recipient = mEtRecipient.getText().toString().trim();
|
||||
APPMSGMailUtils.sendMail(ctx, "SMTP测试邮件",
|
||||
"这是一封SMTP配置测试邮件。如果您收到此邮件,说明SMTP配置正确。",
|
||||
recipient);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//
|
||||
// 从SharedPreferences加载已保存的SMTP配置
|
||||
//
|
||||
private void loadConfig() {
|
||||
Context context = getContext();
|
||||
mEtServer.setText(APPMSGMailUtils.getServer(context));
|
||||
mEtPort.setText(APPMSGMailUtils.getPort(context));
|
||||
mEtSender.setText(APPMSGMailUtils.getSender(context));
|
||||
mEtAuthCode.setText(APPMSGMailUtils.getAuthCode(context));
|
||||
mEtRecipient.setText(APPMSGMailUtils.getRecipient(context));
|
||||
mCbEnabled.setChecked(APPMSGMailUtils.isEnabled(context));
|
||||
LogUtils.d(TAG, "loadConfig: SMTP配置已加载");
|
||||
}
|
||||
|
||||
//
|
||||
// 将当前输入的SMTP配置保存到SharedPreferences
|
||||
//
|
||||
private void saveConfig() {
|
||||
Context context = getContext();
|
||||
String server = mEtServer.getText().toString().trim();
|
||||
String port = mEtPort.getText().toString().trim();
|
||||
String sender = mEtSender.getText().toString().trim();
|
||||
String authCode = mEtAuthCode.getText().toString().trim();
|
||||
String recipient = mEtRecipient.getText().toString().trim();
|
||||
|
||||
APPMSGMailUtils.saveConfig(context, server, port, sender, authCode, recipient);
|
||||
Toast.makeText(context, "SMTP配置已保存", Toast.LENGTH_SHORT).show();
|
||||
LogUtils.d(TAG, "saveConfig: SMTP配置已保存");
|
||||
}
|
||||
}
|
||||
@@ -56,10 +56,5 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<cc.winboll.studio.libaes.views.ADsBannerView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/adsbanner"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="16dp"
|
||||
android:background="@drawable/bg_container_border">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="SMTP邮件配置"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold"
|
||||
android:layout_marginBottom="12dp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="SMTP服务器"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginTop="8dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_smtp_server"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="smtp.qq.com"
|
||||
android:inputType="textUri"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="端口"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginTop="8dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_smtp_port"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="465"
|
||||
android:inputType="number"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="发件人邮箱"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginTop="8dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_smtp_sender"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="your@qq.com"
|
||||
android:inputType="textEmailAddress"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="授权码"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginTop="8dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_smtp_auth_code"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="QQ邮箱授权码"
|
||||
android:inputType="textPassword"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="默认收件人"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginTop="8dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_smtp_recipient"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="recipient@example.com"
|
||||
android:inputType="textEmailAddress"/>
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_smtp_enabled"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="启用SMTP邮件发送"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginTop="12dp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_smtp_save"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="保存配置"
|
||||
android:layout_marginTop="16dp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_smtp_test_send"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="发送测试邮件"
|
||||
android:layout_marginTop="8dp"/>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -3,15 +3,15 @@
|
||||
|
||||
<color name="colorTextColor">#FFFFFFFF</color>
|
||||
<color name="colorPrimary">#FF03AB4E</color>
|
||||
<color name="colorPrimaryDark">#FF027C39</color>
|
||||
<color name="colorAccent">#FF3DDC84</color>
|
||||
<color name="colorPrimaryDark">#FF3DDC84</color>
|
||||
<color name="colorAccent">#FF027C39</color>
|
||||
<color name="colorText">#FFFFFB8D</color>
|
||||
<color name="colorToastFrame">#FFA9A9A9</color>
|
||||
<color name="colorToastFrame">#FF555555</color>
|
||||
<color name="colorToastShadow">#FF000000</color>
|
||||
<color name="colorToastBackgroung">#FFFFFFFF</color>
|
||||
<color name="colorAToolbarStartColor">#FF7D3F12</color>
|
||||
<color name="colorAToolbarCenterColor">#FFCC6E2B</color>
|
||||
<color name="colorAToolbarEndColor">#FFF4B98F</color>
|
||||
<color name="colorToastBackgroung">#FF3A3A3A</color>
|
||||
<color name="colorAToolbarStartColor">#FF5A3A1A</color>
|
||||
<color name="colorAToolbarCenterColor">#FFA05A2A</color>
|
||||
<color name="colorAToolbarEndColor">#FFD4A07A</color>
|
||||
|
||||
<color name="colorACardShadow">@color/colorPrimaryDark</color>
|
||||
<color name="colorACardFrame">@color/colorPrimary</color>
|
||||
@@ -24,7 +24,7 @@
|
||||
<color name="colorOHPCTSSecondaryProgress">@color/colorPrimary</color>
|
||||
<color name="colorOHPCTSProgress">@color/colorPrimaryDark</color>
|
||||
|
||||
<color name="toolbarBackgroundColor">#FF03AB4E</color>
|
||||
<color name="toolbarBackgroundColor">#FF3DDC84</color>
|
||||
<color name="toolbarTextColor">#FFFFFFFF</color>
|
||||
<color name="mainWindowBackgroundColor">#FF2C2C2C</color>
|
||||
<color name="mainWindowTextColor">#FFFFFFFF</color>
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
<resources>
|
||||
|
||||
<style name="AESTheme" parent="Theme.AppCompat.NoActionBar">
|
||||
<item name="colorPrimary">#FF03AB4E</item>
|
||||
<item name="colorPrimaryDark">#FF3DDC84</item>
|
||||
<item name="colorAccent">#FF027C39</item>
|
||||
<item name="themeDebug">@style/DebugActivityTheme</item>
|
||||
<item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||
<item name="aboutViewTextColor">@color/mainWindowTextColor</item>
|
||||
@@ -22,7 +25,7 @@
|
||||
<item name="mainWindowTextColor">@color/mainWindowTextColor</item>
|
||||
<item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||
<item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
|
||||
<item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
|
||||
|
||||
<item name="aToolbar">@style/AESAToolbar</item>
|
||||
<item name="aSupportToolbar">@style/AESASupportToolbar</item>
|
||||
@@ -40,52 +43,52 @@
|
||||
|
||||
<style name="AESAToolbar">
|
||||
<item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
|
||||
<item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
|
||||
<item name="attrAToolbarCenterColor">@color/colorPrimary</item>
|
||||
<item name="attrAToolbarEndColor">@color/colorAccent</item>
|
||||
<item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
|
||||
<item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
|
||||
<item name="attrAToolbarEndColor">?attr/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="AESASupportToolbar">
|
||||
<item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
|
||||
<item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
|
||||
<item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
|
||||
<item name="attrASupportToolbarEndColor">@color/colorAccent</item>
|
||||
<item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
|
||||
<item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
|
||||
<item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="DepthAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FF0065EC</item>
|
||||
<item name="colorPrimaryDark">#FF004DB4</item>
|
||||
<item name="colorAccent">#FF4A97FF</item>
|
||||
<item name="colorPrimaryDark">#FF4A97FF</item>
|
||||
<item name="colorAccent">#FF004DB4</item>
|
||||
</style>
|
||||
|
||||
<style name="SkyAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FF00A6FF</item>
|
||||
<item name="colorPrimaryDark">#FF007ABB</item>
|
||||
<item name="colorAccent">#FF84D4FF</item>
|
||||
<item name="colorPrimaryDark">#FF84D4FF</item>
|
||||
<item name="colorAccent">#FF007ABB</item>
|
||||
</style>
|
||||
|
||||
<style name="GoldenAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FFF0CA11</item>
|
||||
<item name="colorPrimaryDark">#FFD3AF00</item>
|
||||
<item name="colorAccent">#FFFFE35C</item>
|
||||
<item name="colorPrimaryDark">#FFFFE35C</item>
|
||||
<item name="colorAccent">#FFD3AF00</item>
|
||||
</style>
|
||||
|
||||
<style name="BearingAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FF840FFF</item>
|
||||
<item name="colorPrimaryDark">#FF6900D7</item>
|
||||
<item name="colorAccent">#FFBA78FF</item>
|
||||
<item name="colorPrimaryDark">#FFBA78FF</item>
|
||||
<item name="colorAccent">#FF6900D7</item>
|
||||
</style>
|
||||
|
||||
<style name="MemorAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FFFF00F5</item>
|
||||
<item name="colorPrimaryDark">#FFE500DC</item>
|
||||
<item name="colorAccent">#FFFF76FA</item>
|
||||
<item name="colorPrimaryDark">#FFFF76FA</item>
|
||||
<item name="colorAccent">#FFE500DC</item>
|
||||
</style>
|
||||
|
||||
<style name="TaoAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FFACACAC</item>
|
||||
<item name="colorPrimaryDark">#FF898989</item>
|
||||
<item name="colorAccent">#FFD8D8D8</item>
|
||||
<item name="colorPrimary">#FF7E7E7E</item>
|
||||
<item name="colorPrimaryDark">#FFE2E2E2</item>
|
||||
<item name="colorAccent">#FF000000</item>
|
||||
</style>
|
||||
|
||||
<style name="NormalDialogStyle" parent="Theme.AppCompat.Dialog">
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
<resources>
|
||||
|
||||
<style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="colorPrimary">#FF03AB4E</item>
|
||||
<item name="colorPrimaryDark">#FF027C39</item>
|
||||
<item name="colorAccent">#FF3DDC84</item>
|
||||
<item name="themeDebug">@style/DebugActivityTheme</item>
|
||||
<item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||
<item name="aboutViewTextColor">@color/mainWindowTextColor</item>
|
||||
@@ -22,7 +25,7 @@
|
||||
<item name="mainWindowTextColor">@color/mainWindowTextColor</item>
|
||||
<item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||
<item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
|
||||
<item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
|
||||
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
|
||||
|
||||
<item name="aToolbar">@style/AESAToolbar</item>
|
||||
<item name="aSupportToolbar">@style/AESASupportToolbar</item>
|
||||
@@ -40,16 +43,16 @@
|
||||
|
||||
<style name="AESAToolbar">
|
||||
<item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
|
||||
<item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
|
||||
<item name="attrAToolbarCenterColor">@color/colorPrimary</item>
|
||||
<item name="attrAToolbarEndColor">@color/colorAccent</item>
|
||||
<item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
|
||||
<item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
|
||||
<item name="attrAToolbarEndColor">?attr/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="AESASupportToolbar">
|
||||
<item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
|
||||
<item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
|
||||
<item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
|
||||
<item name="attrASupportToolbarEndColor">@color/colorAccent</item>
|
||||
<item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
|
||||
<item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
|
||||
<item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="DepthAESTheme" parent="AESTheme">
|
||||
@@ -83,9 +86,9 @@
|
||||
</style>
|
||||
|
||||
<style name="TaoAESTheme" parent="AESTheme">
|
||||
<item name="colorPrimary">#FFACACAC</item>
|
||||
<item name="colorPrimaryDark">#FF898989</item>
|
||||
<item name="colorAccent">#FFD8D8D8</item>
|
||||
<item name="colorPrimary">#FF7E7E7E</item>
|
||||
<item name="colorPrimaryDark">#FF000000</item>
|
||||
<item name="colorAccent">#FFE2E2E2</item>
|
||||
</style>
|
||||
|
||||
<style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog">
|
||||
@@ -109,4 +112,4 @@
|
||||
<item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
</resources>
|
||||
|
||||
@@ -26,4 +26,6 @@ android {
|
||||
|
||||
dependencies {
|
||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||
api 'com.sun.mail:android-mail:1.6.7'
|
||||
api 'com.sun.mail:android-activation:1.6.7'
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Sun May 24 09:53:05 HKT 2026
|
||||
stageCount=22
|
||||
#Thu Jul 23 19:07:39 HKT 2026
|
||||
stageCount=5
|
||||
libraryProject=libappbase
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.21
|
||||
baseVersion=15.21
|
||||
publishVersion=15.21.4
|
||||
buildCount=0
|
||||
baseBetaVersion=15.20.22
|
||||
baseBetaVersion=15.21.5
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
android:networkSecurityConfig="@xml/network_security_config">
|
||||
|
||||
<activity
|
||||
android:name=".CrashHandler$CrashActivity"
|
||||
android:name=".CrashActivity"
|
||||
android:label="CrashActivity"
|
||||
android:launchMode="singleInstance"
|
||||
android:process=":CrashActivity"/>
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
package cc.winboll.studio.libappbase;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.ClipData;
|
||||
import android.content.ClipboardManager;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.res.Resources;
|
||||
import android.os.Bundle;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.HorizontalScrollView;
|
||||
import android.widget.ScrollView;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
import cc.winboll.studio.libappbase.common.ViewColorTable;
|
||||
|
||||
public final class CrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
|
||||
private static final int MENUITEM_COPY = 0;
|
||||
private static final int MENUITEM_RESTART = 1;
|
||||
|
||||
private String mLog;
|
||||
|
||||
@Override
|
||||
protected void onCreate(final Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
AppCrashSafetyWire.getInstance().postResumeCrashSafetyWireHandler(getApplicationContext());
|
||||
mLog = getIntent().getStringExtra(CrashHandler.EXTRA_CRASH_LOG);
|
||||
setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
|
||||
initLayout();
|
||||
}
|
||||
|
||||
private void initLayout() {
|
||||
ScrollView contentView = new ScrollView(this);
|
||||
contentView.setFillViewport(true);
|
||||
|
||||
HorizontalScrollView hw = new HorizontalScrollView(this);
|
||||
hw.setBackgroundColor(ViewColorTable.ListItemBgPressedColor);
|
||||
|
||||
TextView message = new TextView(this);
|
||||
final int padding = dp2px(16);
|
||||
message.setPadding(padding, padding, padding, padding);
|
||||
message.setText(mLog);
|
||||
message.setTextColor(ViewColorTable.TextPrimaryColor);
|
||||
message.setTextIsSelectable(true);
|
||||
|
||||
hw.addView(message);
|
||||
contentView.addView(hw, ViewGroup.LayoutParams.MATCH_PARENT,
|
||||
ViewGroup.LayoutParams.MATCH_PARENT);
|
||||
setContentView(contentView);
|
||||
|
||||
getActionBar().setTitle(CrashHandler.TITTLE);
|
||||
getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()) + " Error");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackPressed() {
|
||||
restartApp();
|
||||
}
|
||||
|
||||
private void restartApp() {
|
||||
final Intent intent = getPackageManager()
|
||||
.getLaunchIntentForPackage(getPackageName());
|
||||
if (intent != null) {
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
|
||||
| Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
| Intent.FLAG_ACTIVITY_CLEAR_TASK);
|
||||
startActivity(intent);
|
||||
}
|
||||
finish();
|
||||
android.os.Process.killProcess(android.os.Process.myPid());
|
||||
System.exit(0);
|
||||
}
|
||||
|
||||
private int dp2px(final float dpValue) {
|
||||
final float scale = Resources.getSystem().getDisplayMetrics().density;
|
||||
return (int) (dpValue * scale + 0.5f);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(final Menu menu) {
|
||||
menu.add(0, MENUITEM_COPY, 0, "Copy")
|
||||
.setOnMenuItemClickListener(this)
|
||||
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
||||
|
||||
menu.add(0, MENUITEM_RESTART, 0, "Restart")
|
||||
.setOnMenuItemClickListener(this)
|
||||
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onMenuItemClick(final MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
case MENUITEM_COPY:
|
||||
ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
|
||||
cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
|
||||
Toast.makeText(getApplication(), "The text is copied.", Toast.LENGTH_SHORT).show();
|
||||
break;
|
||||
case MENUITEM_RESTART:
|
||||
AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
|
||||
restartApp();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1,27 +1,13 @@
|
||||
package cc.winboll.studio.libappbase;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.Application;
|
||||
import android.content.ActivityNotFoundException;
|
||||
import android.content.ClipData;
|
||||
import android.content.ClipboardManager;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.res.Resources;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.text.TextUtils;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.HorizontalScrollView;
|
||||
import android.widget.ScrollView;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
|
||||
|
||||
@@ -220,111 +206,5 @@ public final class CrashHandler {
|
||||
}
|
||||
}
|
||||
|
||||
// ====================== 内部Activity页面 ======================
|
||||
/**
|
||||
* 基础极简崩溃页面
|
||||
* 保险丝熔断时启动,避免复杂布局二次崩溃
|
||||
*/
|
||||
public static final class CrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
|
||||
private static final int MENUITEM_COPY = 0;
|
||||
private static final int MENUITEM_RESTART = 1;
|
||||
|
||||
private String mLog;
|
||||
|
||||
@Override
|
||||
protected void onCreate(final Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
AppCrashSafetyWire.getInstance().postResumeCrashSafetyWireHandler(getApplicationContext());
|
||||
mLog = getIntent().getStringExtra(EXTRA_CRASH_LOG);
|
||||
setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
|
||||
initLayout();
|
||||
}
|
||||
|
||||
/**
|
||||
* 动态初始化布局
|
||||
*/
|
||||
private void initLayout() {
|
||||
ScrollView contentView = new ScrollView(this);
|
||||
contentView.setFillViewport(true);
|
||||
|
||||
HorizontalScrollView hw = new HorizontalScrollView(this);
|
||||
hw.setBackgroundColor(0xFFF5F5F5);
|
||||
|
||||
TextView message = new TextView(this);
|
||||
final int padding = dp2px(16);
|
||||
message.setPadding(padding, padding, padding, padding);
|
||||
message.setText(mLog);
|
||||
message.setTextColor(0xFF000000);
|
||||
message.setTextIsSelectable(true);
|
||||
|
||||
hw.addView(message);
|
||||
contentView.addView(hw, ViewGroup.LayoutParams.MATCH_PARENT,
|
||||
ViewGroup.LayoutParams.MATCH_PARENT);
|
||||
setContentView(contentView);
|
||||
|
||||
getActionBar().setTitle(TITTLE);
|
||||
getActionBar().setSubtitle(GlobalApplication.class.getSimpleName() + " Error");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackPressed() {
|
||||
restartApp();
|
||||
}
|
||||
|
||||
/**
|
||||
* 重启应用
|
||||
*/
|
||||
private void restartApp() {
|
||||
final Intent intent = getPackageManager()
|
||||
.getLaunchIntentForPackage(getPackageName());
|
||||
if (intent != null) {
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
|
||||
| Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
| Intent.FLAG_ACTIVITY_CLEAR_TASK);
|
||||
startActivity(intent);
|
||||
}
|
||||
finish();
|
||||
android.os.Process.killProcess(android.os.Process.myPid());
|
||||
System.exit(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* dp转px
|
||||
*/
|
||||
private int dp2px(final float dpValue) {
|
||||
final float scale = Resources.getSystem().getDisplayMetrics().density;
|
||||
return (int) (dpValue * scale + 0.5f);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(final Menu menu) {
|
||||
menu.add(0, MENUITEM_COPY, 0, "Copy")
|
||||
.setOnMenuItemClickListener(this)
|
||||
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
||||
|
||||
menu.add(0, MENUITEM_RESTART, 0, "Restart")
|
||||
.setOnMenuItemClickListener(this)
|
||||
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onMenuItemClick(final MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
case MENUITEM_COPY:
|
||||
ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
|
||||
cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
|
||||
Toast.makeText(getApplication(), "The text is copied.", Toast.LENGTH_SHORT).show();
|
||||
break;
|
||||
case MENUITEM_RESTART:
|
||||
AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
|
||||
restartApp();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,6 +6,10 @@ import android.content.SharedPreferences;
|
||||
import android.content.pm.ApplicationInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.PackageManager.NameNotFoundException;
|
||||
import android.util.Log;
|
||||
import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
|
||||
import java.io.PrintWriter;
|
||||
import java.io.StringWriter;
|
||||
|
||||
/**
|
||||
* @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
|
||||
@@ -125,17 +129,32 @@ public class GlobalApplication extends Application {
|
||||
*/
|
||||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
// 初始化单例实例(确保在所有初始化操作前完成)
|
||||
sInstance = this;
|
||||
try {
|
||||
super.onCreate();
|
||||
|
||||
// 初始化单例实例(确保在所有初始化操作前完成)
|
||||
sInstance = this;
|
||||
|
||||
restoreDebugStatus();
|
||||
// 初始化基础组件(日志、崩溃处理、Toast)
|
||||
initCoreComponents();
|
||||
// 初始化服务器地址(从 SP 读取到内存,提高后续访问效率)
|
||||
initWinbollHost();
|
||||
restoreDebugStatus();
|
||||
// 初始化基础组件(日志、崩溃处理、Toast)
|
||||
initCoreComponents();
|
||||
// 初始化服务器地址(从 SP 读取到内存,提高后续访问效率)
|
||||
initWinbollHost();
|
||||
|
||||
LogUtils.d(TAG, "GlobalApplication 初始化完成,单例实例已创建");
|
||||
LogUtils.d(TAG, "GlobalApplication 初始化完成,单例实例已创建");
|
||||
} catch (Throwable e) {
|
||||
StringWriter sw = new StringWriter();
|
||||
PrintWriter pw = new PrintWriter(sw);
|
||||
e.printStackTrace(pw);
|
||||
pw.close();
|
||||
String stackTraceStr = sw.toString();
|
||||
CrashHandleNotifyUtils.handleUncaughtException(
|
||||
this,
|
||||
getPackageName(),
|
||||
stackTraceStr,
|
||||
CrashActivity.class
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -190,7 +209,7 @@ public class GlobalApplication extends Application {
|
||||
*/
|
||||
public static String getAppName(Context context) {
|
||||
if (context == null) {
|
||||
LogUtils.w(TAG, "getAppName: 上下文为空,返回 null");
|
||||
Log.w(TAG, "getAppName: 上下文为空,返回 null");
|
||||
return null;
|
||||
}
|
||||
PackageManager packageManager = context.getPackageManager();
|
||||
@@ -206,8 +225,7 @@ public class GlobalApplication extends Application {
|
||||
return appName;
|
||||
} catch (NameNotFoundException e) {
|
||||
// 包名不存在(理论上不会发生,捕获异常避免崩溃)
|
||||
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
|
||||
//LogUtils.e(TAG, "获取应用名称失败:包名不存在", e);
|
||||
Log.e(TAG, "获取应用名称失败:包名不存在", e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
|
||||
@@ -66,7 +66,7 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe
|
||||
mCrashLog = getIntent().getStringExtra(CrashHandler.EXTRA_CRASH_LOG);
|
||||
final Intent intent = new Intent();
|
||||
intent.putExtra(CrashHandler.EXTRA_CRASH_LOG, mCrashLog);
|
||||
CrashHandleNotifyUtils.handleUncaughtException(GlobalApplication.getInstance(), intent, CrashHandler.CrashActivity.class);
|
||||
CrashHandleNotifyUtils.handleUncaughtException(GlobalApplication.getInstance(), intent, CrashActivity.class);
|
||||
|
||||
StackTraceElement[] stackElements = Thread.currentThread().getStackTrace();
|
||||
StringBuilder sb = new StringBuilder("GlobalCrashActivity onCreate StackTrace");
|
||||
|
||||
@@ -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,216 @@
|
||||
package cc.winboll.studio.libappbase.utils;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.os.Message;
|
||||
import android.widget.Toast;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import java.util.Properties;
|
||||
import javax.mail.Authenticator;
|
||||
import javax.mail.MessagingException;
|
||||
import javax.mail.PasswordAuthentication;
|
||||
import javax.mail.Session;
|
||||
import javax.mail.Transport;
|
||||
import javax.mail.internet.InternetAddress;
|
||||
import javax.mail.internet.MimeMessage;
|
||||
/**
|
||||
* @Author 豆包&BigPickle&MiMo&ZhanGSKen<zhangsken@qq.com>
|
||||
* @Date 2026/07/23 17:36
|
||||
* @Describe APPMSG邮件发送工具类,使用QQ邮件SMTP服务发送邮件
|
||||
*/
|
||||
public class APPMSGMailUtils {
|
||||
|
||||
public static final String TAG = "APPMSGMailUtils";
|
||||
|
||||
//
|
||||
// SharedPreferences 配置
|
||||
//
|
||||
private static final String SP_NAME = "appmsg_mail_config";
|
||||
private static final String KEY_SMTP_SERVER = "smtp_server";
|
||||
private static final String KEY_SMTP_PORT = "smtp_port";
|
||||
private static final String KEY_SMTP_SENDER = "smtp_sender";
|
||||
private static final String KEY_SMTP_AUTH_CODE = "smtp_auth_code";
|
||||
private static final String KEY_SMTP_RECIPIENT = "smtp_recipient";
|
||||
private static final String KEY_SMTP_ENABLED = "smtp_enabled";
|
||||
|
||||
private static final String DEFAULT_SMTP_SERVER = "smtp.qq.com";
|
||||
private static final String DEFAULT_SMTP_PORT = "465";
|
||||
|
||||
//
|
||||
// 保存SMTP配置到SharedPreferences
|
||||
//
|
||||
public static void saveConfig(Context context, String server, String port,
|
||||
String sender, String authCode, String recipient) {
|
||||
LogUtils.d(TAG, "saveConfig: 开始保存SMTP配置");
|
||||
LogUtils.d(TAG, "saveConfig: server=" + server + ", port=" + port);
|
||||
LogUtils.d(TAG, "saveConfig: sender=" + sender + ", authCode长度=" + (authCode != null ? authCode.length() : 0));
|
||||
LogUtils.d(TAG, "saveConfig: recipient=" + recipient);
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
SharedPreferences.Editor editor = sp.edit();
|
||||
editor.putString(KEY_SMTP_SERVER, server);
|
||||
editor.putString(KEY_SMTP_PORT, port);
|
||||
editor.putString(KEY_SMTP_SENDER, sender);
|
||||
editor.putString(KEY_SMTP_AUTH_CODE, authCode);
|
||||
editor.putString(KEY_SMTP_RECIPIENT, recipient);
|
||||
editor.apply();
|
||||
LogUtils.d(TAG, "saveConfig: SMTP配置已保存完成");
|
||||
}
|
||||
|
||||
//
|
||||
// 从SharedPreferences读取SMTP配置
|
||||
//
|
||||
public static String getServer(Context context) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
String value = sp.getString(KEY_SMTP_SERVER, DEFAULT_SMTP_SERVER);
|
||||
LogUtils.d(TAG, "getServer: " + value);
|
||||
return value;
|
||||
}
|
||||
|
||||
public static String getPort(Context context) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
String value = sp.getString(KEY_SMTP_PORT, DEFAULT_SMTP_PORT);
|
||||
LogUtils.d(TAG, "getPort: " + value);
|
||||
return value;
|
||||
}
|
||||
|
||||
public static String getSender(Context context) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
String value = sp.getString(KEY_SMTP_SENDER, "");
|
||||
LogUtils.d(TAG, "getSender: " + value);
|
||||
return value;
|
||||
}
|
||||
|
||||
public static String getAuthCode(Context context) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
String value = sp.getString(KEY_SMTP_AUTH_CODE, "");
|
||||
LogUtils.d(TAG, "getAuthCode: 长度=" + (value != null ? value.length() : 0));
|
||||
return value;
|
||||
}
|
||||
|
||||
public static String getRecipient(Context context) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
String value = sp.getString(KEY_SMTP_RECIPIENT, "");
|
||||
LogUtils.d(TAG, "getRecipient: " + value);
|
||||
return value;
|
||||
}
|
||||
|
||||
//
|
||||
// SMTP邮件发送开关
|
||||
//
|
||||
public static void setEnabled(Context context, boolean enabled) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
SharedPreferences.Editor editor = sp.edit();
|
||||
editor.putBoolean(KEY_SMTP_ENABLED, enabled);
|
||||
editor.apply();
|
||||
LogUtils.d(TAG, "setEnabled: " + enabled);
|
||||
}
|
||||
|
||||
public static boolean isEnabled(Context context) {
|
||||
SharedPreferences sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
|
||||
return sp.getBoolean(KEY_SMTP_ENABLED, false);
|
||||
}
|
||||
|
||||
//
|
||||
// 发送邮件(异步,在后台线程执行)
|
||||
//
|
||||
public static void sendMail(final Context context, final String subject,
|
||||
final String content, final String recipients) {
|
||||
LogUtils.d(TAG, "sendMail: ====== 开始调用sendMail ======");
|
||||
LogUtils.d(TAG, "sendMail: subject=" + subject);
|
||||
LogUtils.d(TAG, "sendMail: content长度=" + (content != null ? content.length() : 0));
|
||||
LogUtils.d(TAG, "sendMail: recipients=" + recipients);
|
||||
boolean enabled = isEnabled(context);
|
||||
LogUtils.d(TAG, "sendMail: isEnabled=" + enabled);
|
||||
if (!enabled) {
|
||||
LogUtils.d(TAG, "sendMail: SMTP邮件发送已禁用,跳过操作");
|
||||
return;
|
||||
}
|
||||
final String server = getServer(context);
|
||||
final String port = getPort(context);
|
||||
final String sender = getSender(context);
|
||||
final String authCode = getAuthCode(context);
|
||||
LogUtils.d(TAG, "sendMail: server=" + server + ", port=" + port);
|
||||
LogUtils.d(TAG, "sendMail: sender=" + sender + ", authCode长度=" + (authCode != null ? authCode.length() : 0));
|
||||
LogUtils.d(TAG, "sendMail: recipients=" + recipients);
|
||||
|
||||
if (sender == null || sender.length() == 0) {
|
||||
LogUtils.w(TAG, "sendMail: 请先配置发件人邮箱");
|
||||
showToast(context, "请先配置发件人邮箱");
|
||||
return;
|
||||
}
|
||||
if (authCode == null || authCode.length() == 0) {
|
||||
LogUtils.w(TAG, "sendMail: 请先配置邮箱授权码");
|
||||
showToast(context, "请先配置邮箱授权码");
|
||||
return;
|
||||
}
|
||||
if (recipients == null || recipients.length() == 0) {
|
||||
LogUtils.w(TAG, "sendMail: 收件人不能为空");
|
||||
showToast(context, "收件人不能为空");
|
||||
return;
|
||||
}
|
||||
|
||||
LogUtils.d(TAG, "sendMail: 参数校验通过,准备启动发送线程");
|
||||
showToast(context, "正在发送邮件...");
|
||||
|
||||
new Thread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
LogUtils.d(TAG, "sendMail: 发送线程已启动");
|
||||
try {
|
||||
LogUtils.d(TAG, "sendMail: 创建邮件属性配置");
|
||||
Properties props = new Properties();
|
||||
props.put("mail.smtp.host", server);
|
||||
props.put("mail.smtp.port", port);
|
||||
props.put("mail.smtp.auth", "true");
|
||||
props.put("mail.smtp.socketFactory.port", port);
|
||||
props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
|
||||
|
||||
LogUtils.d(TAG, "sendMail: 创建邮件会话");
|
||||
Session session = Session.getInstance(props, new Authenticator() {
|
||||
@Override
|
||||
protected PasswordAuthentication getPasswordAuthentication() {
|
||||
LogUtils.d(TAG, "sendMail: 身份验证回调触发");
|
||||
return new PasswordAuthentication(sender, authCode);
|
||||
}
|
||||
});
|
||||
|
||||
LogUtils.d(TAG, "sendMail: 创建MimeMessage");
|
||||
MimeMessage message = new MimeMessage(session);
|
||||
message.setFrom(new InternetAddress(sender));
|
||||
message.setRecipients(javax.mail.Message.RecipientType.TO,
|
||||
InternetAddress.parse(recipients));
|
||||
message.setSubject(subject);
|
||||
message.setText(content);
|
||||
|
||||
LogUtils.d(TAG, "sendMail: 调用Transport.send开始发送");
|
||||
Transport.send(message);
|
||||
|
||||
LogUtils.d(TAG, "sendMail: 邮件发送成功");
|
||||
showToast(context, "邮件发送成功");
|
||||
} catch (Exception e) {
|
||||
LogUtils.e(TAG, "sendMail: 邮件发送异常", e);
|
||||
showToast(context, "邮件发送失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
}).start();
|
||||
LogUtils.d(TAG, "sendMail: ====== sendMail调用结束 ======");
|
||||
}
|
||||
|
||||
//
|
||||
// 在主线程显示Toast提示
|
||||
//
|
||||
private static void showToast(final Context context, final String message) {
|
||||
if (context == null || message == null) {
|
||||
return;
|
||||
}
|
||||
new Handler(Looper.getMainLooper()).post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
Toast.makeText(context.getApplicationContext(),
|
||||
message, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,323 @@
|
||||
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,
|
||||
DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送纯文本邮件(自定义SMTP服务器)
|
||||
* @param to 收件人邮箱地址
|
||||
* @param subject 邮件主题
|
||||
* @param body 邮件正文(纯文本)
|
||||
* @param from 发件人邮箱地址
|
||||
* @param authCode 邮箱授权码
|
||||
* @param host SMTP服务器地址
|
||||
* @param port SMTP端口
|
||||
* @return true=发送成功,false=发送失败
|
||||
*/
|
||||
public static boolean sendTextMail(
|
||||
final String to,
|
||||
final String subject,
|
||||
final String body,
|
||||
final String from,
|
||||
final String authCode,
|
||||
final String host,
|
||||
final int port) {
|
||||
return sendMail(to, subject, body, from, authCode, false, host, port);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送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,
|
||||
DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送HTML邮件(自定义SMTP服务器)
|
||||
* @param to 收件人邮箱地址
|
||||
* @param subject 邮件主题
|
||||
* @param body 邮件正文(HTML格式)
|
||||
* @param from 发件人邮箱地址
|
||||
* @param authCode 邮箱授权码
|
||||
* @param host SMTP服务器地址
|
||||
* @param port SMTP端口
|
||||
* @return true=发送成功,false=发送失败
|
||||
*/
|
||||
public static boolean sendHtmlMail(
|
||||
final String to,
|
||||
final String subject,
|
||||
final String body,
|
||||
final String from,
|
||||
final String authCode,
|
||||
final String host,
|
||||
final int port) {
|
||||
return sendMail(to, subject, body, from, authCode, true, host, port);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送邮件核心方法(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,
|
||||
final String host,
|
||||
final int port) {
|
||||
|
||||
LogUtils.d(TAG, "sendMail invoke, to=" + to + ", subject=" + subject
|
||||
+ ", isHtml=" + isHtml + ", host=" + host + ":" + port);
|
||||
|
||||
// 参数校验
|
||||
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 " + host + ":" + port);
|
||||
SSLSocketFactory factory = (SSLSocketFactory) SSLSocketFactory.getDefault();
|
||||
socket = factory.createSocket(host, 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
|
||||
|
||||
+23
-2
@@ -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;
|
||||
@@ -59,7 +75,7 @@ public class DebugSwitchInfoImageView extends ImageView {
|
||||
final AlertDialog dialog = new AlertDialog.Builder(getContext()).create();
|
||||
dialog.setTitle("调试Token");
|
||||
dialog.setMessage(getDebugToken());
|
||||
dialog.setCanceledOnTouchOutside(true);
|
||||
dialog.setCanceledOnTouchOutside(false);
|
||||
dialog.setButton(DialogInterface.BUTTON_POSITIVE, "复制到剪贴板", (DialogInterface.OnClickListener) null);
|
||||
dialog.setButton(DialogInterface.BUTTON_NEUTRAL, "重置", (DialogInterface.OnClickListener) null);
|
||||
dialog.setButton(DialogInterface.BUTTON_NEGATIVE, "关闭", (DialogInterface.OnClickListener) null);
|
||||
@@ -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();
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
package cc.winboll.studio.libappbase.views;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.CompoundButton;
|
||||
import android.widget.EditText;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.Toast;
|
||||
import cc.winboll.studio.libappbase.R;
|
||||
import cc.winboll.studio.libappbase.utils.APPMSGMailUtils;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
|
||||
/**
|
||||
* @Author 豆包&BigPickle&MiMo&ZhanGSKen<zhangsken@qq.com>
|
||||
* @Date 2026/07/23 17:35
|
||||
* @Describe SMTP邮件配置视图控件,用于设置QQ邮件SMTP服务参数
|
||||
*/
|
||||
public class SMTPConfigView extends LinearLayout {
|
||||
|
||||
public static final String TAG = "SMTPConfigView";
|
||||
|
||||
private EditText mEtServer;
|
||||
private EditText mEtPort;
|
||||
private EditText mEtSender;
|
||||
private EditText mEtAuthCode;
|
||||
private EditText mEtRecipient;
|
||||
private CheckBox mCbEnabled;
|
||||
|
||||
public SMTPConfigView(Context context) {
|
||||
super(context);
|
||||
initView(context);
|
||||
}
|
||||
|
||||
public SMTPConfigView(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
initView(context);
|
||||
}
|
||||
|
||||
private void initView(Context context) {
|
||||
LogUtils.d(TAG, "initView: 初始化SMTP配置视图");
|
||||
View.inflate(context, R.layout.view_smtp_config, this);
|
||||
|
||||
mEtServer = (EditText) findViewById(R.id.et_smtp_server);
|
||||
mEtPort = (EditText) findViewById(R.id.et_smtp_port);
|
||||
mEtSender = (EditText) findViewById(R.id.et_smtp_sender);
|
||||
mEtAuthCode = (EditText) findViewById(R.id.et_smtp_auth_code);
|
||||
mEtRecipient = (EditText) findViewById(R.id.et_smtp_recipient);
|
||||
mCbEnabled = (CheckBox) findViewById(R.id.cb_smtp_enabled);
|
||||
|
||||
mCbEnabled.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||
@Override
|
||||
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
||||
APPMSGMailUtils.setEnabled(getContext(), isChecked);
|
||||
}
|
||||
});
|
||||
|
||||
// 加载已保存的配置
|
||||
loadConfig();
|
||||
|
||||
// 保存按钮点击事件
|
||||
findViewById(R.id.btn_smtp_save).setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
saveConfig();
|
||||
}
|
||||
});
|
||||
|
||||
// 发送测试邮件按钮点击事件
|
||||
findViewById(R.id.btn_smtp_test_send).setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
saveConfig();
|
||||
Context ctx = getContext();
|
||||
String recipient = mEtRecipient.getText().toString().trim();
|
||||
APPMSGMailUtils.sendMail(ctx, "SMTP测试邮件",
|
||||
"这是一封SMTP配置测试邮件。如果您收到此邮件,说明SMTP配置正确。",
|
||||
recipient);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//
|
||||
// 从SharedPreferences加载已保存的SMTP配置
|
||||
//
|
||||
private void loadConfig() {
|
||||
Context context = getContext();
|
||||
mEtServer.setText(APPMSGMailUtils.getServer(context));
|
||||
mEtPort.setText(APPMSGMailUtils.getPort(context));
|
||||
mEtSender.setText(APPMSGMailUtils.getSender(context));
|
||||
mEtAuthCode.setText(APPMSGMailUtils.getAuthCode(context));
|
||||
mEtRecipient.setText(APPMSGMailUtils.getRecipient(context));
|
||||
mCbEnabled.setChecked(APPMSGMailUtils.isEnabled(context));
|
||||
LogUtils.d(TAG, "loadConfig: SMTP配置已加载");
|
||||
}
|
||||
|
||||
//
|
||||
// 将当前输入的SMTP配置保存到SharedPreferences
|
||||
//
|
||||
private void saveConfig() {
|
||||
Context context = getContext();
|
||||
String server = mEtServer.getText().toString().trim();
|
||||
String port = mEtPort.getText().toString().trim();
|
||||
String sender = mEtSender.getText().toString().trim();
|
||||
String authCode = mEtAuthCode.getText().toString().trim();
|
||||
String recipient = mEtRecipient.getText().toString().trim();
|
||||
|
||||
APPMSGMailUtils.saveConfig(context, server, port, sender, authCode, recipient);
|
||||
Toast.makeText(context, "SMTP配置已保存", Toast.LENGTH_SHORT).show();
|
||||
LogUtils.d(TAG, "saveConfig: SMTP配置已保存");
|
||||
}
|
||||
}
|
||||
@@ -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"
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="16dp"
|
||||
android:background="@drawable/bg_container_border">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="SMTP邮件配置"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold"
|
||||
android:layout_marginBottom="12dp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="SMTP服务器"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginTop="8dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_smtp_server"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="smtp.qq.com"
|
||||
android:inputType="textUri"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="端口"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginTop="8dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_smtp_port"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="465"
|
||||
android:inputType="number"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="发件人邮箱"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginTop="8dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_smtp_sender"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="your@qq.com"
|
||||
android:inputType="textEmailAddress"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="授权码"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginTop="8dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_smtp_auth_code"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="QQ邮箱授权码"
|
||||
android:inputType="textPassword"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="默认收件人"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginTop="8dp"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_smtp_recipient"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="recipient@example.com"
|
||||
android:inputType="textEmailAddress"/>
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/cb_smtp_enabled"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="启用SMTP邮件发送"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginTop="12dp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_smtp_save"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="保存配置"
|
||||
android:layout_marginTop="16dp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_smtp_test_send"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="发送测试邮件"
|
||||
android:layout_marginTop="8dp"/>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
/build
|
||||
@@ -1,42 +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'
|
||||
|
||||
// WinBoLL库 nexus.winboll.cc 地址
|
||||
api 'cc.winboll.studio:libaes:15.20.3'
|
||||
api 'cc.winboll.studio:libappbase:15.20.9'
|
||||
|
||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Fri May 15 08:48:45 GMT 2026
|
||||
stageCount=2
|
||||
libraryProject=libwinboll
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.1
|
||||
buildCount=7
|
||||
baseBetaVersion=15.20.2
|
||||
Vendored
-17
@@ -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 *;
|
||||
#}
|
||||
@@ -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>
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 9.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB |
@@ -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>
|
||||
@@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<style name="AppTheme" parent="@android:style/Theme.Material.Light">
|
||||
</style>
|
||||
</resources>
|
||||
@@ -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>
|
||||
@@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<style name="AppTheme" parent="@android:style/Theme.Holo.Light">
|
||||
</style>
|
||||
</resources>
|
||||
+1
-1
@@ -21,7 +21,7 @@ WinBoLL 网站浏览器。
|
||||
|
||||
1. Fork 本仓库
|
||||
2. 新建 Feat_xxx 分支
|
||||
3. 提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
|
||||
3. 提交代码 : ZhanGSKen(ZhanGSKen<ZhanGSKen@QQ.COM>)
|
||||
4. 新建 Pull Request
|
||||
|
||||
|
||||
|
||||
+21
-18
@@ -18,10 +18,14 @@ def genVersionName(def versionName){
|
||||
}
|
||||
|
||||
android {
|
||||
// 适配MIUI12
|
||||
compileSdkVersion 30
|
||||
buildToolsVersion "30.0.3"
|
||||
|
||||
// 适配MIUI12
|
||||
compileSdkVersion 30
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_7
|
||||
targetCompatibility JavaVersion.VERSION_1_7
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
applicationId "cc.winboll.studio.winboll"
|
||||
minSdkVersion 26
|
||||
@@ -31,26 +35,14 @@ android {
|
||||
// versionName 更新后需要手动设置
|
||||
// .winboll/winbollBuildProps.properties 文件的 stageCount=0
|
||||
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
||||
versionName "15.20"
|
||||
versionName "15.21"
|
||||
if(true) {
|
||||
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'
|
||||
@@ -103,6 +95,17 @@ dependencies {
|
||||
implementation 'com.termux:terminal-emulator:0.118.0'
|
||||
implementation 'com.termux:terminal-view:0.118.0'
|
||||
implementation 'com.termux:termux-shared:0.118.0'
|
||||
|
||||
// Biometric (指纹识别)
|
||||
implementation 'androidx.biometric:biometric:1.1.0'
|
||||
|
||||
// WinBoLL库 nexus.winboll.cc 地址
|
||||
api 'cc.winboll.studio:libappbase:15.21.+'
|
||||
api 'cc.winboll.studio:libaes:15.21.+'
|
||||
|
||||
// 备用库 jitpack.io 地址
|
||||
//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33'
|
||||
//api 'com.github.ZhanGSKen:libaes:aes-v15.20.16'
|
||||
|
||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Fri May 15 08:48:45 GMT 2026
|
||||
stageCount=2
|
||||
libraryProject=libwinboll
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.1
|
||||
buildCount=7
|
||||
baseBetaVersion=15.20.2
|
||||
#Tue Jul 21 09:55:56 HKT 2026
|
||||
stageCount=1
|
||||
libraryProject=
|
||||
baseVersion=15.21
|
||||
publishVersion=15.21.0
|
||||
buildCount=0
|
||||
baseBetaVersion=15.21.1
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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,45 +36,63 @@ import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.io.PrintWriter;
|
||||
import java.io.StringWriter;
|
||||
import java.lang.Thread.UncaughtExceptionHandler;
|
||||
import java.text.DateFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
|
||||
|
||||
public class App extends GlobalApplication {
|
||||
|
||||
|
||||
public static final String TAG = "App";
|
||||
|
||||
|
||||
public static final String COMPONENT_EN1 = "cc.winboll.studio.winboll.MainActivityEN1";
|
||||
public static final String COMPONENT_CN1 = "cc.winboll.studio.winboll.MainActivityCN1";
|
||||
public static final String COMPONENT_CN2 = "cc.winboll.studio.winboll.MainActivityCN2";
|
||||
public static final String ACTION_SWITCHTO_EN1 = "cc.winboll.studio.winboll.App.ACTION_SWITCHTO_EN1";
|
||||
public static final String ACTION_SWITCHTO_CN1 = "cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN1";
|
||||
public static final String ACTION_SWITCHTO_CN2 = "cc.winboll.studio.winboll.App.ACTION_SWITCHTO_CN2";
|
||||
|
||||
|
||||
private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
|
||||
|
||||
|
||||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
setIsDebugging(BuildConfig.DEBUG);
|
||||
//setIsDebugging(false);
|
||||
|
||||
WinBoLLActivityManager.init(this);
|
||||
|
||||
// 初始化 Toast 框架
|
||||
ToastUtils.init(this);
|
||||
// 设置 Toast 布局样式
|
||||
//ToastUtils.setView(R.layout.view_toast);
|
||||
//ToastUtils.setStyle(new WhiteToastStyle());
|
||||
//ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
|
||||
|
||||
//CrashHandler.getInstance().registerGlobal(this);
|
||||
//CrashHandler.getInstance().registerPart(this);
|
||||
try {
|
||||
super.onCreate();
|
||||
|
||||
ToastUtils.init(this);
|
||||
|
||||
WinBoLLActivityManager.init(this);
|
||||
|
||||
// 初始化 AES 主题工具(注入当前应用命名空间的主题ID列表,按 ThemeType.ordinal() 顺序)
|
||||
ArrayList<Integer> themeStyleList = new ArrayList<Integer>();
|
||||
themeStyleList.add(R.style.MyAppTheme); // AES(0)
|
||||
themeStyleList.add(R.style.MyDepthAppTheme); // DEPTH(1)
|
||||
themeStyleList.add(R.style.MySkyAppTheme); // SKY(2)
|
||||
themeStyleList.add(R.style.MyGoldenAppTheme); // GOLDEN(3)
|
||||
themeStyleList.add(R.style.MyBearingAppTheme); // BEARING(4)
|
||||
themeStyleList.add(R.style.MyMemorAppTheme); // MEMOR(5)
|
||||
themeStyleList.add(R.style.MyTaoAppTheme); // TAO(6)
|
||||
AESThemeUtil.init(themeStyleList);
|
||||
|
||||
} catch (Throwable e) {
|
||||
StringWriter sw = new StringWriter();
|
||||
PrintWriter pw = new PrintWriter(sw);
|
||||
e.printStackTrace(pw);
|
||||
pw.close();
|
||||
String stackTraceStr = sw.toString();
|
||||
CrashHandleNotifyUtils.handleUncaughtException(
|
||||
this,
|
||||
getPackageName(),
|
||||
stackTraceStr,
|
||||
GlobalCrashActivity.class
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -79,8 +100,8 @@ public class App extends GlobalApplication {
|
||||
super.onTerminate();
|
||||
ToastUtils.release();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public static void write(InputStream input, OutputStream output) throws IOException {
|
||||
byte[] buf = new byte[1024 * 8];
|
||||
|
||||
@@ -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;
|
||||
@@ -37,7 +37,7 @@ public class MainActivity extends DrawerFragmentActivity {
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(this));
|
||||
setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
|
||||
super.onCreate(savedInstanceState);
|
||||
initMainHandler();
|
||||
if (mBrowserFragment == null) {
|
||||
@@ -150,11 +150,12 @@ public class MainActivity extends DrawerFragmentActivity {
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
getMenuInflater().inflate(R.menu.toolbar_main, menu);
|
||||
super.onCreateOptionsMenu(menu);
|
||||
if (App.isDebugging()) {
|
||||
getMenuInflater().inflate(R.menu.toolbar_test, menu);
|
||||
}
|
||||
return super.onCreateOptionsMenu(menu);
|
||||
getMenuInflater().inflate(R.menu.toolbar_main, menu);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -192,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);
|
||||
}
|
||||
|
||||
@@ -14,7 +14,6 @@ import android.os.Looper;
|
||||
import android.view.MotionEvent;
|
||||
import android.widget.FrameLayout;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
import cc.winboll.studio.libaes.utils.AESThemeUtil;
|
||||
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
|
||||
import cc.winboll.studio.winboll.R;
|
||||
|
||||
@@ -57,7 +56,6 @@ public class PatternLockActivity extends BaseWinBoLLActivity {
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
AESThemeUtil.applyAppTheme(this);
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_pattern_lock);
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@ package cc.winboll.studio.winboll.activities;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
import cc.winboll.studio.libaes.utils.AESThemeUtil;
|
||||
import cc.winboll.studio.winboll.R;
|
||||
import android.app.Activity;
|
||||
|
||||
@@ -29,7 +28,6 @@ public class SettingsActivity extends BaseWinBoLLActivity {
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
AESThemeUtil.applyAppTheme(this);
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_settings);
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ package cc.winboll.studio.winboll.models;
|
||||
*/
|
||||
import android.util.JsonReader;
|
||||
import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libappbase.BaseBean;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import java.io.IOException;
|
||||
|
||||
public class MainServiceBean extends BaseBean {
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
package cc.winboll.studio.winboll.models;
|
||||
|
||||
import android.content.Context;
|
||||
import cc.winboll.studio.libappbase.BaseBean;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import cc.winboll.studio.winboll.models.TermuxButtonModel;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class TermuxButtonManager {
|
||||
|
||||
@@ -2,7 +2,7 @@ package cc.winboll.studio.winboll.models;
|
||||
|
||||
import android.util.JsonReader;
|
||||
import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libappbase.BaseBean;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import java.io.IOException;
|
||||
|
||||
/**
|
||||
@@ -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")) {
|
||||
|
||||
@@ -7,7 +7,7 @@ package cc.winboll.studio.winboll.models;
|
||||
*/
|
||||
import android.util.JsonReader;
|
||||
import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libappbase.BaseBean;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import java.io.IOException;
|
||||
|
||||
public class TestDemoBindServiceBean extends BaseBean {
|
||||
|
||||
@@ -7,7 +7,7 @@ package cc.winboll.studio.winboll.models;
|
||||
*/
|
||||
import android.util.JsonReader;
|
||||
import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libappbase.BaseBean;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import java.io.IOException;
|
||||
|
||||
public class TestDemoServiceBean extends BaseBean {
|
||||
|
||||
@@ -6,7 +6,7 @@ package cc.winboll.studio.winboll.models;
|
||||
*/
|
||||
import android.util.JsonReader;
|
||||
import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libappbase.BaseBean;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import java.io.IOException;
|
||||
|
||||
public class UserInfoModel extends BaseBean {
|
||||
|
||||
@@ -7,9 +7,9 @@ package cc.winboll.studio.winboll.models;
|
||||
*/
|
||||
import android.util.JsonReader;
|
||||
import android.util.JsonWriter;
|
||||
import cc.winboll.studio.libappbase.BaseBean;
|
||||
import java.io.IOException;
|
||||
import cc.winboll.studio.libappbase.APPModel;
|
||||
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||
import java.io.IOException;
|
||||
|
||||
public class WinBoLLModel extends BaseBean {
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user