mirror of
http://gitea.winboll.cc/Studio/WinBoLL.git
synced 2026-06-30 04:22:25 +08:00
Compare commits
56 Commits
WinBoLL-Zh
...
winboll-v1
| Author | SHA1 | Date | |
|---|---|---|---|
| 26f247b409 | |||
| 59080de7f3 | |||
| c3f84afb62 | |||
|
|
b1059c3f46 | ||
| 00220a382d | |||
|
|
f3d723fbee | ||
| d0e70407f9 | |||
| 79eb4e3247 | |||
| 71e6f1f03f | |||
|
|
e3c30ea9a3 | ||
| fdfae270d2 | |||
|
|
ab4cef21f0 | ||
| 2754a2ad7c | |||
| d147f9dc08 | |||
| 8876896cbc | |||
| 28e6a8ee78 | |||
| c9272b6341 | |||
| 7d872fd14c | |||
| d6fab2133f | |||
| 45821b8daa | |||
| edd312a525 | |||
| aec680e36e | |||
| 1c6f7783e5 | |||
|
|
193011a80d | ||
| 0b5eea447b | |||
| 6dbcca8fad | |||
|
|
eb3d8f4806 | ||
| aa1b701c8b | |||
| fc20bd56b4 | |||
| e92538850f | |||
| 81b7af0ec4 | |||
| e2b4bddb61 | |||
| cbca61ad84 | |||
| 28bc3a86e3 | |||
| 79f7f682b3 | |||
| 8fa09a9f99 | |||
| 555c5deef9 | |||
| 3707891e0b | |||
| 0c9c6c9fd4 | |||
| be3d042ade | |||
|
|
33dc49267e | ||
| e3166b639e | |||
| 3d26bbe090 | |||
| cd375cefc5 | |||
| 025c095bcd | |||
| c88a0a52a8 | |||
| dc4eeefa55 | |||
| c7d79e160b | |||
| 68ebd0181b | |||
|
|
771f591a3a | ||
| 2bf62a510a | |||
| 8aaec10d74 | |||
| a3d5031cdc | |||
| 9a7f651d80 | |||
| ba3877f3cc | |||
| 7e2f48f33a |
192
.winboll/bashMergeProjects-to-Projects_Keeper.sh
Normal file
192
.winboll/bashMergeProjects-to-Projects_Keeper.sh
Normal file
@@ -0,0 +1,192 @@
|
|||||||
|
#!/system/bin/sh
|
||||||
|
## 合并其他项目分支的模块源码到projects-keeper分支。
|
||||||
|
|
||||||
|
# ====================== 0. 进入目标目录 ======================
|
||||||
|
TARGET_DIR="/sdcard/AppProjects/Projects_Keeper"
|
||||||
|
|
||||||
|
echo "切换工作目录到:$TARGET_DIR"
|
||||||
|
if ! cd "$TARGET_DIR"; then
|
||||||
|
echo "=============================================="
|
||||||
|
echo "错误:无法进入目标目录 $TARGET_DIR"
|
||||||
|
echo "=============================================="
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ====================== 1. 拉取远程最新源码(失败直接退出) ======================
|
||||||
|
echo "=============================================="
|
||||||
|
echo "正在拉取远程最新源码..."
|
||||||
|
echo "=============================================="
|
||||||
|
if ! git pull; then
|
||||||
|
echo "=============================================="
|
||||||
|
echo "错误:拉取远程源码失败!"
|
||||||
|
echo "请检查网络、仓库冲突或手动处理 git 状态后再执行脚本。"
|
||||||
|
echo "=============================================="
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "✅ 源码已拉取为最新状态"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# ====================== 2. 目录路径检查 ======================
|
||||||
|
CUR_DIR=$(pwd)
|
||||||
|
if [ "$CUR_DIR" != "$TARGET_DIR" ]; then
|
||||||
|
echo "错误:当前目录不是项目根目录!"
|
||||||
|
echo "请先进入目录:$TARGET_DIR"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ====================== 3. Git 分支检查 ======================
|
||||||
|
CUR_BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null)
|
||||||
|
TARGET_BRANCH="projects-keeper"
|
||||||
|
|
||||||
|
if [ "$CUR_BRANCH" != "$TARGET_BRANCH" ]; then
|
||||||
|
echo "错误:当前不在 $TARGET_BRANCH 分支!"
|
||||||
|
echo "当前分支:$CUR_BRANCH"
|
||||||
|
echo "请先执行:git checkout $TARGET_BRANCH"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ====================== 4. 预设标准模块列表 ======================
|
||||||
|
MERGE_OBJECTS_LIST=(
|
||||||
|
.git
|
||||||
|
.gitignore
|
||||||
|
.gitmodules
|
||||||
|
.winboll
|
||||||
|
GenKeyStore
|
||||||
|
LICENSE
|
||||||
|
LICENSE-Private-Demo
|
||||||
|
LICENSE-Private-Demo_docs
|
||||||
|
README.md
|
||||||
|
aes
|
||||||
|
appbase
|
||||||
|
autonfc
|
||||||
|
build.gradle
|
||||||
|
contacts
|
||||||
|
debugtemp
|
||||||
|
gallery
|
||||||
|
gpsrelaysentinel
|
||||||
|
gradle
|
||||||
|
gradle.properties-android-demo
|
||||||
|
gradle.properties-androidx-demo
|
||||||
|
gradlew
|
||||||
|
libaes
|
||||||
|
libappbase
|
||||||
|
libdebugtemp
|
||||||
|
libgpsrelaysentinel
|
||||||
|
libwinboll
|
||||||
|
local.properties-demo
|
||||||
|
mymessagemanager
|
||||||
|
positions
|
||||||
|
powerbell
|
||||||
|
settings.gradle-demo
|
||||||
|
winboll
|
||||||
|
winboll.properties-demo
|
||||||
|
)
|
||||||
|
|
||||||
|
# ====================== 5. 获取当前目录真实文件列表 ======================
|
||||||
|
REAL_ITEMS=()
|
||||||
|
while IFS= read -r line; do
|
||||||
|
if [[ "$line" != "." && "$line" != ".." ]]; then
|
||||||
|
REAL_ITEMS+=("$line")
|
||||||
|
fi
|
||||||
|
done < <(ls -a)
|
||||||
|
|
||||||
|
# ====================== 6. 差异比对函数 ======================
|
||||||
|
check_diff() {
|
||||||
|
local missing=()
|
||||||
|
local extra=()
|
||||||
|
|
||||||
|
for item in "${MERGE_OBJECTS_LIST[@]}"; do
|
||||||
|
local found=0
|
||||||
|
for r in "${REAL_ITEMS[@]}"; do
|
||||||
|
if [[ "$item" == "$r" ]]; then
|
||||||
|
found=1
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if (( found == 0 )); then
|
||||||
|
missing+=("$item")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
for r in "${REAL_ITEMS[@]}"; do
|
||||||
|
local found=0
|
||||||
|
for item in "${MERGE_OBJECTS_LIST[@]}"; do
|
||||||
|
if [[ "$item" == "$r" ]]; then
|
||||||
|
found=1
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if (( found == 0 )); then
|
||||||
|
extra+=("$r")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ ${#missing[@]} -gt 0 || ${#extra[@]} -gt 0 ]]; then
|
||||||
|
echo "=============================================="
|
||||||
|
echo "【错误】合并环境与脚本预设列表不匹配!"
|
||||||
|
echo "请手动核对并修改合并脚本。"
|
||||||
|
echo "=============================================="
|
||||||
|
|
||||||
|
if [[ ${#missing[@]} -gt 0 ]]; then
|
||||||
|
echo -e "\n👉 本地缺失项目:"
|
||||||
|
for m in "${missing[@]}"; do echo " $m"; done
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ${#extra[@]} -gt 0 ]]; then
|
||||||
|
echo -e "\n👉 本地多余项目:"
|
||||||
|
for e in "${extra[@]}"; do echo " $e"; done
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -e "\n=============================================="
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# 执行差异校验
|
||||||
|
check_diff
|
||||||
|
|
||||||
|
# ====================== 全部校验通过,继续执行合并 ======================
|
||||||
|
echo -e "#@@@ 开始合并模块源码 @@@#
|
||||||
|
## 目标合并对象列表:"
|
||||||
|
|
||||||
|
for item in "${MERGE_OBJECTS_LIST[@]}"; do
|
||||||
|
echo "$item"
|
||||||
|
done
|
||||||
|
|
||||||
|
echo -e "## 对象列表结束
|
||||||
|
"
|
||||||
|
|
||||||
|
## 合并 APP 项目
|
||||||
|
MERGE_APP_PROJECT_LIST=(
|
||||||
|
DemoAPP
|
||||||
|
)
|
||||||
|
echo -e "#@@@ 开始合并应用型模块源码 @@@#
|
||||||
|
## 目标合并对象列表:"
|
||||||
|
|
||||||
|
for item in "${MERGE_APP_PROJECT_LIST[@]}"; do
|
||||||
|
echo "正在合并 $item 项目 ..."
|
||||||
|
item_lower=$(echo "$item" | tr 'A-Z' 'a-z')
|
||||||
|
git checkout origin/$item_lower $item_lower
|
||||||
|
git add .
|
||||||
|
git commit -m "合并 $item 项目"
|
||||||
|
done
|
||||||
|
|
||||||
|
## 合并 LIB 项目
|
||||||
|
MERGE_LIB_PROJECT_LIST=(
|
||||||
|
WinBoLL
|
||||||
|
APPBase
|
||||||
|
AES
|
||||||
|
)
|
||||||
|
echo -e "#@@@ 开始合并类库型模块源码 @@@#
|
||||||
|
## 目标合并对象列表:"
|
||||||
|
|
||||||
|
for item in "${MERGE_LIB_PROJECT_LIST[@]}"; do
|
||||||
|
echo "正在合并 $item 项目 ..."
|
||||||
|
item_lower=$(echo "$item" | tr 'A-Z' 'a-z')
|
||||||
|
git checkout origin/$item_lower $item_lower lib$item_lower
|
||||||
|
git add .
|
||||||
|
git commit -m "合并 $item 项目"
|
||||||
|
done
|
||||||
|
|
||||||
|
echo '正在推送 Projects_Keeper 项目'
|
||||||
|
git push
|
||||||
145
.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
Normal file
145
.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
Normal file
@@ -0,0 +1,145 @@
|
|||||||
|
#!/system/bin/sh
|
||||||
|
## 逻辑:按时间取最新标签 → 拉取该标签目录合并
|
||||||
|
|
||||||
|
# 按创建时间取模块最新标签(最新打的标签排最后)
|
||||||
|
get_latest_module_tag(){
|
||||||
|
local mod=$1
|
||||||
|
git for-each-ref --sort=-creatordate --format='%(refname)' refs/tags/${mod}-* \
|
||||||
|
| grep -v '\^{}' \
|
||||||
|
| head -1 \
|
||||||
|
| sed 's/refs\/tags\///'
|
||||||
|
}
|
||||||
|
|
||||||
|
# 通过标签获取commit
|
||||||
|
get_commit_from_tag(){
|
||||||
|
local tag=$1
|
||||||
|
git rev-parse --short "${tag}^{commit}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# 工作目录
|
||||||
|
TARGET_DIR="/sdcard/AppProjects/Projects_Keeper_Tag"
|
||||||
|
echo "进入目录:${TARGET_DIR}"
|
||||||
|
cd "${TARGET_DIR}" || exit 1
|
||||||
|
|
||||||
|
# 同步远程
|
||||||
|
echo "========================================"
|
||||||
|
echo "同步远程分支与全部版本标签"
|
||||||
|
echo "========================================"
|
||||||
|
git fetch origin --prune
|
||||||
|
git fetch origin --tags
|
||||||
|
echo "同步完成"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# 校验目标分支
|
||||||
|
NOW_BRANCH=$(git symbolic-ref --short HEAD)
|
||||||
|
TARGET_BRANCH="projects_keeper_tag"
|
||||||
|
if [ "${NOW_BRANCH}" != "${TARGET_BRANCH}" ];then
|
||||||
|
echo "错误:请先切换到 ${TARGET_BRANCH} 分支"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 目录结构校验
|
||||||
|
MERGE_OBJECTS_LIST=(
|
||||||
|
.git
|
||||||
|
.gitignore
|
||||||
|
.gitmodules
|
||||||
|
.winboll
|
||||||
|
GenKeyStore
|
||||||
|
LICENSE
|
||||||
|
LICENSE-Private-Demo
|
||||||
|
LICENSE-Private-Demo_docs
|
||||||
|
README.md
|
||||||
|
aes
|
||||||
|
appbase
|
||||||
|
autonfc
|
||||||
|
build.gradle
|
||||||
|
contacts
|
||||||
|
debugtemp
|
||||||
|
gallery
|
||||||
|
gpsrelaysentinel
|
||||||
|
gradle
|
||||||
|
gradle.properties-android-demo
|
||||||
|
gradle.properties-androidx-demo
|
||||||
|
gradlew
|
||||||
|
libaes
|
||||||
|
libappbase
|
||||||
|
libdebugtemp
|
||||||
|
libgpsrelaysentinel
|
||||||
|
libwinboll
|
||||||
|
local.properties-demo
|
||||||
|
mymessagemanager
|
||||||
|
positions
|
||||||
|
powerbell
|
||||||
|
settings.gradle-demo
|
||||||
|
winboll
|
||||||
|
winboll.properties-demo
|
||||||
|
)
|
||||||
|
|
||||||
|
REAL_ITEMS=()
|
||||||
|
while IFS= read -r line; do
|
||||||
|
[[ $line != "." && $line != ".." ]] && REAL_ITEMS+=("$line")
|
||||||
|
done < <(ls -a)
|
||||||
|
|
||||||
|
check_diff(){
|
||||||
|
local miss=() extra=()
|
||||||
|
for i in "${MERGE_OBJECTS_LIST[@]}";do
|
||||||
|
[[ ! " ${REAL_ITEMS[@]} " =~ " ${i} " ]] && miss+=("$i")
|
||||||
|
done
|
||||||
|
for i in "${REAL_ITEMS[@]}";do
|
||||||
|
[[ ! " ${MERGE_OBJECTS_LIST[@]} " =~ " ${i} " ]] && extra+=("$i")
|
||||||
|
done
|
||||||
|
if [[ ${#miss[@]} -gt 0 || ${#extra[@]} -gt 0 ]];then
|
||||||
|
echo "本地目录结构不一致,终止运行"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
check_diff
|
||||||
|
|
||||||
|
echo -e "#@@@ 按时间获取最新标签合并模块源码 @@@#"
|
||||||
|
|
||||||
|
# 应用型模块
|
||||||
|
MERGE_APP_PROJECT_LIST=(DemoAPP)
|
||||||
|
echo -e "---------- 应用型模块 ----------"
|
||||||
|
for name in "${MERGE_APP_PROJECT_LIST[@]}";do
|
||||||
|
low_name=$(echo "$name" | tr 'A-Z' 'a-z')
|
||||||
|
tag=$(get_latest_module_tag "${low_name}")
|
||||||
|
if [[ -z "${tag}" ]];then
|
||||||
|
echo "跳过 ${low_name}:无远程标签"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
commit=$(get_commit_from_tag "${tag}")
|
||||||
|
if [[ -z "${commit}" ]];then
|
||||||
|
echo "跳过 ${low_name}:标签无有效提交点"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
echo "模块:${low_name} 最新时间标签:${tag} 提交ID:${commit}"
|
||||||
|
# 强制拉取覆盖
|
||||||
|
git checkout -f "${tag}" -- "${low_name}"
|
||||||
|
git add "${low_name}"
|
||||||
|
git commit -m "合并模块${name} 同步最新时间标签${tag}"
|
||||||
|
done
|
||||||
|
|
||||||
|
# 类库模块
|
||||||
|
MERGE_LIB_PROJECT_LIST=(WinBoLL APPBase AES)
|
||||||
|
echo -e "---------- 类库模块 ----------"
|
||||||
|
for name in "${MERGE_LIB_PROJECT_LIST[@]}";do
|
||||||
|
low_name=$(echo "$name" | tr 'A-Z' 'a-z')
|
||||||
|
tag=$(get_latest_module_tag "${low_name}")
|
||||||
|
if [[ -z "${tag}" ]];then
|
||||||
|
echo "跳过 ${low_name}:无远程标签"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
commit=$(get_commit_from_tag "${tag}")
|
||||||
|
if [[ -z "${commit}" ]];then
|
||||||
|
echo "跳过 ${low_name}:标签无有效提交点"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
echo "模块:${low_name} 最新时间标签:${tag} 提交ID:${commit}"
|
||||||
|
git checkout -f "${tag}" -- "${low_name}" "lib${low_name}"
|
||||||
|
git add "${low_name}" "lib${low_name}"
|
||||||
|
git commit -m "合并模块${name} 同步最新时间标签${tag}"
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "全部模块合并执行完毕"
|
||||||
|
echo "执行推送:git push"
|
||||||
|
git push
|
||||||
@@ -122,7 +122,6 @@ android {
|
|||||||
// 如果正在调试,就拷贝到 WinBoLL 备份管理文件夹
|
// 如果正在调试,就拷贝到 WinBoLL 备份管理文件夹
|
||||||
//
|
//
|
||||||
if(variant.flavorName == "beta"&&variant.buildType.name == "debug"){
|
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}")
|
File outBuildBckDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/${variant.buildType.name}")
|
||||||
// 创建目标路径目录
|
// 创建目标路径目录
|
||||||
if(!outBuildBckDir.exists()) {
|
if(!outBuildBckDir.exists()) {
|
||||||
@@ -130,6 +129,7 @@ android {
|
|||||||
println "Output Folder Created.(WinBoLLStudio) : " + outBuildBckDir.getAbsolutePath()
|
println "Output Folder Created.(WinBoLLStudio) : " + outBuildBckDir.getAbsolutePath()
|
||||||
}
|
}
|
||||||
if(outBuildBckDir.exists()) {
|
if(outBuildBckDir.exists()) {
|
||||||
|
def targetApkFile = new File(outBuildBckDir, outputFileName)
|
||||||
copy{
|
copy{
|
||||||
from file.outputFile
|
from file.outputFile
|
||||||
into outBuildBckDir
|
into outBuildBckDir
|
||||||
@@ -138,6 +138,14 @@ android {
|
|||||||
}
|
}
|
||||||
println "Output APK (WinBoLLStudio): " + outBuildBckDir.getAbsolutePath() + "/${outputFileName}"
|
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['buildCount'] != null)
|
||||||
assert (winbollBuildProps['libraryProject'] != null)
|
assert (winbollBuildProps['libraryProject'] != null)
|
||||||
@@ -160,8 +168,7 @@ android {
|
|||||||
assert(libraryProjectBuildPropsFile.exists())
|
assert(libraryProjectBuildPropsFile.exists())
|
||||||
java.nio.file.Path sourceFilePath = winbollBuildPropsFile.toPath();
|
java.nio.file.Path sourceFilePath = winbollBuildPropsFile.toPath();
|
||||||
java.nio.file.Path targetFilePath = libraryProjectBuildPropsFile.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";
|
println "\n\n>>> Library Project build.properties saved.\n\n";
|
||||||
}
|
}
|
||||||
@@ -172,16 +179,12 @@ android {
|
|||||||
//
|
//
|
||||||
if(variant.flavorName == "stage"&&variant.buildType.name == "release"){
|
if(variant.flavorName == "stage"&&variant.buildType.name == "release"){
|
||||||
// 发布 APK 文件
|
// 发布 APK 文件
|
||||||
//
|
|
||||||
// 截取版本号的版本字段为短版本名
|
|
||||||
String szVersionName = "${versionName}"
|
String szVersionName = "${versionName}"
|
||||||
String[] szlistTemp = szVersionName.split("-")
|
String[] szlistTemp = szVersionName.split("-")
|
||||||
String szShortVersionName = szlistTemp[0]
|
String szShortVersionName = szlistTemp[0]
|
||||||
//String szCommonTagAPKName = "${rootProject.name}_" + szShortVersionName + ".apk"
|
|
||||||
String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk"
|
String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk"
|
||||||
println "CommonTagAPKName is : " + szCommonTagAPKName
|
println "CommonTagAPKName is : " + szCommonTagAPKName
|
||||||
|
|
||||||
//File outTagDir = new File(fWinBoLLStudioDir, "/${rootProject.name}/tag/")
|
|
||||||
File outTagDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/tag/")
|
File outTagDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/tag/")
|
||||||
// 创建目标路径目录
|
// 创建目标路径目录
|
||||||
if(!outTagDir.exists()) {
|
if(!outTagDir.exists()) {
|
||||||
@@ -192,12 +195,10 @@ android {
|
|||||||
if(outTagDir.exists()) {
|
if(outTagDir.exists()) {
|
||||||
File targetAPK = new File(outTagDir, "${szCommonTagAPKName}")
|
File targetAPK = new File(outTagDir, "${szCommonTagAPKName}")
|
||||||
if(targetAPK.exists()) {
|
if(targetAPK.exists()) {
|
||||||
// 标签版本APK文件已经存在,构建拷贝任务停止
|
|
||||||
assert (!targetAPK.exists())
|
assert (!targetAPK.exists())
|
||||||
// 可选择删除并继续输出APK文件
|
|
||||||
//delete targetAPK
|
|
||||||
}
|
}
|
||||||
// 复制一个备份
|
// 复制完整版APK
|
||||||
|
def fullApkFile = new File(outTagDir, outputFileName)
|
||||||
copy{
|
copy{
|
||||||
from file.outputFile
|
from file.outputFile
|
||||||
into outTagDir
|
into outTagDir
|
||||||
@@ -206,7 +207,16 @@ android {
|
|||||||
}
|
}
|
||||||
println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${outputFileName}"
|
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{
|
copy{
|
||||||
from file.outputFile
|
from file.outputFile
|
||||||
into outTagDir
|
into outTagDir
|
||||||
@@ -215,6 +225,14 @@ android {
|
|||||||
}
|
}
|
||||||
println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${szCommonTagAPKName}"
|
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['stageCount'] != null)
|
||||||
assert (winbollBuildProps['publishVersion'] != null)
|
assert (winbollBuildProps['publishVersion'] != null)
|
||||||
@@ -239,14 +257,11 @@ android {
|
|||||||
fos.close();
|
fos.close();
|
||||||
|
|
||||||
if(winbollBuildProps['libraryProject'] != "") {
|
if(winbollBuildProps['libraryProject'] != "") {
|
||||||
// 如果应用 build.properties 文件设置了类库模块项目文件名
|
|
||||||
// 就拷贝一份新的编译标志配置到类库项目文件夹
|
|
||||||
File libraryProjectBuildPropsFile = new File("$RootProjectDir/" + winbollBuildProps['libraryProject'] + "/build.properties")
|
File libraryProjectBuildPropsFile = new File("$RootProjectDir/" + winbollBuildProps['libraryProject'] + "/build.properties")
|
||||||
assert(winbollBuildPropsFile.exists())
|
assert(winbollBuildPropsFile.exists())
|
||||||
assert(libraryProjectBuildPropsFile.exists())
|
assert(libraryProjectBuildPropsFile.exists())
|
||||||
java.nio.file.Path sourceFilePath = winbollBuildPropsFile.toPath();
|
java.nio.file.Path sourceFilePath = winbollBuildPropsFile.toPath();
|
||||||
java.nio.file.Path targetFilePath = libraryProjectBuildPropsFile.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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -263,17 +278,12 @@ android {
|
|||||||
// 如果正在调试发布版,就只生成和输出APK文件,不处理 Git 仓库提交与更新问题。
|
// 如果正在调试发布版,就只生成和输出APK文件,不处理 Git 仓库提交与更新问题。
|
||||||
//
|
//
|
||||||
if(variant.flavorName == "stage"&&variant.buildType.name == "debug"){
|
if(variant.flavorName == "stage"&&variant.buildType.name == "debug"){
|
||||||
// 发布 APK 文件
|
|
||||||
//
|
|
||||||
// 截取版本号的版本字段为短版本名
|
|
||||||
String szVersionName = "${versionName}"
|
String szVersionName = "${versionName}"
|
||||||
String[] szlistTemp = szVersionName.split("-")
|
String[] szlistTemp = szVersionName.split("-")
|
||||||
String szShortVersionName = szlistTemp[0]
|
String szShortVersionName = szlistTemp[0]
|
||||||
//String szCommonTagAPKName = "${rootProject.name}_" + szShortVersionName + ".apk"
|
|
||||||
String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk"
|
String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk"
|
||||||
println "CommonTagAPKName is : " + szCommonTagAPKName
|
println "CommonTagAPKName is : " + szCommonTagAPKName
|
||||||
|
|
||||||
//File outTagDir = new File(fWinBoLLStudioDir, "/${rootProject.name}/tag/")
|
|
||||||
File outTagDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/${variant.buildType.name}/")
|
File outTagDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/${variant.buildType.name}/")
|
||||||
// 创建目标路径目录
|
// 创建目标路径目录
|
||||||
if(!outTagDir.exists()) {
|
if(!outTagDir.exists()) {
|
||||||
@@ -284,13 +294,11 @@ android {
|
|||||||
if(outTagDir.exists()) {
|
if(outTagDir.exists()) {
|
||||||
File targetAPK = new File(outTagDir, "${szCommonTagAPKName}")
|
File targetAPK = new File(outTagDir, "${szCommonTagAPKName}")
|
||||||
if(targetAPK.exists()) {
|
if(targetAPK.exists()) {
|
||||||
// 标签版本APK文件已经存在,构建拷贝任务停止
|
|
||||||
println '如果是在调试 Stage 版应用包构建,请删除(注:在debug目录)现有的 Stage 应用包('+targetAPK.getAbsolutePath()+')。再编译一次。'
|
println '如果是在调试 Stage 版应用包构建,请删除(注:在debug目录)现有的 Stage 应用包('+targetAPK.getAbsolutePath()+')。再编译一次。'
|
||||||
assert (!targetAPK.exists())
|
assert (!targetAPK.exists())
|
||||||
// 可选择删除并继续输出APK文件
|
|
||||||
//delete targetAPK
|
|
||||||
}
|
}
|
||||||
// 复制一个备份
|
// 复制完整版APK
|
||||||
|
def debugFullApk = new File(outTagDir, outputFileName)
|
||||||
copy{
|
copy{
|
||||||
from file.outputFile
|
from file.outputFile
|
||||||
into outTagDir
|
into outTagDir
|
||||||
@@ -299,7 +307,16 @@ android {
|
|||||||
}
|
}
|
||||||
println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${outputFileName}"
|
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{
|
copy{
|
||||||
from file.outputFile
|
from file.outputFile
|
||||||
into outTagDir
|
into outTagDir
|
||||||
@@ -308,8 +325,13 @@ android {
|
|||||||
}
|
}
|
||||||
println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${szCommonTagAPKName}"
|
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}"
|
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}"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ WinBoLL AndroidX 可视化元素类库。
|
|||||||
|
|
||||||
1. Fork 本仓库
|
1. Fork 本仓库
|
||||||
2. 新建 Feat_xxx 分支
|
2. 新建 Feat_xxx 分支
|
||||||
3. 提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
|
3. 提交代码 : ZhanGSKen(ZhanGSKen<ZhanGSKen@QQ.COM>)
|
||||||
4. 新建 Pull Request
|
4. 新建 Pull Request
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,10 @@ android {
|
|||||||
applicationId "cc.winboll.studio.aes"
|
applicationId "cc.winboll.studio.aes"
|
||||||
minSdkVersion 26
|
minSdkVersion 26
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
versionCode 1
|
//1. Android 官方规则
|
||||||
|
//- versionCode 类型:int 整型
|
||||||
|
//- Java int 最大值:2147483647
|
||||||
|
versionCode 1520000
|
||||||
// versionName 更新后需要手动设置
|
// versionName 更新后需要手动设置
|
||||||
// 项目模块目录的 build.gradle 文件的 stageCount=0
|
// 项目模块目录的 build.gradle 文件的 stageCount=0
|
||||||
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Tue May 12 13:11:28 HKT 2026
|
#Wed May 27 20:22:45 HKT 2026
|
||||||
stageCount=4
|
stageCount=11
|
||||||
libraryProject=libaes
|
libraryProject=libaes
|
||||||
baseVersion=15.20
|
baseVersion=15.20
|
||||||
publishVersion=15.20.3
|
publishVersion=15.20.10
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=15.20.4
|
baseBetaVersion=15.20.11
|
||||||
|
|||||||
@@ -18,8 +18,6 @@ public class App extends GlobalApplication {
|
|||||||
@Override
|
@Override
|
||||||
public void onCreate() {
|
public void onCreate() {
|
||||||
super.onCreate();
|
super.onCreate();
|
||||||
setIsDebugging(BuildConfig.DEBUG);
|
|
||||||
//setIsDebugging(false);
|
|
||||||
WinBoLLActivityManager.init(this);
|
WinBoLLActivityManager.init(this);
|
||||||
|
|
||||||
// 初始化 Toast 框架
|
// 初始化 Toast 框架
|
||||||
|
|||||||
@@ -84,11 +84,12 @@ public class MainActivity extends DrawerFragmentActivity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
super.onCreateOptionsMenu(menu);
|
||||||
getMenuInflater().inflate(R.menu.toolbar_main, menu);
|
getMenuInflater().inflate(R.menu.toolbar_main, menu);
|
||||||
// if(App.isDebugging()) {
|
// if(App.isDebugging()) {
|
||||||
// getMenuInflater().inflate(cc.winboll.studio.libaes.R.menu.toolbar_studio_debug, menu);
|
// getMenuInflater().inflate(cc.winboll.studio.libaes.R.menu.toolbar_studio_debug, menu);
|
||||||
// }
|
// }
|
||||||
return super.onCreateOptionsMenu(menu);
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ WinBoLL 安卓手机端安卓应用开发基础类库。
|
|||||||
|
|
||||||
1. Fork 本仓库
|
1. Fork 本仓库
|
||||||
2. 新建 Feat_xxx 分支
|
2. 新建 Feat_xxx 分支
|
||||||
3. 提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
|
3. 提交代码 : ZhanGSKen(ZhanGSKen<ZhanGSKen@QQ.COM>)
|
||||||
4. 新建 Pull Request
|
4. 新建 Pull Request
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,10 @@ android {
|
|||||||
applicationId "cc.winboll.studio.appbase"
|
applicationId "cc.winboll.studio.appbase"
|
||||||
minSdkVersion 26
|
minSdkVersion 26
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
versionCode 1
|
//1. Android 官方规则
|
||||||
|
//- versionCode 类型:int 整型
|
||||||
|
//- Java int 最大值:2147483647
|
||||||
|
versionCode 1520000
|
||||||
// versionName 更新后需要手动设置
|
// versionName 更新后需要手动设置
|
||||||
// .winboll/winbollBuildProps.properties 文件的 stageCount=0
|
// .winboll/winbollBuildProps.properties 文件的 stageCount=0
|
||||||
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Tue May 12 09:17:15 HKT 2026
|
#Wed May 27 14:51:29 HKT 2026
|
||||||
stageCount=10
|
stageCount=23
|
||||||
libraryProject=libappbase
|
libraryProject=libappbase
|
||||||
baseVersion=15.20
|
baseVersion=15.20
|
||||||
publishVersion=15.20.9
|
publishVersion=15.20.22
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=15.20.10
|
baseBetaVersion=15.20.23
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ public class AboutActivity extends Activity {
|
|||||||
appInfo.setAppName("APPBase");
|
appInfo.setAppName("APPBase");
|
||||||
appInfo.setAppIcon(R.drawable.ic_winboll);
|
appInfo.setAppIcon(R.drawable.ic_winboll);
|
||||||
appInfo.setAppDescription(getString(R.string.app_description));
|
appInfo.setAppDescription(getString(R.string.app_description));
|
||||||
appInfo.setAppGitName("WinBoLL");
|
appInfo.setAppGitName("APPBase");
|
||||||
appInfo.setAppGitOwner("Studio");
|
appInfo.setAppGitOwner("Studio");
|
||||||
appInfo.setAppGitAPPBranch(branchName);
|
appInfo.setAppGitAPPBranch(branchName);
|
||||||
appInfo.setAppGitAPPSubProjectFolder(branchName);
|
appInfo.setAppGitAPPSubProjectFolder(branchName);
|
||||||
|
|||||||
@@ -22,12 +22,6 @@ public class App extends GlobalApplication {
|
|||||||
@Override
|
@Override
|
||||||
public void onCreate() {
|
public void onCreate() {
|
||||||
super.onCreate();
|
super.onCreate();
|
||||||
// 如果应用不在调试状态,就根据编译类型设置调试状态
|
|
||||||
if (isDebugging() != true) {
|
|
||||||
setIsDebugging(BuildConfig.DEBUG);
|
|
||||||
}
|
|
||||||
// release 版调试码
|
|
||||||
//setIsDebugging(!BuildConfig.DEBUG);
|
|
||||||
|
|
||||||
// 初始化 Toast 工具类(传入应用全局上下文,确保 Toast 可在任意地方调用)
|
// 初始化 Toast 工具类(传入应用全局上下文,确保 Toast 可在任意地方调用)
|
||||||
ToastUtils.init(getApplicationContext());
|
ToastUtils.init(getApplicationContext());
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ package cc.winboll.studio.appbase.model;
|
|||||||
|
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
import cc.winboll.studio.libappbase.BaseBean;
|
|
||||||
import cc.winboll.studio.libappbase.LogUtils;
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -21,6 +21,11 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 米盟 SDK
|
// 米盟 SDK
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_1_7
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_7
|
||||||
|
}
|
||||||
|
|
||||||
packagingOptions {
|
packagingOptions {
|
||||||
doNotStrip "*/*/libmimo_1011.so"
|
doNotStrip "*/*/libmimo_1011.so"
|
||||||
}
|
}
|
||||||
@@ -61,9 +66,9 @@ dependencies {
|
|||||||
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
|
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
|
||||||
|
|
||||||
// WinBoLL库 nexus.winboll.cc 地址
|
// WinBoLL库 nexus.winboll.cc 地址
|
||||||
api 'cc.winboll.studio:libappbase:15.20.9'
|
api 'cc.winboll.studio:libappbase:15.20.22'
|
||||||
// 备用库 jitpack.io 地址
|
// 备用库 jitpack.io 地址
|
||||||
//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'
|
//api 'com.github.ZhanGSKen:libappbase:appbase-v15.15.21'
|
||||||
|
|
||||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Tue May 12 13:11:09 HKT 2026
|
#Wed May 27 20:22:45 HKT 2026
|
||||||
stageCount=4
|
stageCount=11
|
||||||
libraryProject=libaes
|
libraryProject=libaes
|
||||||
baseVersion=15.20
|
baseVersion=15.20
|
||||||
publishVersion=15.20.3
|
publishVersion=15.20.10
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=15.20.4
|
baseBetaVersion=15.20.11
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ package cc.winboll.studio.libaes.models;
|
|||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
import cc.winboll.studio.libaes.R;
|
import cc.winboll.studio.libaes.R;
|
||||||
import cc.winboll.studio.libappbase.BaseBean;
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
public class AESThemeBean extends BaseBean {
|
public class AESThemeBean extends BaseBean {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ package cc.winboll.studio.libaes.models;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
import cc.winboll.studio.libappbase.BaseBean;
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
public class WinBoLLClientServiceBean extends BaseBean {
|
public class WinBoLLClientServiceBean extends BaseBean {
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
android:layout_marginTop="0dp"> <!-- 移除顶部多余间距 -- android:background="@drawable/bg_container_border">
|
android:layout_marginTop="0dp"> <!-- 移除顶部多余间距 - android:background="@drawable/bg_container_border" -->
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/iv_winboll_store"
|
android:id="@+id/iv_winboll_store"
|
||||||
|
|||||||
@@ -28,6 +28,6 @@
|
|||||||
<color name="toolbarTextColor">#FFFFFFFF</color>
|
<color name="toolbarTextColor">#FFFFFFFF</color>
|
||||||
<color name="mainWindowBackgroundColor">#FF2C2C2C</color>
|
<color name="mainWindowBackgroundColor">#FF2C2C2C</color>
|
||||||
<color name="mainWindowTextColor">#FFFFFFFF</color>
|
<color name="mainWindowTextColor">#FFFFFFFF</color>
|
||||||
<color name="debugTextColor">#FFFF0000</color>
|
<color name="debugTextColor">#FFAAAAAA</color>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -28,6 +28,6 @@
|
|||||||
<color name="toolbarTextColor">#FFFFFFFF</color>
|
<color name="toolbarTextColor">#FFFFFFFF</color>
|
||||||
<color name="mainWindowBackgroundColor">#FFFFFFFF</color>
|
<color name="mainWindowBackgroundColor">#FFFFFFFF</color>
|
||||||
<color name="mainWindowTextColor">#FF000000</color>
|
<color name="mainWindowTextColor">#FF000000</color>
|
||||||
<color name="debugTextColor">#FFFF0000</color>
|
<color name="debugTextColor">#FF808080</color>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -2,6 +2,9 @@
|
|||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
<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="themeDebug">@style/DebugActivityTheme</item>
|
||||||
<item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
|
<item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
|
||||||
<item name="aboutViewTextColor">@color/mainWindowTextColor</item>
|
<item name="aboutViewTextColor">@color/mainWindowTextColor</item>
|
||||||
@@ -40,16 +43,16 @@
|
|||||||
|
|
||||||
<style name="AESAToolbar">
|
<style name="AESAToolbar">
|
||||||
<item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
|
<item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
|
||||||
<item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
|
<item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
|
||||||
<item name="attrAToolbarCenterColor">@color/colorPrimary</item>
|
<item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
|
||||||
<item name="attrAToolbarEndColor">@color/colorAccent</item>
|
<item name="attrAToolbarEndColor">?attr/colorAccent</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="AESASupportToolbar">
|
<style name="AESASupportToolbar">
|
||||||
<item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
|
<item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
|
||||||
<item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
|
<item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
|
||||||
<item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
|
<item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
|
||||||
<item name="attrASupportToolbarEndColor">@color/colorAccent</item>
|
<item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="DepthAESTheme" parent="AESTheme">
|
<style name="DepthAESTheme" parent="AESTheme">
|
||||||
|
|||||||
@@ -25,14 +25,5 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// 网络连接类库
|
|
||||||
api 'com.squareup.okhttp3:okhttp:4.4.1'
|
|
||||||
// Gson
|
|
||||||
api 'com.google.code.gson:gson:2.8.9'
|
|
||||||
// Html 解析
|
|
||||||
api 'org.jsoup:jsoup:1.13.1'
|
|
||||||
// 添加JSch依赖(SFTP核心,com.jcraft:jsch:0.1.54)
|
|
||||||
api 'com.jcraft:jsch:0.1.54'
|
|
||||||
|
|
||||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Tue May 12 09:16:45 HKT 2026
|
#Wed May 27 14:51:29 HKT 2026
|
||||||
stageCount=10
|
stageCount=23
|
||||||
libraryProject=libappbase
|
libraryProject=libappbase
|
||||||
baseVersion=15.20
|
baseVersion=15.20
|
||||||
publishVersion=15.20.9
|
publishVersion=15.20.22
|
||||||
buildCount=0
|
buildCount=0
|
||||||
baseBetaVersion=15.20.10
|
baseBetaVersion=15.20.23
|
||||||
|
|||||||
@@ -3,18 +3,6 @@
|
|||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="cc.winboll.studio.libappbase">
|
package="cc.winboll.studio.libappbase">
|
||||||
|
|
||||||
<!-- 拥有完全的网络访问权限 -->
|
|
||||||
<uses-permission android:name="android.permission.INTERNET"/>
|
|
||||||
|
|
||||||
<!-- 读取您共享存储空间中的内容 -->
|
|
||||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
|
|
||||||
|
|
||||||
<!-- 修改或删除您共享存储空间中的内容 -->
|
|
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
|
||||||
|
|
||||||
<!-- MANAGE_EXTERNAL_STORAGE -->
|
|
||||||
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
|
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:requestLegacyExternalStorage="true"
|
android:requestLegacyExternalStorage="true"
|
||||||
android:networkSecurityConfig="@xml/network_security_config">
|
android:networkSecurityConfig="@xml/network_security_config">
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package cc.winboll.studio.libappbase;
|
|||||||
|
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -129,11 +129,10 @@ public class GlobalApplication extends Application {
|
|||||||
// 初始化单例实例(确保在所有初始化操作前完成)
|
// 初始化单例实例(确保在所有初始化操作前完成)
|
||||||
sInstance = this;
|
sInstance = this;
|
||||||
|
|
||||||
|
restoreDebugStatus();
|
||||||
// 初始化基础组件(日志、崩溃处理、Toast)
|
// 初始化基础组件(日志、崩溃处理、Toast)
|
||||||
initCoreComponents();
|
initCoreComponents();
|
||||||
// 恢复/初始化调试模式状态(从本地文件读取,无文件则默认关闭调试)
|
// 初始化服务器地址(从 SP 读取到内存,提高后续访问效率)
|
||||||
restoreDebugStatus();
|
|
||||||
// 新增:初始化服务器地址(从 SP 读取到内存,提高后续访问效率)
|
|
||||||
initWinbollHost();
|
initWinbollHost();
|
||||||
|
|
||||||
LogUtils.d(TAG, "GlobalApplication 初始化完成,单例实例已创建");
|
LogUtils.d(TAG, "GlobalApplication 初始化完成,单例实例已创建");
|
||||||
@@ -144,7 +143,11 @@ public class GlobalApplication extends Application {
|
|||||||
*/
|
*/
|
||||||
private void initCoreComponents() {
|
private void initCoreComponents() {
|
||||||
// 初始化日志工具(传入 Application 上下文)
|
// 初始化日志工具(传入 Application 上下文)
|
||||||
LogUtils.init(this);
|
|
||||||
|
// 调试状态下初始化日志工具
|
||||||
|
if (GlobalApplication.isDebugging()) {
|
||||||
|
LogUtils.init(this);
|
||||||
|
}
|
||||||
// 初始化全局异常处理器(捕获应用崩溃信息,用于调试或上报)
|
// 初始化全局异常处理器(捕获应用崩溃信息,用于调试或上报)
|
||||||
CrashHandler.init(this);
|
CrashHandler.init(this);
|
||||||
// 初始化 Toast 工具(统一 Toast 样式、避免内存泄漏等)
|
// 初始化 Toast 工具(统一 Toast 样式、避免内存泄漏等)
|
||||||
|
|||||||
@@ -27,6 +27,11 @@ public class LogActivity extends Activity {
|
|||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
if(!GlobalApplication.isDebugging()) {
|
||||||
|
ToastUtils.show("非调试状态日志功能不可用");
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
// 设置布局文件(包含 LogView 控件)
|
// 设置布局文件(包含 LogView 控件)
|
||||||
setContentView(R.layout.activity_log);
|
setContentView(R.layout.activity_log);
|
||||||
|
|
||||||
|
|||||||
@@ -67,45 +67,29 @@ public class LogUtils {
|
|||||||
|
|
||||||
// ====================== 初始化入口 ======================
|
// ====================== 初始化入口 ======================
|
||||||
public static void init(final Context context) {
|
public static void init(final Context context) {
|
||||||
init(context, LOG_LEVEL.Off);
|
init(context, LOG_LEVEL.Off);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void init(final Context context, final LOG_LEVEL logLevel) {
|
public static void init(final Context context, final LOG_LEVEL logLevel) {
|
||||||
Log.d(TAG, "init 执行日志工具初始化");
|
if (!GlobalApplication.isDebugging()) {
|
||||||
_mContext = context;
|
return;
|
||||||
|
}
|
||||||
|
Log.d(TAG, "init 执行日志工具初始化");
|
||||||
|
_mContext = context;
|
||||||
|
|
||||||
if (GlobalApplication.isDebugging()) {
|
initLogUtilsDir();
|
||||||
initDebugDir();
|
|
||||||
} else {
|
|
||||||
initReleaseDir();
|
|
||||||
}
|
|
||||||
|
|
||||||
initLogConfigBean();
|
initLogConfigBean();
|
||||||
addClassTAGList();
|
addClassTAGList();
|
||||||
loadTAGBeanSettings();
|
loadTAGBeanSettings();
|
||||||
checkAndTrimLogFileSize();
|
checkAndTrimLogFileSize();
|
||||||
|
|
||||||
_IsInited = true;
|
_IsInited = true;
|
||||||
Log.d(TAG, "init 日志工具初始化完成");
|
Log.d(TAG, "init 执行日志工具初始化完成");
|
||||||
}
|
}
|
||||||
|
|
||||||
// ====================== 目录初始化 ======================
|
// ====================== 目录初始化 ======================
|
||||||
private static void initDebugDir() {
|
private static void initLogUtilsDir() {
|
||||||
final Context appContext = _mContext.getApplicationContext();
|
|
||||||
_mfLogCacheDir = new File(appContext.getExternalCacheDir(), TAG);
|
|
||||||
if (!_mfLogCacheDir.exists()) {
|
|
||||||
_mfLogCacheDir.mkdirs();
|
|
||||||
}
|
|
||||||
_mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
|
|
||||||
|
|
||||||
_mfLogDataDir = appContext.getExternalFilesDir(TAG);
|
|
||||||
if (!_mfLogDataDir.exists()) {
|
|
||||||
_mfLogDataDir.mkdirs();
|
|
||||||
}
|
|
||||||
_mfLogUtilsBeanFile = new File(_mfLogDataDir, TAG + ".json");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void initReleaseDir() {
|
|
||||||
final Context appContext = _mContext.getApplicationContext();
|
final Context appContext = _mContext.getApplicationContext();
|
||||||
_mfLogCacheDir = new File(appContext.getCacheDir(), TAG);
|
_mfLogCacheDir = new File(appContext.getCacheDir(), TAG);
|
||||||
if (!_mfLogCacheDir.exists()) {
|
if (!_mfLogCacheDir.exists()) {
|
||||||
@@ -113,7 +97,7 @@ public class LogUtils {
|
|||||||
}
|
}
|
||||||
_mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
|
_mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
|
||||||
|
|
||||||
_mfLogDataDir = new File(appContext.getFilesDir(), TAG);
|
_mfLogDataDir = appContext.getExternalFilesDir(TAG);
|
||||||
if (!_mfLogDataDir.exists()) {
|
if (!_mfLogDataDir.exists()) {
|
||||||
_mfLogDataDir.mkdirs();
|
_mfLogDataDir.mkdirs();
|
||||||
}
|
}
|
||||||
@@ -135,8 +119,8 @@ public class LogUtils {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final long MAX_FILE_SIZE = 6291456L;
|
final long KEEP_FILE_SIZE = 25000L; // ~25KB 确保剪贴板可完整复制
|
||||||
final long KEEP_FILE_SIZE = 3145728L;
|
final long MAX_FILE_SIZE = 2 * KEEP_FILE_SIZE;
|
||||||
final long fileSize = _mfLogCatchFile.length();
|
final long fileSize = _mfLogCatchFile.length();
|
||||||
|
|
||||||
if (fileSize <= MAX_FILE_SIZE) {
|
if (fileSize <= MAX_FILE_SIZE) {
|
||||||
@@ -266,6 +250,9 @@ public class LogUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void setTAGListEnable(final String tag, final boolean isEnable) {
|
public static void setTAGListEnable(final String tag, final boolean isEnable) {
|
||||||
|
if (!_IsInited) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
final Iterator<Map.Entry<String, Boolean>> iterator = mapTAGList.entrySet().iterator();
|
final Iterator<Map.Entry<String, Boolean>> iterator = mapTAGList.entrySet().iterator();
|
||||||
while (iterator.hasNext()) {
|
while (iterator.hasNext()) {
|
||||||
final Map.Entry<String, Boolean> entry = iterator.next();
|
final Map.Entry<String, Boolean> entry = iterator.next();
|
||||||
@@ -279,6 +266,9 @@ public class LogUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void setALlTAGListEnable(final boolean isEnable) {
|
public static void setALlTAGListEnable(final boolean isEnable) {
|
||||||
|
if (!_IsInited) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
for (final Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
|
for (final Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
|
||||||
entry.setValue(isEnable);
|
entry.setValue(isEnable);
|
||||||
}
|
}
|
||||||
@@ -288,15 +278,22 @@ public class LogUtils {
|
|||||||
|
|
||||||
// ====================== 日志级别控制 ======================
|
// ====================== 日志级别控制 ======================
|
||||||
public static void setLogLevel(final LOG_LEVEL logLevel) {
|
public static void setLogLevel(final LOG_LEVEL logLevel) {
|
||||||
|
if (_mLogUtilsBean == null) {
|
||||||
|
Log.d(TAG, "setLogLevel LogUtils未初始化,忽略设置日志级别");
|
||||||
|
return;
|
||||||
|
}
|
||||||
_mLogUtilsBean.setLogLevel(logLevel);
|
_mLogUtilsBean.setLogLevel(logLevel);
|
||||||
_mLogUtilsBean.saveBeanToFile(_mfLogUtilsBeanFile.getPath(), _mLogUtilsBean);
|
_mLogUtilsBean.saveBeanToFile(_mfLogUtilsBeanFile.getPath(), _mLogUtilsBean);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LOG_LEVEL getLogLevel() {
|
public static LOG_LEVEL getLogLevel() {
|
||||||
return _mLogUtilsBean.getLogLevel();
|
return _mLogUtilsBean == null ?LOG_LEVEL.Off: _mLogUtilsBean.getLogLevel();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isLoggable(final String tag, final LOG_LEVEL logLevel) {
|
private static boolean isLoggable(final String tag, final LOG_LEVEL logLevel) {
|
||||||
|
if (!GlobalApplication.isDebugging()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if (!_IsInited) {
|
if (!_IsInited) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package cc.winboll.studio.libappbase;
|
|||||||
|
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package cc.winboll.studio.libappbase;
|
|||||||
|
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package cc.winboll.studio.libappbase;
|
package cc.winboll.studio.libappbase;
|
||||||
|
|
||||||
import android.os.FileObserver;
|
import android.os.FileObserver;
|
||||||
|
import java.io.File;
|
||||||
import java.lang.ref.WeakReference;
|
import java.lang.ref.WeakReference;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -51,30 +52,38 @@ public class LogViewThread extends Thread {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
// 获取日志缓存目录路径(从 LogUtils 统一获取,确保路径一致性)
|
// 调试状态进行日志输出任务
|
||||||
String logDirPath = LogUtils.getLogCacheDir().getPath();
|
if (GlobalApplication.isDebugging()) {
|
||||||
LogUtils.d(TAG, "启动日志文件监听,监听目录:" + logDirPath);
|
// 获取日志缓存目录路径(从 LogUtils 统一获取,确保路径一致性)
|
||||||
|
File logDir = LogUtils.getLogCacheDir();
|
||||||
|
if (logDir == null) {
|
||||||
|
LogUtils.d(TAG, "日志缓存目录未初始化,线程退出");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
String logDirPath = logDir.getPath();
|
||||||
|
LogUtils.d(TAG, "启动日志文件监听,监听目录:" + logDirPath);
|
||||||
|
|
||||||
// 初始化日志文件监听器(监听目标目录的文件事件)
|
// 初始化日志文件监听器(监听目标目录的文件事件)
|
||||||
mLogListener = new LogListener(logDirPath);
|
mLogListener = new LogListener(logDirPath);
|
||||||
// 开始监听文件事件(非阻塞,内部通过 Native 层实现)
|
// 开始监听文件事件(非阻塞,内部通过 Native 层实现)
|
||||||
mLogListener.startWatching();
|
mLogListener.startWatching();
|
||||||
|
|
||||||
// 循环等待退出标志(每 1 秒检查一次,降低 CPU 占用)
|
// 循环等待退出标志(每 1 秒检查一次,降低 CPU 占用)
|
||||||
while (!isExit()) {
|
while (!isExit()) {
|
||||||
try {
|
try {
|
||||||
Thread.sleep(1000); // 休眠 1 秒,避免忙等
|
Thread.sleep(1000); // 休眠 1 秒,避免忙等
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
// 线程被中断时,恢复中断标志并退出循环(避免无限阻塞)
|
// 线程被中断时,恢复中断标志并退出循环(避免无限阻塞)
|
||||||
Thread.currentThread().interrupt();
|
Thread.currentThread().interrupt();
|
||||||
LogUtils.d(TAG, "日志监听线程被中断,准备退出。" + e);
|
LogUtils.d(TAG, "日志监听线程被中断,准备退出。" + e);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 收到退出标志,停止监听并释放资源
|
// 收到退出标志,停止监听并释放资源
|
||||||
mLogListener.stopWatching();
|
mLogListener.stopWatching();
|
||||||
LogUtils.d(TAG, "日志文件监听已停止,线程退出");
|
LogUtils.d(TAG, "日志文件监听已停止,线程退出");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -0,0 +1,415 @@
|
|||||||
|
package cc.winboll.studio.libappbase.models.libs1520000;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.util.JsonReader;
|
||||||
|
import android.util.JsonWriter;
|
||||||
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
|
import cc.winboll.studio.libappbase.UTF8FileUtils;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.StringReader;
|
||||||
|
import java.io.StringWriter;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* WinBoLL JSON 数据模型基类(抽象类)
|
||||||
|
* 定义 Json Bean 的核心规范:序列化/反序列化、文件持久化、列表处理等通用逻辑,
|
||||||
|
* 子类需实现抽象方法,完成自身字段JSON读写业务逻辑
|
||||||
|
* @Author 豆包&ZhanGSKen<zhangsken@qq.com>
|
||||||
|
* @CreateTime 2026/05/19 22:33:00
|
||||||
|
* @EditTime 2026/05/19 23:15:48
|
||||||
|
* @param <T> 泛型约束,限定子类必须继承自BaseBean
|
||||||
|
*/
|
||||||
|
public abstract class BaseBean<T extends BaseBean> {
|
||||||
|
|
||||||
|
// ====================== 静态常量 ======================
|
||||||
|
/** 日志输出标识TAG */
|
||||||
|
public static final String TAG = "BaseBean";
|
||||||
|
/** JSON存储Bean类名字段Key,用于类型校验 */
|
||||||
|
static final String BEAN_NAME = "BeanName";
|
||||||
|
|
||||||
|
// ====================== 构造方法 ======================
|
||||||
|
/**
|
||||||
|
* 无参空构造,满足反射实例化要求
|
||||||
|
*/
|
||||||
|
public BaseBean() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// ====================== 抽象方法 ======================
|
||||||
|
/**
|
||||||
|
* 获取当前实体类全类名
|
||||||
|
* @return 全限定类名字符串
|
||||||
|
*/
|
||||||
|
public abstract String getName();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 从JSON读取器解析构建实体对象
|
||||||
|
* @param jsonReader JSON读取流
|
||||||
|
* @return 解析完成实体对象
|
||||||
|
* @throws IOException IO读写异常
|
||||||
|
*/
|
||||||
|
public abstract T readBeanFromJsonReader(final JsonReader jsonReader) throws IOException;
|
||||||
|
|
||||||
|
// ====================== 路径获取相关 ======================
|
||||||
|
/**
|
||||||
|
* 获取单个实体默认存储JSON文件路径
|
||||||
|
* @param context 应用上下文
|
||||||
|
* @return 文件绝对路径
|
||||||
|
*/
|
||||||
|
public String getBeanJsonFilePath(final Context context) {
|
||||||
|
return context.getExternalFilesDir(TAG) + "/" + getName() + ".json";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取实体列表默认存储JSON文件路径
|
||||||
|
* @param context 应用上下文
|
||||||
|
* @return 文件绝对路径
|
||||||
|
*/
|
||||||
|
public String getBeanListJsonFilePath(final Context context) {
|
||||||
|
return context.getExternalFilesDir(TAG) + "/" + getName() + "_List.json";
|
||||||
|
}
|
||||||
|
|
||||||
|
// ====================== JSON序列化基础方法 ======================
|
||||||
|
/**
|
||||||
|
* 写入基础Bean标识字段至JSON
|
||||||
|
* @param jsonWriter JSON写入流
|
||||||
|
* @throws IOException 写入异常
|
||||||
|
*/
|
||||||
|
public void writeThisToJsonWriter(final JsonWriter jsonWriter) throws IOException {
|
||||||
|
jsonWriter.name(BEAN_NAME).value(getName());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 基类通用字段解析回调
|
||||||
|
* @param jsonReader JSON读取流
|
||||||
|
* @param name 字段名
|
||||||
|
* @return 是否完成当前字段解析
|
||||||
|
* @throws IOException 读取异常
|
||||||
|
*/
|
||||||
|
public boolean initObjectsFromJsonReader(final JsonReader jsonReader, final String name) throws IOException {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ====================== 实体字符串序列化 ======================
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
LogUtils.d(TAG, "执行BaseBean实体转JSON字符串");
|
||||||
|
final StringWriter stringWriter = new StringWriter();
|
||||||
|
final JsonWriter jsonWriter = new JsonWriter(stringWriter);
|
||||||
|
jsonWriter.setIndent(" ");
|
||||||
|
try {
|
||||||
|
jsonWriter.beginObject();
|
||||||
|
writeThisToJsonWriter(jsonWriter);
|
||||||
|
jsonWriter.endObject();
|
||||||
|
return stringWriter.toString();
|
||||||
|
} catch (final IOException e) {
|
||||||
|
LogUtils.d(TAG, "实体转JSON字符串异常", Thread.currentThread().getStackTrace());
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
// ====================== 列表序列化工具 ======================
|
||||||
|
/**
|
||||||
|
* Bean列表转为格式化JSON数组字符串
|
||||||
|
* @param beanList 实体集合
|
||||||
|
* @param <T> 实体泛型
|
||||||
|
* @return JSON字符串
|
||||||
|
*/
|
||||||
|
public static <T extends BaseBean> String toStringByBeanList(final ArrayList<T> beanList) {
|
||||||
|
LogUtils.d(TAG, "执行Bean列表序列化JSON操作");
|
||||||
|
try {
|
||||||
|
final StringWriter stringWriter = new StringWriter();
|
||||||
|
final JsonWriter jsonWriter = new JsonWriter(stringWriter);
|
||||||
|
jsonWriter.setIndent(" ");
|
||||||
|
jsonWriter.beginArray();
|
||||||
|
for (int i = 0; i < beanList.size(); i++) {
|
||||||
|
jsonWriter.beginObject();
|
||||||
|
beanList.get(i).writeThisToJsonWriter(jsonWriter);
|
||||||
|
jsonWriter.endObject();
|
||||||
|
}
|
||||||
|
jsonWriter.endArray();
|
||||||
|
jsonWriter.close();
|
||||||
|
return stringWriter.toString();
|
||||||
|
} catch (final IOException e) {
|
||||||
|
LogUtils.d(TAG, "列表序列化JSON异常", Thread.currentThread().getStackTrace());
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
// ====================== JSON字符串解析实体 ======================
|
||||||
|
/**
|
||||||
|
* JSON文本解析为单个实体对象
|
||||||
|
* @param szBean JSON文本
|
||||||
|
* @param clazz 实体Class字节码
|
||||||
|
* @param <T> 实体泛型
|
||||||
|
* @return 解析完成实体
|
||||||
|
* @throws IOException 解析IO异常
|
||||||
|
*/
|
||||||
|
public static <T extends BaseBean> T parseStringToBean(final String szBean, final Class<T> clazz) throws IOException {
|
||||||
|
LogUtils.d(TAG, "进入字符串解析实体方法,目标Class:" + clazz.getSimpleName());
|
||||||
|
final StringReader stringReader = new StringReader(szBean);
|
||||||
|
final JsonReader jsonReader = new JsonReader(stringReader);
|
||||||
|
try {
|
||||||
|
final T beanTemp = clazz.newInstance();
|
||||||
|
return (T) beanTemp.readBeanFromJsonReader(jsonReader);
|
||||||
|
} catch (final InstantiationException e) {
|
||||||
|
LogUtils.d(TAG, "实体反射实例化失败(InstantiationException)", Thread.currentThread().getStackTrace());
|
||||||
|
} catch (final IllegalAccessException e) {
|
||||||
|
LogUtils.d(TAG, "实体反射权限访问失败(IllegalAccessException)", Thread.currentThread().getStackTrace());
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* JSON数组文本解析填充实体列表
|
||||||
|
* @param szBeanList JSON数组文本
|
||||||
|
* @param beanList 目标存储集合
|
||||||
|
* @param clazz 实体字节码
|
||||||
|
* @param <T> 实体泛型
|
||||||
|
* @return 解析结果
|
||||||
|
*/
|
||||||
|
public static <T extends BaseBean> boolean parseStringToBeanList(final String szBeanList, ArrayList<T> beanList, final Class<T> clazz) {
|
||||||
|
LogUtils.d(TAG, "进入列表字符串解析方法");
|
||||||
|
try {
|
||||||
|
if (beanList == null) {
|
||||||
|
beanList = new ArrayList<T>();
|
||||||
|
} else {
|
||||||
|
beanList.clear();
|
||||||
|
}
|
||||||
|
final StringReader stringReader = new StringReader(szBeanList);
|
||||||
|
final JsonReader jsonReader = new JsonReader(stringReader);
|
||||||
|
jsonReader.beginArray();
|
||||||
|
while (jsonReader.hasNext()) {
|
||||||
|
final T beanTemp = clazz.newInstance();
|
||||||
|
final T bean = (T) beanTemp.readBeanFromJsonReader(jsonReader);
|
||||||
|
if (bean != null) {
|
||||||
|
beanList.add(bean);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
jsonReader.endArray();
|
||||||
|
return true;
|
||||||
|
} catch (final InstantiationException e) {
|
||||||
|
LogUtils.d(TAG, "列表解析反射实例化异常", Thread.currentThread().getStackTrace());
|
||||||
|
} catch (final IllegalAccessException e) {
|
||||||
|
LogUtils.d(TAG, "列表解析反射权限异常", Thread.currentThread().getStackTrace());
|
||||||
|
} catch (final IOException e) {
|
||||||
|
LogUtils.d(TAG, "列表解析JSON读写异常", Thread.currentThread().getStackTrace());
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ====================== 文件加载实体 ======================
|
||||||
|
/**
|
||||||
|
* 从默认路径加载单个实体
|
||||||
|
* @param context 上下文
|
||||||
|
* @param clazz 实体字节码
|
||||||
|
* @param <T> 实体泛型
|
||||||
|
* @return 加载实体
|
||||||
|
*/
|
||||||
|
public static <T extends BaseBean> T loadBean(final Context context, final Class<T> clazz) {
|
||||||
|
LogUtils.d(TAG, "执行默认路径加载实体数据");
|
||||||
|
try {
|
||||||
|
final T beanTemp = clazz.newInstance();
|
||||||
|
return loadBeanFromFile(beanTemp.getBeanJsonFilePath(context), clazz);
|
||||||
|
} catch (final InstantiationException e) {
|
||||||
|
LogUtils.d(TAG, "加载实体反射实例化失败", Thread.currentThread().getStackTrace());
|
||||||
|
} catch (final IllegalAccessException e) {
|
||||||
|
LogUtils.d(TAG, "加载实体反射权限失败", Thread.currentThread().getStackTrace());
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 自定义文件路径加载单个实体
|
||||||
|
* @param szFilePath 文件路径
|
||||||
|
* @param clazz 实体字节码
|
||||||
|
* @param <T> 实体泛型
|
||||||
|
* @return 实体对象
|
||||||
|
*/
|
||||||
|
public static <T extends BaseBean> T loadBeanFromFile(final String szFilePath, final Class<T> clazz) {
|
||||||
|
LogUtils.d(TAG, "指定路径加载实体,路径:" + szFilePath);
|
||||||
|
try {
|
||||||
|
final File file = new File(szFilePath);
|
||||||
|
if (file.exists()) {
|
||||||
|
final T beanTemp = clazz.newInstance();
|
||||||
|
final String json = UTF8FileUtils.readStringFromFile(szFilePath);
|
||||||
|
return beanTemp.parseStringToBean(json, clazz);
|
||||||
|
}
|
||||||
|
} catch (final InstantiationException e) {
|
||||||
|
LogUtils.d(TAG, "文件加载实体反射实例化异常", Thread.currentThread().getStackTrace());
|
||||||
|
} catch (final IllegalAccessException e) {
|
||||||
|
LogUtils.d(TAG, "文件加载实体反射权限异常", Thread.currentThread().getStackTrace());
|
||||||
|
} catch (final IOException e) {
|
||||||
|
LogUtils.d(TAG, "文件读取JSON数据异常", Thread.currentThread().getStackTrace());
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 默认路径加载实体列表
|
||||||
|
* @param context 上下文
|
||||||
|
* @param beanListDst 目标集合
|
||||||
|
* @param clazz 实体字节码
|
||||||
|
* @param <T> 实体泛型
|
||||||
|
* @return 加载结果
|
||||||
|
*/
|
||||||
|
public static <T extends BaseBean> boolean loadBeanList(final Context context, final ArrayList<T> beanListDst, final Class<T> clazz) {
|
||||||
|
LogUtils.d(TAG, "默认路径加载实体列表数据");
|
||||||
|
try {
|
||||||
|
final T beanTemp = clazz.newInstance();
|
||||||
|
return loadBeanListFromFile(beanTemp.getBeanListJsonFilePath(context), beanListDst, clazz);
|
||||||
|
} catch (final InstantiationException e) {
|
||||||
|
LogUtils.d(TAG, "列表加载反射实例化异常", Thread.currentThread().getStackTrace());
|
||||||
|
} catch (final IllegalAccessException e) {
|
||||||
|
LogUtils.d(TAG, "列表加载反射权限异常", Thread.currentThread().getStackTrace());
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 自定义路径加载实体列表
|
||||||
|
* @param szFilePath 文件路径
|
||||||
|
* @param beanList 目标集合
|
||||||
|
* @param clazz 实体字节码
|
||||||
|
* @param <T> 实体泛型
|
||||||
|
* @return 加载结果
|
||||||
|
*/
|
||||||
|
public static <T extends BaseBean> boolean loadBeanListFromFile(final String szFilePath, final ArrayList<T> beanList, final Class<T> clazz) {
|
||||||
|
LogUtils.d(TAG, "指定路径加载实体列表,路径:" + szFilePath);
|
||||||
|
try {
|
||||||
|
final File file = new File(szFilePath);
|
||||||
|
if (file.exists()) {
|
||||||
|
final String listJson = UTF8FileUtils.readStringFromFile(szFilePath);
|
||||||
|
return parseStringToBeanList(listJson, beanList, clazz);
|
||||||
|
}
|
||||||
|
} catch (final IOException e) {
|
||||||
|
LogUtils.d(TAG, "列表文件读取异常", Thread.currentThread().getStackTrace());
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ====================== 实体数据保存文件 ======================
|
||||||
|
/**
|
||||||
|
* 默认路径保存单个实体
|
||||||
|
* @param context 上下文
|
||||||
|
* @param bean 待保存实体
|
||||||
|
* @param <T> 实体泛型
|
||||||
|
* @return 保存结果
|
||||||
|
*/
|
||||||
|
public static <T extends BaseBean> boolean saveBean(final Context context, final T bean) {
|
||||||
|
return saveBeanToFile(bean.getBeanJsonFilePath(context), bean);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 自定义路径保存单个实体
|
||||||
|
* @param szFilePath 保存路径
|
||||||
|
* @param bean 待保存实体
|
||||||
|
* @param <T> 实体泛型
|
||||||
|
* @return 保存结果
|
||||||
|
*/
|
||||||
|
public static <T extends BaseBean> boolean saveBeanToFile(final String szFilePath, final T bean) {
|
||||||
|
LogUtils.d(TAG, "执行实体数据写入文件操作");
|
||||||
|
try {
|
||||||
|
final String json = bean.toString();
|
||||||
|
UTF8FileUtils.writeStringToFile(szFilePath, json);
|
||||||
|
return true;
|
||||||
|
} catch (final IOException e) {
|
||||||
|
LogUtils.d(TAG, "实体写入文件异常", Thread.currentThread().getStackTrace());
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 默认路径保存实体列表
|
||||||
|
* @param context 上下文
|
||||||
|
* @param beanList 实体集合
|
||||||
|
* @param clazz 实体字节码
|
||||||
|
* @param <T> 实体泛型
|
||||||
|
* @return 保存结果
|
||||||
|
*/
|
||||||
|
public static <T extends BaseBean> boolean saveBeanList(final Context context, final ArrayList<T> beanList, final Class<T> clazz) {
|
||||||
|
LogUtils.d(TAG, "默认路径保存实体列表数据");
|
||||||
|
try {
|
||||||
|
final T beanTemp = clazz.newInstance();
|
||||||
|
return saveBeanListToFile(beanTemp.getBeanListJsonFilePath(context), beanList);
|
||||||
|
} catch (final InstantiationException e) {
|
||||||
|
LogUtils.d(TAG, "列表保存反射实例化异常", Thread.currentThread().getStackTrace());
|
||||||
|
} catch (final IllegalAccessException e) {
|
||||||
|
LogUtils.d(TAG, "列表保存反射权限异常", Thread.currentThread().getStackTrace());
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 自定义路径保存实体列表
|
||||||
|
* @param szFilePath 保存路径
|
||||||
|
* @param beanList 实体集合
|
||||||
|
* @param <T> 实体泛型
|
||||||
|
* @return 保存结果
|
||||||
|
*/
|
||||||
|
public static <T extends BaseBean> boolean saveBeanListToFile(final String szFilePath, final ArrayList<T> beanList) {
|
||||||
|
LogUtils.d(TAG, "指定路径保存实体列表数据");
|
||||||
|
try {
|
||||||
|
final String json = toStringByBeanList(beanList);
|
||||||
|
UTF8FileUtils.writeStringToFile(szFilePath, json);
|
||||||
|
return true;
|
||||||
|
} catch (final IOException e) {
|
||||||
|
LogUtils.d(TAG, "列表数据写入文件异常", Thread.currentThread().getStackTrace());
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ====================== Bean类型一致性校验 ======================
|
||||||
|
/**
|
||||||
|
* 校验本地JSON列表内实体类型是否统一
|
||||||
|
* @param szFilePath 列表文件路径
|
||||||
|
* @param clazz 目标校验实体Class
|
||||||
|
* @param <T> 实体泛型
|
||||||
|
* @return 校验结果信息
|
||||||
|
*/
|
||||||
|
public static <T extends BaseBean> String checkIsTheSameBeanListAndFile(final String szFilePath, final Class<T> clazz) {
|
||||||
|
final StringBuilder sbResult = new StringBuilder();
|
||||||
|
final String szErrorInfo = "Check Is The Same Bean List And File Error : ";
|
||||||
|
try {
|
||||||
|
int sameCount = 0;
|
||||||
|
int totalCount = 0;
|
||||||
|
final T beanTemp = clazz.newInstance();
|
||||||
|
final String targetBeanName = beanTemp.getName();
|
||||||
|
final String listJson = UTF8FileUtils.readStringFromFile(szFilePath);
|
||||||
|
final StringReader stringReader = new StringReader(listJson);
|
||||||
|
final JsonReader jsonReader = new JsonReader(stringReader);
|
||||||
|
jsonReader.beginArray();
|
||||||
|
while (jsonReader.hasNext()) {
|
||||||
|
totalCount++;
|
||||||
|
jsonReader.beginObject();
|
||||||
|
while (jsonReader.hasNext()) {
|
||||||
|
final String name = jsonReader.nextName();
|
||||||
|
if (BEAN_NAME.equals(name)) {
|
||||||
|
if (targetBeanName.equals(jsonReader.nextString())) {
|
||||||
|
sameCount++;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
jsonReader.skipValue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
jsonReader.endObject();
|
||||||
|
}
|
||||||
|
jsonReader.endArray();
|
||||||
|
if (sameCount != totalCount) {
|
||||||
|
sbResult.append("Total : ").append(totalCount).append(" Diff : ").append(totalCount - sameCount);
|
||||||
|
}
|
||||||
|
} catch (final InstantiationException e) {
|
||||||
|
sbResult.append(szErrorInfo).append(e);
|
||||||
|
LogUtils.d(TAG, "类型校验反射实例化异常", Thread.currentThread().getStackTrace());
|
||||||
|
} catch (final IllegalAccessException e) {
|
||||||
|
sbResult.append(szErrorInfo).append(e);
|
||||||
|
LogUtils.d(TAG, "类型校验反射权限异常", Thread.currentThread().getStackTrace());
|
||||||
|
} catch (final IOException e) {
|
||||||
|
sbResult.append(szErrorInfo).append(e);
|
||||||
|
LogUtils.d(TAG, "类型校验文件读取解析异常", Thread.currentThread().getStackTrace());
|
||||||
|
}
|
||||||
|
return sbResult.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
package cc.winboll.studio.libappbase.views;
|
package cc.winboll.studio.libappbase.views;
|
||||||
|
|
||||||
|
import android.app.AlertDialog;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.content.DialogInterface;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
@@ -12,13 +14,12 @@ import android.widget.ImageButton;
|
|||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import android.widget.Toast;
|
||||||
import cc.winboll.studio.libappbase.GlobalApplication;
|
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||||
import cc.winboll.studio.libappbase.LogUtils;
|
import cc.winboll.studio.libappbase.LogUtils;
|
||||||
import cc.winboll.studio.libappbase.R;
|
import cc.winboll.studio.libappbase.R;
|
||||||
import cc.winboll.studio.libappbase.ToastUtils;
|
import cc.winboll.studio.libappbase.ToastUtils;
|
||||||
import cc.winboll.studio.libappbase.dialogs.DebugHostDialog;
|
import cc.winboll.studio.libappbase.dialogs.DebugHostDialog;
|
||||||
import cc.winboll.studio.libappbase.dialogs.APPValidationDialog;
|
|
||||||
import cc.winboll.studio.libappbase.models.APPInfo;
|
import cc.winboll.studio.libappbase.models.APPInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -76,12 +77,12 @@ public class AboutView extends LinearLayout {
|
|||||||
private EditText metDevUserPassword;
|
private EditText metDevUserPassword;
|
||||||
|
|
||||||
// ===================================== 页面视图控件 =====================================
|
// ===================================== 页面视图控件 =====================================
|
||||||
private DebugSwitchImageView ivAppIcon;
|
private DebugSwitchInfoImageView ivAppIcon;
|
||||||
private TextView tvAppNameVersion;
|
private TextView tvAppNameVersion;
|
||||||
private TextView tvAppDesc;
|
private TextView tvAppDesc;
|
||||||
private LinearLayout llFunctionContainer;
|
private LinearLayout llFunctionContainer;
|
||||||
private ImageButton ibSebugStepOver;
|
private ImageButton ibSebugStepOver;
|
||||||
private ImageButton ibSigngetDialog;
|
private ImageButton ibDebugUnlock;
|
||||||
private ImageButton ibWinBoLLHostDialog;
|
private ImageButton ibWinBoLLHostDialog;
|
||||||
|
|
||||||
// ===================================== 构造方法(按参数从少到多排序) =====================================
|
// ===================================== 构造方法(按参数从少到多排序) =====================================
|
||||||
@@ -195,12 +196,12 @@ public class AboutView extends LinearLayout {
|
|||||||
llFunctionContainer = findViewById(R.id.ll_function_container);
|
llFunctionContainer = findViewById(R.id.ll_function_container);
|
||||||
// 功能按钮绑定
|
// 功能按钮绑定
|
||||||
ibSebugStepOver = findViewById(R.id.ib_debug_step_over);
|
ibSebugStepOver = findViewById(R.id.ib_debug_step_over);
|
||||||
ibSigngetDialog = findViewById(R.id.ib_signgetdialog);
|
ibDebugUnlock = findViewById(R.id.ib_debug_unlock);
|
||||||
ibWinBoLLHostDialog = findViewById(R.id.ib_winbollhostdialog);
|
ibWinBoLLHostDialog = findViewById(R.id.ib_winbollhostdialog);
|
||||||
|
|
||||||
// 调试按钮统一只在调试模式显示
|
// 调试按钮统一只在调试模式显示
|
||||||
ibWinBoLLHostDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
|
ibWinBoLLHostDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
|
||||||
//ibSigngetDialog.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
|
//ibDebugUnlock.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
|
||||||
ibSebugStepOver.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
|
ibSebugStepOver.setVisibility(GlobalApplication.isDebugging() ? View.VISIBLE : View.GONE);
|
||||||
|
|
||||||
// 绑定按钮点击事件
|
// 绑定按钮点击事件
|
||||||
@@ -312,6 +313,47 @@ public class AboutView extends LinearLayout {
|
|||||||
LogUtils.d(TAG, "initAboutPageView():视图组装完成,功能项加载完毕");
|
LogUtils.d(TAG, "initAboutPageView():视图组装完成,功能项加载完毕");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ===================================== 调试解锁弹窗 =====================================
|
||||||
|
private void showDebugUnlockDialog() {
|
||||||
|
final AlertDialog dialog = new AlertDialog.Builder(mContext).create();
|
||||||
|
dialog.setTitle("应用调试解锁");
|
||||||
|
dialog.setCanceledOnTouchOutside(true);
|
||||||
|
|
||||||
|
final EditText etToken = new EditText(mContext);
|
||||||
|
etToken.setHint("请输入调试Token");
|
||||||
|
dialog.setView(etToken);
|
||||||
|
|
||||||
|
dialog.setButton(DialogInterface.BUTTON_POSITIVE, "调试解锁", (DialogInterface.OnClickListener) null);
|
||||||
|
dialog.setButton(DialogInterface.BUTTON_NEGATIVE, "关闭", (DialogInterface.OnClickListener) null);
|
||||||
|
dialog.setOnShowListener(new DialogInterface.OnShowListener() {
|
||||||
|
@Override
|
||||||
|
public void onShow(DialogInterface d) {
|
||||||
|
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
String inputToken = etToken.getText().toString().trim();
|
||||||
|
String savedToken = DebugSwitchInfoImageView.getDebugToken();
|
||||||
|
if (savedToken != null && savedToken.equals(inputToken)) {
|
||||||
|
GlobalApplication.setIsDebugging(true);
|
||||||
|
GlobalApplication.saveDebugStatus(GlobalApplication.getInstance());
|
||||||
|
Toast.makeText(mContext, "调试解锁成功,重启应用后生效", Toast.LENGTH_SHORT).show();
|
||||||
|
} else {
|
||||||
|
Toast.makeText(mContext, "调试Token不匹配", Toast.LENGTH_SHORT).show();
|
||||||
|
dialog.dismiss();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
dialog.dismiss();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
dialog.show();
|
||||||
|
}
|
||||||
|
|
||||||
// ===================================== 内部工具/事件方法 =====================================
|
// ===================================== 内部工具/事件方法 =====================================
|
||||||
/**
|
/**
|
||||||
* 绑定功能按钮点击事件,处理正版校验、调试地址配置弹窗唤起
|
* 绑定功能按钮点击事件,处理正版校验、调试地址配置弹窗唤起
|
||||||
@@ -328,14 +370,7 @@ public class AboutView extends LinearLayout {
|
|||||||
ToastUtils.show("已取消调试状态,重启应用可生效。");
|
ToastUtils.show("已取消调试状态,重启应用可生效。");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
// 正版校验弹窗
|
|
||||||
ibSigngetDialog.setOnClickListener(new OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
LogUtils.d(TAG, "ibSigngetDialog onClick:唤起应用正版校验弹窗");
|
|
||||||
new APPValidationDialog(mContext, mszAppName, mszAppVersionName).show();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
// 调试地址配置弹窗
|
// 调试地址配置弹窗
|
||||||
ibWinBoLLHostDialog.setOnClickListener(new OnClickListener() {
|
ibWinBoLLHostDialog.setOnClickListener(new OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
@@ -344,6 +379,15 @@ public class AboutView extends LinearLayout {
|
|||||||
new DebugHostDialog(mContext).show();
|
new DebugHostDialog(mContext).show();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 应用调试解锁按钮
|
||||||
|
ibDebugUnlock.setOnClickListener(new OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
LogUtils.d(TAG, "ibDebugUnlock onClick:弹出调试解锁对话框");
|
||||||
|
showDebugUnlockDialog();
|
||||||
|
}
|
||||||
|
});
|
||||||
LogUtils.d(TAG, "setBtnClickListener():功能按钮点击事件绑定完成");
|
LogUtils.d(TAG, "setBtnClickListener():功能按钮点击事件绑定完成");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,127 @@
|
|||||||
|
package cc.winboll.studio.libappbase.views;
|
||||||
|
|
||||||
|
import android.app.AlertDialog;
|
||||||
|
import android.content.ClipData;
|
||||||
|
import android.content.ClipboardManager;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.DialogInterface;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.util.AttributeSet;
|
||||||
|
import android.view.View;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
import java.util.UUID;
|
||||||
|
import cc.winboll.studio.libappbase.GlobalApplication;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Author 豆包&ZhanGSKen<zhangsken@qq.com>
|
||||||
|
* @Date 2026/04/06 19:32
|
||||||
|
* @Describe 应用Logo控件,连续点击6次弹出调试Token对话框,支持复制与重置
|
||||||
|
*/
|
||||||
|
public class DebugSwitchInfoImageView extends ImageView {
|
||||||
|
|
||||||
|
public static final String TAG = "DebugSwitchInfoImageView";
|
||||||
|
|
||||||
|
// 连续点击计数
|
||||||
|
private int mClickCount = 0;
|
||||||
|
// 目标点击次数
|
||||||
|
private static final int TARGET_CLICK_COUNT = 7;
|
||||||
|
|
||||||
|
private static String mDebugToken = null;
|
||||||
|
private static final String SP_DEBUG_TOKEN = "debug_token_prefs";
|
||||||
|
private static final String KEY_DEBUG_TOKEN = "debug_token";
|
||||||
|
|
||||||
|
public static String getDebugToken() {
|
||||||
|
if (mDebugToken != null) {
|
||||||
|
return mDebugToken;
|
||||||
|
}
|
||||||
|
Context context = GlobalApplication.getInstance();
|
||||||
|
if (context != null) {
|
||||||
|
SharedPreferences sp = context.getSharedPreferences(SP_DEBUG_TOKEN, Context.MODE_PRIVATE);
|
||||||
|
mDebugToken = sp.getString(KEY_DEBUG_TOKEN, null);
|
||||||
|
if (mDebugToken == null) {
|
||||||
|
mDebugToken = UUID.randomUUID().toString();
|
||||||
|
sp.edit().putString(KEY_DEBUG_TOKEN, mDebugToken).apply();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return mDebugToken;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void resetDebugToken() {
|
||||||
|
Context context = GlobalApplication.getInstance();
|
||||||
|
if (context != null) {
|
||||||
|
mDebugToken = UUID.randomUUID().toString();
|
||||||
|
SharedPreferences sp = context.getSharedPreferences(SP_DEBUG_TOKEN, Context.MODE_PRIVATE);
|
||||||
|
sp.edit().putString(KEY_DEBUG_TOKEN, mDebugToken).apply();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void showDebugTokenDialog() {
|
||||||
|
final AlertDialog dialog = new AlertDialog.Builder(getContext()).create();
|
||||||
|
dialog.setTitle("调试Token");
|
||||||
|
dialog.setMessage(getDebugToken());
|
||||||
|
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);
|
||||||
|
dialog.setOnShowListener(new DialogInterface.OnShowListener() {
|
||||||
|
@Override
|
||||||
|
public void onShow(DialogInterface d) {
|
||||||
|
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
ClipboardManager cm = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
|
||||||
|
cm.setPrimaryClip(ClipData.newPlainText("DebugToken", getDebugToken()));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
resetDebugToken();
|
||||||
|
dialog.setMessage(getDebugToken());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
dialog.dismiss();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
dialog.show();
|
||||||
|
}
|
||||||
|
|
||||||
|
public DebugSwitchInfoImageView(Context context) {
|
||||||
|
super(context);
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
|
||||||
|
public DebugSwitchInfoImageView(Context context, AttributeSet attrs) {
|
||||||
|
super(context, attrs);
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
|
||||||
|
public DebugSwitchInfoImageView(Context context, AttributeSet attrs, int defStyleAttr) {
|
||||||
|
super(context, attrs, defStyleAttr);
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
|
||||||
|
public DebugSwitchInfoImageView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
|
||||||
|
super(context, attrs, defStyleAttr, defStyleRes);
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void init() {
|
||||||
|
setOnClickListener(new OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
mClickCount++;
|
||||||
|
if (mClickCount >= TARGET_CLICK_COUNT) {
|
||||||
|
mClickCount = 0;
|
||||||
|
showDebugTokenDialog();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
android:paddingRight="16dp"
|
android:paddingRight="16dp"
|
||||||
android:paddingBottom="16dp">
|
android:paddingBottom="16dp">
|
||||||
|
|
||||||
<cc.winboll.studio.libappbase.views.DebugSwitchImageView
|
<cc.winboll.studio.libappbase.views.DebugSwitchInfoImageView
|
||||||
android:id="@+id/iv_app_icon"
|
android:id="@+id/iv_app_icon"
|
||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
@@ -81,7 +81,8 @@
|
|||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
android:src="@drawable/ic_key"
|
android:src="@drawable/ic_key"
|
||||||
android:id="@+id/ib_signgetdialog"
|
android:id="@+id/ib_debug_unlock"
|
||||||
|
android:contentDescription="应用调试解锁"
|
||||||
android:scaleType="fitCenter"
|
android:scaleType="fitCenter"
|
||||||
android:adjustViewBounds="true"
|
android:adjustViewBounds="true"
|
||||||
android:background="@null"/>
|
android:background="@null"/>
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
android:paddingRight="16dp"
|
android:paddingRight="16dp"
|
||||||
android:paddingBottom="16dp">
|
android:paddingBottom="16dp">
|
||||||
|
|
||||||
<cc.winboll.studio.libappbase.views.DebugSwitchImageView
|
<cc.winboll.studio.libappbase.views.DebugSwitchInfoImageView
|
||||||
android:id="@+id/iv_app_icon"
|
android:id="@+id/iv_app_icon"
|
||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
@@ -81,7 +81,8 @@
|
|||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
android:src="@drawable/ic_key"
|
android:src="@drawable/ic_key"
|
||||||
android:id="@+id/ib_signgetdialog"
|
android:id="@+id/ib_debug_unlock"
|
||||||
|
android:contentDescription="应用调试解锁"
|
||||||
android:scaleType="fitCenter"
|
android:scaleType="fitCenter"
|
||||||
android:adjustViewBounds="true"
|
android:adjustViewBounds="true"
|
||||||
android:background="@null"/>
|
android:background="@null"/>
|
||||||
|
|||||||
@@ -60,4 +60,7 @@
|
|||||||
<!-- DebugLogStyle 应用调试日志样式属性 -->
|
<!-- DebugLogStyle 应用调试日志样式属性 -->
|
||||||
<attr name="debugTextColor" format="color"/>
|
<attr name="debugTextColor" format="color"/>
|
||||||
|
|
||||||
|
<!-- 边框圆角属性 -->
|
||||||
|
<attr name="borderCornerRadius" format="dimension"/>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -34,9 +34,23 @@ dependencies {
|
|||||||
// 添加JSch依赖(SFTP核心,com.jcraft:jsch:0.1.54)
|
// 添加JSch依赖(SFTP核心,com.jcraft:jsch:0.1.54)
|
||||||
api 'com.jcraft:jsch:0.1.54'
|
api 'com.jcraft:jsch:0.1.54'
|
||||||
|
|
||||||
|
// 米盟
|
||||||
|
api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
|
||||||
|
//注意:以下5个库必须要引入
|
||||||
|
//implementation 'androidx.appcompat:appcompat:1.4.1'
|
||||||
|
api 'androidx.recyclerview:recyclerview:1.0.0'
|
||||||
|
api 'com.google.code.gson:gson:2.8.5'
|
||||||
|
api 'com.github.bumptech.glide:glide:4.9.0'
|
||||||
|
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
|
||||||
|
|
||||||
// WinBoLL库 nexus.winboll.cc 地址
|
// WinBoLL库 nexus.winboll.cc 地址
|
||||||
api 'cc.winboll.studio:libaes:15.20.3'
|
api 'cc.winboll.studio:libappbase:15.20.21'
|
||||||
api 'cc.winboll.studio:libappbase:15.20.9'
|
api 'cc.winboll.studio:libaes:15.20.9'
|
||||||
|
|
||||||
|
// 备用库 jitpack.io 地址
|
||||||
|
//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.20'
|
||||||
|
//api 'com.github.ZhanGSKen:libaes:aes-v15.20.8'
|
||||||
|
|
||||||
|
|
||||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Fri May 15 08:48:45 GMT 2026
|
#Sun May 31 20:28:41 HKT 2026
|
||||||
stageCount=2
|
stageCount=3
|
||||||
libraryProject=libwinboll
|
libraryProject=libwinboll
|
||||||
baseVersion=15.20
|
baseVersion=15.20
|
||||||
publishVersion=15.20.1
|
publishVersion=15.20.2
|
||||||
buildCount=7
|
buildCount=0
|
||||||
baseBetaVersion=15.20.2
|
baseBetaVersion=15.20.3
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ WinBoLL 网站浏览器。
|
|||||||
|
|
||||||
1. Fork 本仓库
|
1. Fork 本仓库
|
||||||
2. 新建 Feat_xxx 分支
|
2. 新建 Feat_xxx 分支
|
||||||
3. 提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
|
3. 提交代码 : ZhanGSKen(ZhanGSKen<ZhanGSKen@QQ.COM>)
|
||||||
4. 新建 Pull Request
|
4. 新建 Pull Request
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -104,5 +104,13 @@ dependencies {
|
|||||||
implementation 'com.termux:terminal-view:0.118.0'
|
implementation 'com.termux:terminal-view:0.118.0'
|
||||||
implementation 'com.termux:termux-shared:0.118.0'
|
implementation 'com.termux:termux-shared:0.118.0'
|
||||||
|
|
||||||
|
// WinBoLL库 nexus.winboll.cc 地址
|
||||||
|
api 'cc.winboll.studio:libappbase:15.20.22'
|
||||||
|
api 'cc.winboll.studio:libaes:15.20.10'
|
||||||
|
|
||||||
|
// 备用库 jitpack.io 地址
|
||||||
|
//api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.21'
|
||||||
|
//api 'com.github.ZhanGSKen:libaes:aes-v15.20.9'
|
||||||
|
|
||||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#Created by .winboll/winboll_app_build.gradle
|
#Created by .winboll/winboll_app_build.gradle
|
||||||
#Fri May 15 08:48:45 GMT 2026
|
#Sun May 31 20:28:41 HKT 2026
|
||||||
stageCount=2
|
stageCount=3
|
||||||
libraryProject=libwinboll
|
libraryProject=libwinboll
|
||||||
baseVersion=15.20
|
baseVersion=15.20
|
||||||
publishVersion=15.20.1
|
publishVersion=15.20.2
|
||||||
buildCount=7
|
buildCount=0
|
||||||
baseBetaVersion=15.20.2
|
baseBetaVersion=15.20.3
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ package cc.winboll.studio.winboll.models;
|
|||||||
*/
|
*/
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
import cc.winboll.studio.libappbase.BaseBean;
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
public class MainServiceBean extends BaseBean {
|
public class MainServiceBean extends BaseBean {
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
package cc.winboll.studio.winboll.models;
|
package cc.winboll.studio.winboll.models;
|
||||||
|
|
||||||
import android.content.Context;
|
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;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class TermuxButtonManager {
|
public class TermuxButtonManager {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ package cc.winboll.studio.winboll.models;
|
|||||||
|
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
import cc.winboll.studio.libappbase.BaseBean;
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ package cc.winboll.studio.winboll.models;
|
|||||||
*/
|
*/
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
import cc.winboll.studio.libappbase.BaseBean;
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
public class TestDemoBindServiceBean extends BaseBean {
|
public class TestDemoBindServiceBean extends BaseBean {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ package cc.winboll.studio.winboll.models;
|
|||||||
*/
|
*/
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
import cc.winboll.studio.libappbase.BaseBean;
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
public class TestDemoServiceBean extends BaseBean {
|
public class TestDemoServiceBean extends BaseBean {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ package cc.winboll.studio.winboll.models;
|
|||||||
*/
|
*/
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
import cc.winboll.studio.libappbase.BaseBean;
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
public class UserInfoModel extends BaseBean {
|
public class UserInfoModel extends BaseBean {
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ package cc.winboll.studio.winboll.models;
|
|||||||
*/
|
*/
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
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.APPModel;
|
||||||
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
public class WinBoLLModel extends BaseBean {
|
public class WinBoLLModel extends BaseBean {
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ package cc.winboll.studio.winboll.models;
|
|||||||
*/
|
*/
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
import cc.winboll.studio.libappbase.BaseBean;
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
public class WinBoLLNewsBean extends BaseBean {
|
public class WinBoLLNewsBean extends BaseBean {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ package cc.winboll.studio.winboll.sos;
|
|||||||
*/
|
*/
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
import cc.winboll.studio.libappbase.BaseBean;
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
public class SOSCenterServiceModel extends BaseBean {
|
public class SOSCenterServiceModel extends BaseBean {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ package cc.winboll.studio.winboll.sos;
|
|||||||
*/
|
*/
|
||||||
import android.util.JsonReader;
|
import android.util.JsonReader;
|
||||||
import android.util.JsonWriter;
|
import android.util.JsonWriter;
|
||||||
import cc.winboll.studio.libappbase.BaseBean;
|
import cc.winboll.studio.libappbase.models.libs1520000.BaseBean;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
public class SOSObject extends BaseBean {
|
public class SOSObject extends BaseBean {
|
||||||
|
|||||||
Reference in New Issue
Block a user