Merge remote-tracking branch 'origin/appbase' into contacts

.winboll/Readme.txt

@@ -1,4 +1,4 @@
-## WinBoll 主机编译事项提醒
+## WinBoLL 主机编译事项提醒
 
 ## 类库类型源码发布
 # 类库发布使用以下面命令

.winboll/bashCommitLibReleaseBuildFlagInfo.sh

@@ -37,7 +37,7 @@ fi
 # 使用grep找到包含"publishVersion="的那一行，然后用awk提取其后的值
 PUBLISH_VERSION=$(grep -o "publishVersion=.*" $1/build.properties | awk -F '=' '{print $2}')
 echo "< $1/build.properties publishVersion : ${PUBLISH_VERSION} >"
-## 设新的 WinBoll 标签
+## 设新的 WinBoLL 标签
 # 脚本调试时使用
 #tag="v7.6.4-test1"
 # 正式设置标签时使用

.winboll/bashPublishAPKAddTag.sh

@@ -38,24 +38,24 @@ function askAddWorkflowsTag {
 	fi
 }
 
-function addWinBollTag {
+function addWinBoLLTag {
 	# 就读取脚本 .winboll/winboll_app_build.gradle 生成的 publishVersion。
     # 如果文件中有 publishVersion 这一项，
 	# 使用grep找到包含"publishVersion="的那一行，然后用awk提取其后的值
 	PUBLISH_VERSION=$(grep -o "publishVersion=.*" $1/build.properties | awk -F '=' '{print $2}')
 	echo "< $1/build.properties publishVersion : ${PUBLISH_VERSION} >"
-	## 设新的 WinBoll 标签
+	## 设新的 WinBoLL 标签
 	# 脚本调试时使用
 	#tag="projectname-v7.6.4-test1"
 	# 正式设置标签时使用
 	tag=$1"-v"${PUBLISH_VERSION}
-	echo "< WinBoll Tag To: $tag >";
+	echo "< WinBoLL Tag To: $tag >";
-	# 检查是否已经添加了 WinBoll Tag
+	# 检查是否已经添加了 WinBoLL Tag
 	if [ "$(git tag -l ${tag})" == "${tag}" ]; then
-        echo -e "< WinBoll Tag ${tag} exist! >"
+        echo -e "< WinBoLL Tag ${tag} exist! >"
-        return 1 # WinBoll标签重复
+        return 1 # WinBoLL标签重复
     fi
-    # 添加WinBoll标签
+    # 添加WinBoLL标签
 	git tag -a ${tag} -F $1/app_update_description.txt
     return 0
 }
@@ -119,22 +119,22 @@ if [[ $? -eq 0 ]]; then
 	echo $result
 
     # 发布应用
-	echo "Publishing WinBoll APK ..."
+	echo "Publishing WinBoLL APK ..."
 	# 脚本调试时使用
 	#bash gradlew :$1:assembleBetaDebug
 	# 正式发布
     bash gradlew :$1:assembleStageRelease
-    echo "Publishing WinBoll APK OK."
+    echo "Publishing WinBoLL APK OK."
     
-    # 添加 WinBoll 标签
+    # 添加 WinBoLL 标签
-    result=$(addWinBollTag $1)
+    result=$(addWinBoLLTag $1)
     echo $result
 	if [[ $? -eq 0 ]]; then
 	    echo $result
-    	# WinBoll 标签添加成功
+    	# WinBoLL 标签添加成功
 	else
-    	echo -e "${0}: addWinBollTag $1\n${result}\nAdd WinBoll tag cancel."
+    	echo -e "${0}: addWinBoLLTag $1\n${result}\nAdd WinBoLL tag cancel."
-        exit 1 # addWinBollTag 异常
+        exit 1 # addWinBoLLTag 异常
 	fi
     
     # 添加 GitHub 工作流标签

.winboll/bashPublishDebugAPKAddTag.sh

@@ -38,24 +38,24 @@ function askAddWorkflowsTag {
     fi
 }
 
-function addWinBollTag {
+function addWinBoLLTag {
     # 就读取脚本 .winboll/winboll_app_build.gradle 生成的 publishVersion。
     # 如果文件中有 publishVersion 这一项，
     # 使用grep找到包含"publishVersion="的那一行，然后用awk提取其后的值
     PUBLISH_VERSION=$(grep -o "publishVersion=.*" $1/build.properties | awk -F '=' '{print $2}')
     echo "< $1/build.properties publishVersion : ${PUBLISH_VERSION} >"
-    ## 设新的 WinBoll 标签
+    ## 设新的 WinBoLL 标签
     # 脚本调试时使用
     #tag="v7.6.4-test1"
     # 正式调试版设置标签时使用
     tag=$1"-v"${PUBLISH_VERSION}"-debug"
-    echo "< WinBoll Tag To: $tag >";
+    echo "< WinBoLL Tag To: $tag >";
-    # 检查是否已经添加了 WinBoll Tag
+    # 检查是否已经添加了 WinBoLL Tag
     if [ "$(git tag -l ${tag})" == "${tag}" ]; then
-        echo -e "< WinBoll Tag ${tag} exist! >"
+        echo -e "< WinBoLL Tag ${tag} exist! >"
-        return 1 # WinBoll标签重复
+        return 1 # WinBoLL标签重复
     fi
-    # 添加WinBoll标签
+    # 添加WinBoLL标签
     git tag -a ${tag} -F $1/app_update_description.txt
     return 0
 }
@@ -119,22 +119,22 @@ if [[ $? -eq 0 ]]; then
     echo $result
 
     # 发布应用
-    echo "Publishing WinBoll Debug APK ..."
+    echo "Publishing WinBoLL Debug APK ..."
     # 脚本调试时使用
     #bash gradlew :$1:assembleBetaDebug
     # 正式发布调试版
     bash gradlew :$1:assembleStageDebug
-    echo "Publishing WinBoll Debug APK OK."
+    echo "Publishing WinBoLL Debug APK OK."
     
-    # 添加 WinBoll 标签
+    # 添加 WinBoLL 标签
-    result=$(addWinBollTag $1)
+    result=$(addWinBoLLTag $1)
     echo $result
     if [[ $? -eq 0 ]]; then
         echo $result
-        # WinBoll 标签添加成功
+        # WinBoLL 标签添加成功
     else
-        echo -e "${0}: addWinBollTag $1\n${result}\nAdd WinBoll tag cancel."
+        echo -e "${0}: addWinBoLLTag $1\n${result}\nAdd WinBoLL tag cancel."
-        exit 1 # addWinBollTag 异常
+        exit 1 # addWinBoLLTag 异常
     fi
     
     # 添加 GitHub 工作流标签

.winboll/bashPublishLIBAddTag.sh

@@ -8,7 +8,7 @@ if [ -z "$1" ]; then
 fi
 
 ## 正式发布使用
-git pull && bash gradlew :$1:publishReleasePublicationToWinBollReleaseRepository && bash .winboll/bashCommitLibReleaseBuildFlagInfo.sh $1
+git pull && bash gradlew :$1:publishReleasePublicationToWinBoLLReleaseRepository && bash .winboll/bashCommitLibReleaseBuildFlagInfo.sh $1
 
 ## 调试使用
-#bash gradlew :$1:publishSnapshotWinBollPublicationToWinBollSnapshotRepository && bash .winboll/bashCommitLibReleaseBuildFlagInfo.sh $1
+#bash gradlew :$1:publishSnapshotWinBoLLPublicationToWinBoLLSnapshotRepository && bash .winboll/bashCommitLibReleaseBuildFlagInfo.sh $1

.winboll/winboll_app_build.gradle

@@ -1,4 +1,4 @@
-// WinBoll 应用签名配置
+// WinBoLL 应用签名配置
 //
 
 android {
@@ -31,18 +31,18 @@ android {
         }
     }
     
-    flavorDimensions "WinBollApp"
+    flavorDimensions "WinBoLLApp"
     productFlavors {
         beta {
             // 检查编译标志位配置
             assert (winbollBuildProps['buildCount'] != null)
-            dimension "WinBollApp"
+            dimension "WinBoLLApp"
             applicationIdSuffix ".beta"
             LocalDateTime localDateTimeNow = LocalDateTime.now(ZoneId.of("Asia/Shanghai"));
             versionNameSuffix "-beta" + winbollBuildProps['buildCount'] + "_" + localDateTimeNow.format('mmss')
         }
         stage {
-            dimension "WinBollApp"
+            dimension "WinBoLLApp"
         }
     }
 
@@ -61,7 +61,7 @@ android {
         }
         
         //
-        // WinBoll 应用包输出配置
+        // WinBoLL 应用包输出配置
         // 1. 配置 Stage Release 版应用包输出
         // 2. 配置 Beta Debug 版应用包输出
 	    //
@@ -74,13 +74,13 @@ android {
             //def outputFileName="${rootProject.name}_${versionName}.apk"
             def outputFileName=project.rootDir.name + "_${versionName}.apk"
             
-            // 创建 WinBoll Studio 发布接口文件夹
+            // 创建 WinBoLL Studio 发布接口文件夹
-            File fWinBollStudioDir = file("/sdcard/WinBollStudio/APKs");
+            File fWinBoLLStudioDir = file("/sdcard/WinBoLLStudio/APKs");
-            if(!fWinBollStudioDir.exists()) {
+            if(!fWinBoLLStudioDir.exists()) {
-                //fWinBollStudioDir.mkdirs();
+                //fWinBoLLStudioDir.mkdirs();
                 // 如果没有发布接口文件就不用进行APK发布和源码管理操作
-                // 当前编译环境不是 WinBoll 主机, 以下将忽略APK发布和源码管理操作。
+                // 当前编译环境不是 WinBoLL 主机, 以下将忽略APK发布和源码管理操作。
-                println 'The current compilation environment is not in WinBoll host, and the following APK publishing and source management operations will be ignore.'
+                println 'The current compilation environment is not in WinBoLL host, and the following APK publishing and source management operations will be ignore.'
             } else {
                 /// WINBOLL 主机的 APK 发布和源码管理操作 ///
                 variant.getAssembleProvider().get().doFirst {
@@ -91,15 +91,15 @@ android {
                 //
                 variant.getAssembleProvider().get().doLast {
                         variant.outputs.forEach{ file->
-                            // 如果正在调试，就拷贝到 WinBoll 备份管理文件夹
+                            // 如果正在调试，就拷贝到 WinBoLL 备份管理文件夹
                             // 
                             if(variant.flavorName == "beta"&&variant.buildType.name == "debug"){
-                                //File outBuildBckDir = new File(fWinBollStudioDir, "/${rootProject.name}/${variant.buildType.name}")
+                                //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()) {
                                     outBuildBckDir.mkdirs();
-                                    println "Output Folder Created.(WinBollStudio) : " + outBuildBckDir.getAbsolutePath()
+                                    println "Output Folder Created.(WinBoLLStudio) : " + outBuildBckDir.getAbsolutePath()
                                 }
                                 if(outBuildBckDir.exists()) {
                                     copy{
@@ -108,7 +108,7 @@ android {
                                         rename {
                                             String fileName -> "${outputFileName}"
                                         }
-                                        println "Output APK (WinBollStudio): " + outBuildBckDir.getAbsolutePath() + "/${outputFileName}"
+                                        println "Output APK (WinBoLLStudio): " + outBuildBckDir.getAbsolutePath() + "/${outputFileName}"
                                     }
                                     // 检查编译标志位配置
                                     assert (winbollBuildProps['buildCount'] != null)
@@ -137,7 +137,7 @@ android {
                                 }
                             }
                             
-                            // 如果正在发布，就拷贝到 WinBoll 标签管理文件夹
+                            // 如果正在发布，就拷贝到 WinBoLL 标签管理文件夹
                             //
                             if((variant.flavorName == "stage"&&variant.buildType.name == "debug")
                                 || (variant.flavorName == "stage"&&variant.buildType.name == "release")){
@@ -151,8 +151,8 @@ android {
                                 String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk"
                                 println "CommonTagAPKName is : " + szCommonTagAPKName
                                 
-                                //File outTagDir = new File(fWinBollStudioDir, "/${rootProject.name}/tag/")
+                                //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()) {
                                     outTagDir.mkdirs();

.winboll/winboll_lib_build.gradle

@@ -1,4 +1,4 @@
-// 本机和 WinBoll Maven 仓库传输配置。
+// 本机和 WinBoLL Maven 仓库传输配置。
 //
 
 def getDefaultVersion(){
@@ -9,12 +9,12 @@ def getDefaultVersion(){
 }
 
 def siteUrl = 'https://winboll.cc/?page=studio/details.php&app=${rootProject.name}' // 项目主页
-def gitUrl = 'https://gitea.winboll.cc/WinBoll/${rootProject.name}' // 项目的git地址
+def gitUrl = 'https://gitea.winboll.cc/WinBoLL/${rootProject.name}' // 项目的git地址
 def DefaultGroupId = 'cc.winboll.studio' // 类库所有者groupId
 def DefaultVersion = getDefaultVersion() // 版本号
 def DeveloperId='zhangsken' // 开发者账号
 def DeveloperName='ZhanGSKen' // 开发者名称
-def DeveloperEMail='ZhanGSKen@QQ.COM' // 开发者邮箱地址
+def DeveloperEMail='zhangsken@188.com' // 开发者邮箱地址
 def LicenseName='The Apache Software License, Version 2.0'
 def LicenseUrl='http://www.apache.org/licenses/LICENSE-2.0.txt'
 
@@ -27,10 +27,10 @@ afterEvaluate {
                 properties.load(file("${RootProjectDir}/${winbollFilePath}").newDataInputStream())
                 def NexusUserName = properties.getProperty("Nexus.name")
                 def NexusPassword = properties.getProperty("Nexus.password")
-                // WinBoll Release 仓库
+                // WinBoLL Release 仓库
                 maven{
                     //仓库的名字和地址
-                    name = "WinBollRelease"
+                    name = "WinBoLLRelease"
                     url="https://nexus.winboll.cc/repository/maven-releases/"
                     // 仓库用户名密码
                     credentials {
@@ -38,10 +38,10 @@ afterEvaluate {
                         password = NexusPassword
                     }
                 }
-                // WinBoll Snapshot 仓库
+                // WinBoLL Snapshot 仓库
                 maven{
                     //仓库的名字和地址
-                    name = "WinBollSnapshot"
+                    name = "WinBoLLSnapshot"
                     url="https://nexus.winboll.cc/repository/maven-snapshots/"
                     // 仓库用户名密码
                     credentials {
@@ -101,9 +101,9 @@ afterEvaluate {
                 }
             }
             
-            // WinBoll Maven Release 仓库传输任务
+            // WinBoLL Maven Release 仓库传输任务
             //
-            releaseWinBoll(MavenPublication) {
+            releaseWinBoLL(MavenPublication) {
                 // 需要使用的变体，假设有free和pay两个变体，可以选择一个
                 //from components.free
                 
@@ -154,9 +154,9 @@ afterEvaluate {
                 
             } // 创建名为 release 的任务结束
             
-            // WinBoll Maven Snapshot 仓库传输任务
+            // WinBoLL Maven Snapshot 仓库传输任务
             //
-            snapshotWinBoll(MavenPublication) {
+            snapshotWinBoLL(MavenPublication) {
                 // 需要使用的变体，假设有free和pay两个变体，可以选择一个
                 //from components.free
                 

README.md

@@ -1,23 +1,23 @@
-# ☁ ☁ ☁ WinBoll APP ☁ ☁ ☁ ☁ ☁ ☁   ☁ ☁   ☁  ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁ ☁ 
+# ☁ ☁ ☁ WinBoLL APP ☁ ☁ ☁ ☁ ☁ ☁   ☁ ☁   ☁  ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁ ☁ 
-# ☁    ☁ 这是 WinBoll 系列 APP 汇总项目。☁ ☁   ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁  ☁ ☁ ☁ 
+# ☁    ☁ WinBoLL Studio Android 应用开源项目。☁ ☁   ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁  ☁ ☁ ☁ 
-# ☁ ☁ ☁ WinBoll 网站地址 https://www.winboll.cc/studio/app/ ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
+# ☁ ☁ ☁ WinBoLL 网站地址 https://www.winboll.cc/ ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
 
-## WinBoll 提问
+## WinBoLL 提问
 同样是 /sdcard 目录，在开发 Android 应用时，
 能否实现手机编译与电脑编译的源码同步。
-☁因而 WinBoll 项目组诞生了。
+☁因而 WinBoLL 项目组诞生了。
 
-## WinBoll 项目组研发计划
+## WinBoLL 项目组研发计划
-致力于把 WinBoll-APP 应用在手机端 Android 项目开发。
+致力于把 WinBoLL-APP 应用在手机端 Android 项目开发。
-也在探索 https://gitea.winboll.cc/<WinBoll 项目组>/APP.git 应用于 WinBoll-APP APK 分发。
+也在探索 https://gitea.winboll.cc/<WinBoLL 项目组>/APP.git 应用于 WinBoLL-APP APK 分发。
-更想进阶 https://github.com/<WinBoll 项目组>/APP.git 应用于 WinBoll-APP Beta APK 分发。
+更想进阶 https://github.com/<WinBoLL 项目组>/APP.git 应用于 WinBoLL-APP Beta APK 分发。
 
-## WinBoll-APP 汗下...
+## WinBoLL-APP 汗下...
 #### ☁应用何置如此呢。且观用户云云。
 
 #### ☁ 正当下 ☁ ###
-#### ☁ 且容傻家叙说 ☁ WinBoll-APP 应用场景
+#### ☁ 且容傻家叙说 ☁ WinBoLL-APP 应用场景
-### ☁ WinBoll 设备资源概述
+### ☁ WinBoLL 设备资源概述
 #### ☁ 1. Raid Disk.
 概述：这是一个矩阵存储类设备。
 优点：该设备具有数据容错存储功能，
@@ -40,74 +40,79 @@
      设备位于操作系统内部文件系统。
      数据持久性与操作系统挂钩。
      
-#### ☁ 4. WinBoll 用户资源概述。
+#### ☁ 4. WinBoLL 用户资源概述。
-1> /home/<用户名> 位于 WinBoll 操作系统目录下。
+1> /home/<用户名> 位于 WinBoLL 操作系统目录下。
 2> /rdisk/<用户名> 挂载用户 Raid Disk.
 3> /data/<用户名> 挂载用户 Data Disk.
 4> /sdcard/<用户名> 挂载用户 SSD Disk.
 
-#### ☁ 5. WinBoll-APP 用户资源概述。
+#### ☁ 5. WinBoLL-APP 用户资源概述。
 1> /sdcard 挂载用户手机 SD 存储/storage/emulated/0
 
 ### ☁ 稍稍歇 ☁ ###
-### ☁ 急急停 ☁ WinBoll 应用前置条件
+### ☁ 急急停 ☁ WinBoLL 应用前置条件
-☁ WinBoll 主机建立 1Panel MySQL 应用。
+☁ WinBoLL 主机建立 1Panel MySQL 应用。
-☁ WinBoll 主机建立 1Panel Gitea 应用。
+☁ WinBoLL 主机建立 1Panel Gitea 应用。
-☁ WinBoll 主机设置 WinBoll 应用为非登录状态。
+☁ WinBoLL 主机设置 WinBoLL 应用为非登录状态。
-☁ WinBoll 主机建立 WinBoll 账户与 WinBoll 用户组。
+☁ WinBoLL 主机建立 WinBoLL 账户与 WinBoLL 用户组。
-☁ WinBoll 账户 User ID 为： J。
+☁ WinBoLL 账户 User ID 为： J。
-☁ WinBoll 用户组 Group ID 为： Studio。
+☁ WinBoLL 用户组 Group ID 为： Studio。
-☁ WinBoll 主机 WinBoll 1Panel Gitea 建立 WinBoll 工作组。
+☁ WinBoLL 主机 WinBoLL 1Panel Gitea 建立 WinBoLL 工作组。
-☁ WinBoll 主机 WinBoll 1Panel Gitea 用户项目 APK 编译输出目录为 /sdcard/WinBollStudio/<用户名>/APKs/
+☁ WinBoLL 主机 WinBoLL 1Panel Gitea 用户项目 APK 编译输出目录为 /sdcard/WinBoLLStudio/<用户名>/APKs/
-☁ WinBoll 项目配置文件示例为 "<WinBoll 项目根目录>/.winboll/winboll.properties-demo"(WinBoll 项目已设置)
+☁ WinBoLL 项目配置文件示例为 "<WinBoLL 项目根目录>/.winboll/winboll.properties-demo"(WinBoLL 项目已设置)
-☁ WinBoll 项目配置文件为 "<WinBoll 项目根目录>/.winboll/winboll.properties"
+☁ WinBoLL 项目配置文件为 "<WinBoLL 项目根目录>/.winboll/winboll.properties"
-☁ WinBoll 项目配置文件设定为源码提交时忽略。(WinBoll 项目已设置)
+☁ WinBoLL 项目配置文件设定为源码提交时忽略。(WinBoLL 项目已设置)
-☁ Gradle 项目配置文件示例为 "<WinBoll 项目根目录>/.winboll/local.properties-demo"(WinBoll 项目已设置)
+☁ Gradle 项目配置文件示例为 "<WinBoLL 项目根目录>/.winboll/local.properties-demo"(WinBoLL 项目已设置)
-☁ Gradle 项目配置文件为 "<WinBoll 项目根目录>/local.properties"(WinBoll 项目已设置)
+☁ Gradle 项目配置文件为 "<WinBoLL 项目根目录>/local.properties"(WinBoLL 项目已设置)
-☁ Gradle 项目配置文件设定为源码提交时忽略。(WinBoll 项目已设置)
+☁ Gradle 项目配置文件设定为源码提交时忽略。(WinBoLL 项目已设置)
 
-### ☁ 登高处 ☁ WinBoll 应用需求规划
+### ☁ 登高处 ☁ WinBoLL 应用需求规划
-☁ WinBoll 主机建立 WinBoll 客户端用户数据库为 MySQL winbollclient 数据库。
+☁ WinBoLL 主机建立 WinBoLL 客户端用户数据库为 MySQL winbollclient 数据库。
-☁ WinBoll 主机设置 WinBoll 客户端用户信息存储在 winbollclient 数据库中。
+☁ WinBoLL 主机设置 WinBoLL 客户端用户信息存储在 winbollclient 数据库中。
 ☁ MySQL winbollclient 数据库中
-   WinBoll 客户端用户信息设定为：
+   WinBoLL 客户端用户信息设定为：
    <用户名, 验证密码, 验证邮箱, 验证手机, 唯一存储令牌Token, 备用验证邮箱>。
-☁ WinBoll 项目源码仓库托管在 WinBoll 1Panel Gitea 目录 /opt/1panel/apps/gitea/gitea/data/git/repositories/studio/app.git中。
+☁ WinBoLL 项目源码仓库托管在 WinBoLL 1Panel Gitea 目录 /opt/1panel/apps/gitea/gitea/data/git/repositories/studio/app.git中。
-☁ WinBoll 主机提供 WinBoll 1Panel Gitea 应用的 WinBoll 项目源码仓库存取功能。（Gitea 应用已提供）
+☁ WinBoLL 主机提供 WinBoLL 1Panel Gitea 应用的 WinBoLL 项目源码仓库存取功能。（Gitea 应用已提供）
-☁ WinBoll 主机提供 WinBoll Gitea 项目仓库存档功能。（Gitea 应用已提供）
+☁ WinBoLL 主机提供 WinBoLL Gitea 项目仓库存档功能。（Gitea 应用已提供）
-☁ 提供 WinBoll 客户端用户登录功能。（Gitea 应用已提供）
+☁ 提供 WinBoLL 客户端用户登录功能。（Gitea 应用已提供）
 
 ### ☁ 看远方 ☁ ###
-### ☁ 心忧虑 ☁ WinBoll-APP 应用前置需求
+### ☁ 心忧虑 ☁ WinBoLL-APP 应用前置需求
-☁ WinBoll-APP WinBoll 项目根目录设定为手机的 /sdcard/WinBollStudio/Sources 目录。（需要用户手动建立文件夹）
+☁ WinBoLL-APP WinBoLL 项目根目录设定为手机的 /sdcard/WinBoLLStudio/Sources 目录。（需要用户手动建立文件夹）
-☁ WinBoll-APP 具有手机 /sdcard/WinBoll 目录的存储权限。（需要手机操作系统授权）
+☁ WinBoLL-APP 具有手机 /sdcard/WinBoLL 目录的存储权限。（需要手机操作系统授权）
-☁ WinBoll-APP WinBoll 项目仓库源码存储路径为 /sdcard/WinBollStudio/Sources/APP.git（需要用户手动建立文件夹）
+☁ WinBoLL-APP WinBoLL 项目仓库源码存储路径为 /sdcard/WinBoLLStudio/Sources/APP.git（需要用户手动建立文件夹）
-☁ WinBoll-APP 项目 APK 编译输出目录为 /sdcard/WinBollStudio/APKs/
+☁ WinBoLL-APP 项目 APK 编译输出目录为 /sdcard/WinBoLLStudio/APKs/
-☁ WinBoll-APP 应用签名验证可定制化。（WinBoll 项目已提供）
+☁ WinBoLL-APP 应用签名验证可定制化。（WinBoLL 项目已提供）
-☁ WinBoll-APP 与系列衍生 APP 应用共享 cc.winboll.studio 命名空间资源。（WinBoll 项目已提供）
+☁ WinBoLL-APP 与系列衍生 APP 应用共享 cc.winboll.studio 命名空间资源。（WinBoLL 项目已提供）
-☁ WinBoll-APP 用户客户端信息存储在命名空间为 WinBoll APP MySQLLite 应用的 winbollappclient 数据库中。
+☁ WinBoLL-APP 用户客户端信息存储在命名空间为 WinBoLL APP MySQLLite 应用的 winbollappclient 数据库中。
-☁ WinBoll-APP MySQLLite 应用的 winbollappclient 数据库中， 
+☁ WinBoLL-APP MySQLLite 应用的 winbollappclient 数据库中， 
-   WinBoll 用户客户端信息设定为：
+   WinBoLL 用户客户端信息设定为：
    <用户名, 唯一存储令牌Token>。
 
 ### ☁ 云游四方 ☁ ###
-### ☁ 呔！ ☁ WinBoll-APP 应用需求规划
+### ☁ 呔！ ☁ WinBoLL-APP 应用需求规划
-☁ WinBoll-APP 提供手机目录 /sdcard/WinBollStudio/Sources 的 WinBoll 项目源码管理功能。 
+☁ 如要使用 WinBoLL Android 项目的 Gradle 编译功能，则需要设置以下两个文件夹。
+☁ 1. 则需要建立数据存储目录 /sdcard/WinBoLLStudio/APKs。
+   WinBoLL 项目源码编译出来的安装包会拷贝一份到 /sdcard/WinBoLLStudio/APKs 目录下。 
+☁ 2. 则需要建立数据存储目录 /sdcard/AppProjects。
+   WinBoLL 项目源码编译出来的安装包会拷贝一份并命名 "app.apk" 的安装文件为到 /sdcard/AppProjects 目录下。 
 
-### ☁ 吁！ ☁ WinBoll-APP 共享计划前景
-☁ WinBoll-APP 将会实现 https://winboll.cc/api 访问功能。
-☁ WinBoll-APP 将会实现手机端 Android 应用的开发与管理功能。
 
-## ☁ WinBoll ☁ WinBoll 主机忧虑
+### ☁ 吁！ ☁ WinBoLL-APP 共享计划前景
-☁ WinBoll 将会提供 gitea.winboll.cc 域名用户注册登录功能。
+☁ WinBoLL-APP 将会实现 https://winboll.cc/api 访问功能。
-☁ WinBoll 将会提供 WinBoll-APP 及其衍生应用的 Gitea 仓库管理服务。
+☁ WinBoLL-APP 将会实现手机端 Android 应用的开发与管理功能。
-☁ WinBoll 将会提供 winboll.cc 域名 WinBoll 项目组注册登录功能。
+
+## ☁ WinBoLL ☁ WinBoLL 主机忧虑
+☁ WinBoLL 将会提供 gitea.winboll.cc 域名用户注册登录功能。
+☁ WinBoLL 将会提供 WinBoLL-APP 及其衍生应用的 Gitea 仓库管理服务。
+☁ WinBoLL 将会提供 winboll.cc 域名 WinBoLL 项目组注册登录功能。
 
 # 本项目要实际运用需要注意以下几个步骤：
 # 在项目根目录下：
 ## 1. 项目模块编译环境设置(必须)，settings.gradle-demo 要复制为 settings.gradle，并取消相应项目模块的注释。
 ## 2. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。
-## 3. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoll Maven 库登录用户信息。
+## 3. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoLL Maven 库登录用户信息。
 
 
 # ☆类库型项目编译方法
@@ -116,12 +121,12 @@
 设置属性 libraryProject=<类库项目模块文件夹名称>
 ### 再编译测试项目
 $ bash .winboll/bashPublishAPKAddTag.sh <应用项目模块文件夹名称>
-#### 测试项目编译后，编译器会复制一份 APK 到以下路径："/sdcard/WinBollStudio/APKs/<项目根目录名称>/tag/" 文件夹。
+#### 测试项目编译后，编译器会复制一份 APK 到以下路径："/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/" 文件夹。
 ### 最后编译类库项目
 $ bash .winboll/bashPublishLIBAddTag.sh <类库项目模块文件夹名称>
-#### 类库模块编译命令执行后，编译器会发布到 WinBoll Nexus Maven 库：Maven 库地址可以参阅根项目目录配置 build.gradle 文件。
+#### 类库模块编译命令执行后，编译器会发布到 WinBoLL Nexus Maven 库：Maven 库地址可以参阅根项目目录配置 build.gradle 文件。
              
 # ☆应用型项目编译方法
 ## 直接调用以下命令编译应用型项目
 $ bash .winboll/bashPublishAPKAddTag.sh <应用项目模块文件夹名称>
-#### 应用模块编译命令执行后，编译器会复制一份 APK 到以下路径："/sdcard/WinBollStudio/APKs/<项目根目录名称>/tag/" 文件夹。
+#### 应用模块编译命令执行后，编译器会复制一份 APK 到以下路径："/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/" 文件夹。

aes/build.gradle

@@ -24,12 +24,12 @@ android {
     defaultConfig {
         applicationId "cc.winboll.studio.aes"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.2" 
+        versionName "15.6" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 11:14:05 HKT 2025
+#Tue Apr 29 15:14:41 HKT 2025
-stageCount=7
+stageCount=1
 libraryProject=libaes
-baseVersion=15.2
+baseVersion=15.6
-publishVersion=15.2.6
+publishVersion=15.6.0
 buildCount=0
-baseBetaVersion=15.2.7
+baseBetaVersion=15.6.1

aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java

@@ -10,14 +10,13 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libaes.winboll.AboutView;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class AboutActivity extends WinBollActivity implements IWinBollActivity {
+public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
 
     public static final String TAG = "AboutActivity";
 
@@ -64,13 +63,13 @@ public class AboutActivity extends WinBollActivity implements IWinBollActivity {
         );
         layout.addView(aboutView, params);
 
-        GlobalApplication.getWinBollActivityManager().add(this);
+        GlobalApplication.getWinBoLLActivityManager().add(this);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        GlobalApplication.getWinBollActivityManager().registeRemove(this);
+        GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
     }
 
     public AboutView CreateAboutView() {

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

@@ -8,6 +8,7 @@ package cc.winboll.studio.aes;
 import android.view.Gravity;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import com.hjq.toast.ToastUtils;
+import com.hjq.toast.style.WhiteToastStyle;
 
 
 public class App extends GlobalApplication {
@@ -21,8 +22,8 @@ public class App extends GlobalApplication {
         // 初始化 Toast 框架
         ToastUtils.init(this);
         // 设置 Toast 布局样式
-        ToastUtils.setView(R.layout.view_toast);
+        //ToastUtils.setView(R.layout.view_toast);
-        //ToastUtils.setStyle(new WhiteToastStyle());
+        ToastUtils.setStyle(new WhiteToastStyle());
         ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
 
     }

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

@@ -25,12 +25,12 @@ import cc.winboll.studio.libaes.unittests.TestAToolbarActivity;
 import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity;
 import cc.winboll.studio.libaes.unittests.TestViewPageFragment;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import com.a4455jkjh.colorpicker.ColorPickerDialog;
 import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
 
-public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity {
+public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
 
 
     public static final String TAG = "MainActivity";
@@ -123,7 +123,7 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBollActi
     public boolean onOptionsItemSelected(MenuItem item) {
         int nItemId = item.getItemId();
 //        if (item.getItemId() == R.id.item_log) {
-//            WinBollActivityManager.getInstance(this).startWinBollActivity(getApplicationContext(), LogActivity.class);
+//            WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(getApplicationContext(), LogActivity.class);
 //        } else 
         if (nItemId == R.id.item_atoast) {
             Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();

aes/src/main/java/cc/winboll/studio/aes/WinBoLLActivity.java

@@ -5,17 +5,17 @@ import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.beans.AESThemeBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import android.view.MenuItem;
 
 /**
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/03/30 00:34:02
- * @Describe WinBoll 活动窗口通用基类
+ * @Describe WinBoLL 活动窗口通用基类
  */
-public class WinBollActivity extends AppCompatActivity implements IWinBollActivity {
+public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
 
-    public static final String TAG = "WinBollActivity";
+    public static final String TAG = "WinBoLLActivity";
 
     protected volatile AESThemeBean.ThemeType mThemeType;
 

appbase/build.gradle

@@ -25,12 +25,12 @@ android {
     defaultConfig {
         applicationId "cc.winboll.studio.appbase"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.2"
+        versionName "15.7"
         if(true) {
             versionName = genVersionName("${versionName}")
         }

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Apr 12 15:06:52 HKT 2025
+#Tue Apr 29 14:47:34 HKT 2025
-stageCount=6
+stageCount=7
 libraryProject=libappbase
-baseVersion=15.2
+baseVersion=15.7
-publishVersion=15.2.5
+publishVersion=15.7.6
 buildCount=0
-baseBetaVersion=15.2.6
+baseBetaVersion=15.7.7

appbase/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
 
     <application
         android:name=".App"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@drawable/ic_miapp"
         android:label="@string/app_name"
         android:theme="@style/MyAPPBaseTheme"
         android:resizeableActivity="true"

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

@@ -4,11 +4,11 @@ import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
+import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
 import cc.winboll.studio.appbase.activities.NewActivity;
 import cc.winboll.studio.appbase.services.MainService;
@@ -21,10 +21,9 @@ import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.sos.SOS;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.widgets.StatusWidget;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
-import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
 
-public class MainActivity extends WinBollActivityBase implements IWinBollActivity {
+public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
 
     public static final String TAG = "MainActivity";
 
@@ -48,7 +47,7 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit
         setContentView(R.layout.activity_main);
 
         mToolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(mToolbar);
+        setActionBar(mToolbar);
 
         CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
         cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
@@ -177,7 +176,7 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit
     }
 
     public void onTestOpenNewActivity(View view) {
-        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, NewActivity.class);
+        GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, NewActivity.class);
     }
 
     

appbase/src/main/java/cc/winboll/studio/appbase/WinBoLLActivityBase.java

@@ -0,0 +1,81 @@
+package cc.winboll.studio.appbase;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 15:34:16
+ * @Describe 应用活动窗口基类
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.view.MenuItem;
+import cc.winboll.studio.appbase.App;
+import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.winboll.WinBoLLActivityManager;
+
+public class WinBoLLActivityBase extends Activity implements IWinBoLLActivity {
+
+    public static final String TAG = "WinBoLLActivityBase";
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    WinBoLLActivityManager getWinBoLLActivityManager() {
+        return WinBoLLActivityManager.getInstance(GlobalApplication.getInstance());
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWinBoLLActivityManager().add(this);
+    }
+
+    @Override
+    public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
+        super.onPostCreate(savedInstanceState, persistentState);
+    }
+    
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
+            return true;
+        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
+            //moveTaskToBack(true);
+            exit();
+        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+
+    void exit() {
+        YesNoAlertDialog.show(this, "Exit " + getString(R.string.app_name), "Close all activity and exit?", new YesNoAlertDialog.OnDialogResultListener(){
+
+                @Override
+                public void onYes() {
+                    App.getWinBoLLActivityManager().finishAll();
+                }
+
+                @Override
+                public void onNo() {
+                }
+            });
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        getWinBoLLActivityManager().registeRemove(this);
+    }
+}

appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java

@@ -7,16 +7,16 @@ package cc.winboll.studio.appbase.activities;
  */
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.appbase.WinBollActivityBase;
+import cc.winboll.studio.appbase.WinBoLLActivityBase;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class New2Activity extends WinBollActivityBase implements IWinBollActivity {
+public class New2Activity extends WinBoLLActivityBase implements IWinBoLLActivity {
 
     public static final String TAG = "New2Activity";
 
@@ -41,7 +41,7 @@ public class New2Activity extends WinBollActivityBase implements IWinBollActivit
 //        mLogView = findViewById(R.id.logview);
 //        mLogView.start();
         mToolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(mToolbar);
+        setActionBar(mToolbar);
         
     }
 
@@ -52,15 +52,15 @@ public class New2Activity extends WinBollActivityBase implements IWinBollActivit
     }
 
     public void onCloseThisActivity(View view) {
-        GlobalApplication.getWinBollActivityManager().finish(this);
+        GlobalApplication.getWinBoLLActivityManager().finish(this);
     }
 
     public void onCloseAllActivity(View view) {
-        GlobalApplication.getWinBollActivityManager().finishAll();
+        GlobalApplication.getWinBoLLActivityManager().finishAll();
     }
 
     public void onNewActivity(View view) {
-        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, NewActivity.class);
+        GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, NewActivity.class);
     }
     
 
@@ -74,7 +74,7 @@ public class New2Activity extends WinBollActivityBase implements IWinBollActivit
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
+            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
             return true;
         }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。

appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java

@@ -6,16 +6,16 @@ package cc.winboll.studio.appbase.activities;
  */
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.appbase.WinBollActivityBase;
+import cc.winboll.studio.appbase.WinBoLLActivityBase;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class NewActivity extends WinBollActivityBase implements IWinBollActivity {
+public class NewActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
 
     public static final String TAG = "NewActivity";
 
@@ -39,7 +39,7 @@ public class NewActivity extends WinBollActivityBase implements IWinBollActivity
 //        mLogView = findViewById(R.id.logview);
 //        mLogView.start();
         mToolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(mToolbar);
+        setActionBar(mToolbar);
         
     }
 
@@ -50,15 +50,15 @@ public class NewActivity extends WinBollActivityBase implements IWinBollActivity
     }
 
     public void onCloseThisActivity(View view) {
-        GlobalApplication.getWinBollActivityManager().finish(this);
+        GlobalApplication.getWinBoLLActivityManager().finish(this);
     }
 
     public void onCloseAllActivity(View view) {
-        GlobalApplication.getWinBollActivityManager().finishAll();
+        GlobalApplication.getWinBoLLActivityManager().finishAll();
     }
 
     public void onNew2Activity(View view) {
-        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, New2Activity.class);
+        GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, New2Activity.class);
     }
     
 
@@ -72,7 +72,7 @@ public class NewActivity extends WinBollActivityBase implements IWinBollActivity
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
+            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
             return true;
         }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。

appbase/src/main/java/cc/winboll/studio/appbase/models/WinBoLLNewsBean.java

@@ -0,0 +1,72 @@
+package cc.winboll.studio.appbase.models;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/02/17 10:05:09
+ * @Describe APPSOSReportBean
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class WinBoLLNewsBean extends BaseBean {
+    
+    public static final String TAG = "WinBoLLNewsBean";
+    
+    protected String message;
+    
+    public WinBoLLNewsBean() {
+        this.message = "";
+    }
+
+    public WinBoLLNewsBean(String message) {
+        this.message = message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    @Override
+    public String getName() {
+        return WinBoLLNewsBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("message").value(getMessage());
+
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("message")) {
+                setMessage(jsonReader.nextString());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}

appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java

@@ -10,7 +10,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import cc.winboll.studio.appbase.models.WinBollNewsBean;
+import cc.winboll.studio.appbase.models.WinBoLLNewsBean;
 import cc.winboll.studio.appbase.services.MainService;
 import cc.winboll.studio.appbase.widgets.APPNewsWidget;
 import cc.winboll.studio.libappbase.AppUtils;
@@ -18,7 +18,7 @@ import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.sos.APPModel;
 import cc.winboll.studio.libappbase.sos.SOS;
 import cc.winboll.studio.libappbase.sos.SOSObject;
-import cc.winboll.studio.libappbase.sos.WinBoll;
+import cc.winboll.studio.libappbase.sos.WinBoLL;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -42,11 +42,11 @@ public class MainReceiver extends BroadcastReceiver {
         String szAction = intent.getAction();
         if (szAction.equals(ACTION_BOOT_COMPLETED)) {
             ToastUtils.show("ACTION_BOOT_COMPLETED");
-        } else if (szAction.equals(WinBoll.ACTION_BIND)) {
+        } else if (szAction.equals(WinBoLL.ACTION_BIND)) {
             LogUtils.d(TAG, "ACTION_BIND");
             LogUtils.d(TAG, String.format("context.getPackageName() %s", context.getPackageName()));
             LogUtils.d(TAG, String.format("intent.getAction() %s", intent.getAction()));
-            String szAPPModel = intent.getStringExtra(WinBoll.EXTRA_APPMODEL);
+            String szAPPModel = intent.getStringExtra(WinBoLL.EXTRA_APPMODEL);
             LogUtils.d(TAG, String.format("szAPPModel %s", szAPPModel));
             if (szAPPModel != null && !szAPPModel.equals("")) {
                 try {
@@ -80,7 +80,7 @@ public class MainReceiver extends BroadcastReceiver {
 
                     String appName = AppUtils.getAppNameByPackageName(context, szObjectPackageName);
                     LogUtils.d(TAG, String.format("appName %s", appName));
-                    WinBollNewsBean appWinBollNewsBean = new WinBollNewsBean(appName);
+                    WinBoLLNewsBean appWinBoLLNewsBean = new WinBoLLNewsBean(appName);
                     SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
                     String currentTime = sdf.format(new Date());
                     StringBuilder sbLine = new StringBuilder();
@@ -88,9 +88,9 @@ public class MainReceiver extends BroadcastReceiver {
                     sbLine.append(currentTime);
                     sbLine.append("] Power to ");
                     sbLine.append(appName);
-                    appWinBollNewsBean.setMessage(sbLine.toString());
+                    appWinBoLLNewsBean.setMessage(sbLine.toString());
 
-                    APPNewsWidget.addWinBollNewsBean(context, appWinBollNewsBean);
+                    APPNewsWidget.addWinBoLLNewsBean(context, appWinBoLLNewsBean);
 
                     Intent intentWidget = new Intent(context, APPNewsWidget.class);
                     intentWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT);
@@ -110,7 +110,7 @@ public class MainReceiver extends BroadcastReceiver {
         IntentFilter filter=new IntentFilter();
         filter.addAction(ACTION_BOOT_COMPLETED);
         filter.addAction(SOS.ACTION_SOS);
-        filter.addAction(WinBoll.ACTION_BIND);
+        filter.addAction(WinBoLL.ACTION_BIND);
         //filter.addAction(Intent.ACTION_BATTERY_CHANGED);
         service.registerReceiver(this, filter);
     }

appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java

@@ -12,7 +12,7 @@ import android.os.Binder;
 import android.os.IBinder;
 import cc.winboll.studio.appbase.models.TestDemoBindServiceBean;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.sos.WinBoll;
+import cc.winboll.studio.libappbase.sos.WinBoLL;
 import cc.winboll.studio.appbase.App;
 import cc.winboll.studio.libappbase.sos.SOS;
 
@@ -156,9 +156,9 @@ public class TestDemoBindService extends Service {
                 super.run();
                 LogUtils.d(TAG, "run() start");
                 if (App.isDebuging()) {
-                    WinBoll.bindToAPPBaseBeta(mContext, TestDemoBindService.class.getName());
+                    WinBoLL.bindToAPPBaseBeta(mContext, TestDemoBindService.class.getName());
                 } else {
-                    WinBoll.bindToAPPBase(mContext, TestDemoBindService.class.getName());
+                    WinBoLL.bindToAPPBase(mContext, TestDemoBindService.class.getName());
                 }
 
                 while (!isExit()) {

appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java

@@ -12,7 +12,7 @@ import android.os.Binder;
 import android.os.IBinder;
 import cc.winboll.studio.appbase.models.TestDemoServiceBean;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.sos.WinBoll;
+import cc.winboll.studio.libappbase.sos.WinBoLL;
 
 public class TestDemoService extends Service {
 

appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java

@@ -12,12 +12,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.widget.RemoteViews;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.appbase.models.WinBollNewsBean;
+import cc.winboll.studio.appbase.models.WinBoLLNewsBean;
 import cc.winboll.studio.appbase.receivers.APPNewsWidgetClickListener;
 import cc.winboll.studio.libappbase.AppUtils;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.sos.APPModel;
-import cc.winboll.studio.libappbase.sos.WinBoll;
+import cc.winboll.studio.libappbase.sos.WinBoLL;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -31,14 +31,14 @@ public class APPNewsWidget extends AppWidgetProvider {
     public static final String ACTION_RELOAD_REPORT = APPNewsWidget.class.getName() + ".ACTION_RELOAD_REPORT";
 
 
-    volatile static ArrayList<WinBollNewsBean> _WinBollNewsBeanList;
+    volatile static ArrayList<WinBoLLNewsBean> _WinBoLLNewsBeanList;
     final static int _MAX_PAGES = 10;
     final static int _OnePageLinesCount = 5;
     volatile static int _CurrentPageIndex = 0;
 
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        initWinBollNewsBeanList(context);
+        initWinBoLLNewsBeanList(context);
         for (int appWidgetId : appWidgetIds) {
             updateAppWidget(context, appWidgetManager, appWidgetId);
         }
@@ -47,7 +47,7 @@ public class APPNewsWidget extends AppWidgetProvider {
     @Override
     public void onReceive(Context context, Intent intent) {
         super.onReceive(context, intent);
-        initWinBollNewsBeanList(context);
+        initWinBoLLNewsBeanList(context);
         if (intent.getAction().equals(ACTION_RELOAD_REPORT)) {
             LogUtils.d(TAG, "ACTION_RELOAD_REPORT");
             AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
@@ -57,7 +57,7 @@ public class APPNewsWidget extends AppWidgetProvider {
             }
         }else if (intent.getAction().equals(ACTION_WAKEUP_SERVICE)) {
             LogUtils.d(TAG, "ACTION_WAKEUP_SERVICE");
-            String szAPPModel = intent.getStringExtra(WinBoll.EXTRA_APPMODEL);
+            String szAPPModel = intent.getStringExtra(WinBoLL.EXTRA_APPMODEL);
             LogUtils.d(TAG, String.format("szAPPModel %s", szAPPModel));
             if (szAPPModel != null && !szAPPModel.equals("")) {
                 try {
@@ -71,7 +71,7 @@ public class APPNewsWidget extends AppWidgetProvider {
                         
                         String appName = AppUtils.getAppNameByPackageName(context, szAppPackageName);
                         LogUtils.d(TAG, String.format("appName %s", appName));
-                        WinBollNewsBean winBollNewsBean = new WinBollNewsBean(appName);
+                        WinBoLLNewsBean winBollNewsBean = new WinBoLLNewsBean(appName);
                         SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
                         String currentTime = sdf.format(new Date());
                         StringBuilder sbLine = new StringBuilder();
@@ -81,7 +81,7 @@ public class APPNewsWidget extends AppWidgetProvider {
                         sbLine.append(appName);
                         winBollNewsBean.setMessage(sbLine.toString());
                         
-                        addWinBollNewsBean(context, winBollNewsBean);
+                        addWinBoLLNewsBean(context, winBollNewsBean);
 
                         AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
                         int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, APPNewsWidget.class));
@@ -99,24 +99,24 @@ public class APPNewsWidget extends AppWidgetProvider {
     //
     // 加入新报告信息
     //
-    public synchronized static void addWinBollNewsBean(Context context, WinBollNewsBean bean) {
+    public synchronized static void addWinBoLLNewsBean(Context context, WinBoLLNewsBean bean) {
-        initWinBollNewsBeanList(context);
+        initWinBoLLNewsBeanList(context);
-        _WinBollNewsBeanList.add(0, bean);
+        _WinBoLLNewsBeanList.add(0, bean);
         // 控制记录总数
-        while (_WinBollNewsBeanList.size() > _MAX_PAGES * _OnePageLinesCount) {
+        while (_WinBoLLNewsBeanList.size() > _MAX_PAGES * _OnePageLinesCount) {
-            _WinBollNewsBeanList.remove(_WinBollNewsBeanList.size() - 1);
+            _WinBoLLNewsBeanList.remove(_WinBoLLNewsBeanList.size() - 1);
         }
-        WinBollNewsBean.saveBeanList(context, _WinBollNewsBeanList, WinBollNewsBean.class);
+        WinBoLLNewsBean.saveBeanList(context, _WinBoLLNewsBeanList, WinBoLLNewsBean.class);
     }
 
-    synchronized static void initWinBollNewsBeanList(Context context) {
+    synchronized static void initWinBoLLNewsBeanList(Context context) {
-        if (_WinBollNewsBeanList == null) {
+        if (_WinBoLLNewsBeanList == null) {
-            _WinBollNewsBeanList = new ArrayList<WinBollNewsBean>();
+            _WinBoLLNewsBeanList = new ArrayList<WinBoLLNewsBean>();
-            WinBollNewsBean.loadBeanList(context, _WinBollNewsBeanList, WinBollNewsBean.class);
+            WinBoLLNewsBean.loadBeanList(context, _WinBoLLNewsBeanList, WinBoLLNewsBean.class);
         }
-        if (_WinBollNewsBeanList == null) {
+        if (_WinBoLLNewsBeanList == null) {
-            _WinBollNewsBeanList = new ArrayList<WinBollNewsBean>();
+            _WinBoLLNewsBeanList = new ArrayList<WinBoLLNewsBean>();
-            WinBollNewsBean.saveBeanList(context, _WinBollNewsBeanList, WinBollNewsBean.class);
+            WinBoLLNewsBean.saveBeanList(context, _WinBoLLNewsBeanList, WinBoLLNewsBean.class);
         }
     }
 
@@ -141,11 +141,11 @@ public class APPNewsWidget extends AppWidgetProvider {
 
     public static String getMessage() {
         ArrayList<String> msgTemp = new ArrayList<String>();
-        if (_WinBollNewsBeanList != null) {
+        if (_WinBoLLNewsBeanList != null) {
             int start = _OnePageLinesCount * _CurrentPageIndex;
-            start = _WinBollNewsBeanList.size() > start ? start : _WinBollNewsBeanList.size() - 1;
+            start = _WinBoLLNewsBeanList.size() > start ? start : _WinBoLLNewsBeanList.size() - 1;
-            for (int i = start, j = 0; i < _WinBollNewsBeanList.size() && j < _OnePageLinesCount && start > -1; i++, j++) {
+            for (int i = start, j = 0; i < _WinBoLLNewsBeanList.size() && j < _OnePageLinesCount && start > -1; i++, j++) {
-                msgTemp.add(_WinBollNewsBeanList.get(i).getMessage());
+                msgTemp.add(_WinBoLLNewsBeanList.get(i).getMessage());
             }
             String message = String.join("\n", msgTemp);
             return message;
@@ -154,7 +154,7 @@ public class APPNewsWidget extends AppWidgetProvider {
     }
 
     public static void prePage(Context context) {
-        if (_WinBollNewsBeanList != null) {
+        if (_WinBoLLNewsBeanList != null) {
             if (_CurrentPageIndex > 0) {
                 _CurrentPageIndex = _CurrentPageIndex - 1;
             }
@@ -165,8 +165,8 @@ public class APPNewsWidget extends AppWidgetProvider {
     }
 
     public static void nextPage(Context context) {
-        if (_WinBollNewsBeanList != null) {
+        if (_WinBoLLNewsBeanList != null) {
-            if ((_CurrentPageIndex + 1) * _OnePageLinesCount < _WinBollNewsBeanList.size()) {
+            if ((_CurrentPageIndex + 1) * _OnePageLinesCount < _WinBoLLNewsBeanList.size()) {
                 _CurrentPageIndex = _CurrentPageIndex + 1;
             }
             Intent intentWidget = new Intent(context, APPNewsWidget.class);
@@ -176,11 +176,11 @@ public class APPNewsWidget extends AppWidgetProvider {
     }
 
     String getPageInfo() {
-        if (_WinBollNewsBeanList == null) {
+        if (_WinBoLLNewsBeanList == null) {
             return "0/0";
         }
-        int leftCount = _WinBollNewsBeanList.size() % _OnePageLinesCount;
+        int leftCount = _WinBoLLNewsBeanList.size() % _OnePageLinesCount;
-        int currentPageCount = _WinBollNewsBeanList.size() / _OnePageLinesCount + (leftCount == 0 ?0: 1);
+        int currentPageCount = _WinBoLLNewsBeanList.size() / _OnePageLinesCount + (leftCount == 0 ?0: 1);
         return String.format("%d/%d", _CurrentPageIndex + 1, currentPageCount);
     }
 }

appbase/src/main/res/layout/activity_main.xml

@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.support.v7.widget.Toolbar
+	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>
@@ -32,7 +32,7 @@
 				<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="Hello, WinBoll!"/>
+					android:text="Hello, WinBoLL!"/>
 
 				<TextView
 					android:layout_width="wrap_content"

appbase/src/main/res/layout/activity_new.xml

@@ -6,7 +6,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
+    <android.widget.Toolbar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>

appbase/src/main/res/layout/activity_new2.xml

@@ -6,7 +6,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
+    <android.widget.Toolbar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>

appbase/src/main/res/layout/widget_news.xml

@@ -18,7 +18,7 @@
 			android:layout_height="wrap_content"
 			android:id="@+id/tv_title"
 			android:layout_weight="1.0"
-			android:text="WinBollNews"
+			android:text="WinBoLLNews"
 			android:textStyle="bold"
 			android:textSize="16sp"/>
 

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">AppBase</string>
-    <string name="tileservice_name">WinBoll</string>
+    <string name="tileservice_name">WinBoLL</string>
 </resources>

apputils/build.gradle

@@ -24,12 +24,12 @@ android {
     defaultConfig {
         applicationId "cc.winboll.studio.apputils"
         minSdkVersion 26
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.2" 
+        versionName "15.3" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Mar 29 12:14:55 HKT 2025
+#Tue Apr 29 15:04:17 HKT 2025
-stageCount=2
+stageCount=5
 libraryProject=libapputils
-baseVersion=15.2
+baseVersion=15.3
-publishVersion=15.2.1
+publishVersion=15.3.4
 buildCount=0
-baseBetaVersion=15.2.2
+baseBetaVersion=15.3.5

apputils/src/main/java/cc/winboll/studio/apputils/AssetsHtmlActivity.java

@@ -15,12 +15,12 @@ import android.view.MenuItem;
 import android.widget.Toolbar;
 import cc.winboll.studio.apputils.R;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import cc.winboll.studio.libapputils.views.SimpleWebView;
 import java.io.IOException;
 import java.io.InputStream;
 
-public class AssetsHtmlActivity extends WinBollActivityBase implements IWinBollActivity {
+public class AssetsHtmlActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
 
     @Override
     public Activity getActivity() {
@@ -57,7 +57,7 @@ public class AssetsHtmlActivity extends WinBollActivityBase implements IWinBollA
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
 //        if (item.getItemId() == android.R.id.home) {
-//            WinBollActivityManager.getInstance(this).finish(this);
+//            WinBoLLActivityManager.getInstance(this).finish(this);
 //        }
         return super.onOptionsItemSelected(item);
     }

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

@@ -60,9 +60,9 @@ final public class MainActivity extends Activity {
         //if (prosessIntents(getIntent())) return;
         // 以下正常创建主窗口
 
-//        // 设置 WinBoll 应用 UI 类型
+//        // 设置 WinBoLL 应用 UI 类型
-//        WinBollApplication.setWinBollUI_TYPE(WinBollApplication.WinBollUI_TYPE.Aplication);
+//        WinBoLLApplication.setWinBoLLUI_TYPE(WinBoLLApplication.WinBoLLUI_TYPE.Aplication);
-//        //ToastUtils.show("WinBollUI_TYPE " + WinBollApplication.getWinBollUI_TYPE());
+//        //ToastUtils.show("WinBoLLUI_TYPE " + WinBoLLApplication.getWinBoLLUI_TYPE());
 //        LogUtils.d(TAG, "BuildConfig.DEBUG : " + Boolean.toString(BuildConfig.DEBUG));
     }
 
@@ -77,7 +77,7 @@ final public class MainActivity extends Activity {
                 if (intent.getAction() != null) {
 //                    if (intent.getAction().equals(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW)) {
 //                        App.setIsDebug(true);
-//                        //ToastUtils.show!("WinBollApplication.setIsDebug(true) by action : " + intent.getAction());
+//                        //ToastUtils.show!("WinBoLLApplication.setIsDebug(true) by action : " + intent.getAction());
 //
 //                    }
                 }
@@ -130,12 +130,12 @@ final public class MainActivity extends Activity {
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
         // 缓存当前 activity
-        //WinBollActivityManager.getInstance(this).add(this);
+        //WinBoLLActivityManager.getInstance(this).add(this);
     }
 
     @Override
     public void onDestroy() {
-        //WinBollActivityManager.getInstance(this).registeRemove(this);
+        //WinBoLLActivityManager.getInstance(this).registeRemove(this);
         super.onDestroy();
     }
 
@@ -150,8 +150,8 @@ final public class MainActivity extends Activity {
 //        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
 //        startActivity(intent);
 
-        //WinBollActivityManager.getInstance().printAvtivityListInfo();
+        //WinBoLLActivityManager.getInstance().printAvtivityListInfo();
-        //WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
+        //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, LogActivity.class);
     }
 
     //
@@ -165,7 +165,7 @@ final public class MainActivity extends Activity {
 
 //        if (intent.getAction().equals(StringToQrCodeView.ACTION_UNITTEST_QRCODE)) {
 //            try {
-//                WinBollActivity clazzActivity = UnitTestActivity.class.newInstance();
+//                WinBoLLActivity clazzActivity = UnitTestActivity.class.newInstance();
 //                String tag = clazzActivity.getTag();
 //                LogUtils.d(TAG, "String tag = clazzActivity.getTag(); tag " + tag);
 //                Intent subIntent = new Intent(this, UnitTestActivity.class);
@@ -183,8 +183,8 @@ final public class MainActivity extends Activity {
 //                }
 //
 //                Files.copy(Paths.get(szSrcPath), Paths.get(file.getPath()));
-//                //startWinBollActivity(subIntent, tag);
+//                //startWinBoLLActivity(subIntent, tag);
-//                WinBollActivityManager.getInstance(this).startWinBollActivity(this, subIntent, UnitTestActivity.class);
+//                WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, subIntent, UnitTestActivity.class);
 //            } catch (IllegalAccessException | InstantiationException | IOException e) {
 //                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
 //                // 函数处理异常返回失败
@@ -201,8 +201,8 @@ final public class MainActivity extends Activity {
     public boolean onCreateOptionsMenu(Menu menu) {
         //ToastUtils.show("onCreateOptionsMenu");
         getMenuInflater().inflate(R.menu.toolbar_main, menu);
-//        if (isAddWinBollToolBar()) {
+//        if (isAddWinBoLLToolBar()) {
-//            //ToastUtils.show("mIWinBoll.isAddWinBollToolBar()");
+//            //ToastUtils.show("mIWinBoLL.isAddWinBoLLToolBar()");
 //            getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu);
 //        }
         if (App.isDebuging()) {
@@ -220,7 +220,7 @@ final public class MainActivity extends Activity {
         } else if (item.getItemId() == R.id.item_teststringtoqrcodeview) {
             Intent intent = new Intent(this, TestStringToQRCodeViewActivity.class);
             startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
-            //WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestStringToQrCodeViewActivity.class);
+            //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, TestStringToQrCodeViewActivity.class);
         } else if (item.getItemId() == R.id.item_testqrcodedecodeactivity) {
             Intent intent = new Intent(this, QRCodeDecodeActivity.class);
             startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
@@ -230,13 +230,13 @@ final public class MainActivity extends Activity {
             }
             return true;
         } else if (item.getItemId() == R.id.item_log) {
-            //WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
+            //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, LogActivity.class);
             return true;
         } else if (item.getItemId() == R.id.item_exitdebug) {
             //AboutView.setApp2NormalMode(this);
             return true;
         } else if (item.getItemId() == android.R.id.home) {
-            //WinBollActivityManager.getInstance(this).finish(this);
+            //WinBoLLActivityManager.getInstance(this).finish(this);
             return true;
         }
         return super.onOptionsItemSelected(item);
@@ -247,7 +247,7 @@ final public class MainActivity extends Activity {
 //
 //            @Override
 //            public void onYes() {
-//                //WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
+//                //WinBoLLActivityManager.getInstance(getApplicationContext()).finishAll();
 //            }
 //
 //            @Override
@@ -260,10 +260,10 @@ final public class MainActivity extends Activity {
 
     @Override
     public void onBackPressed() {
-//        if (WinBollActivityManager.getInstance(getApplicationContext()).isFirstIWinBollActivity(this)) {
+//        if (WinBoLLActivityManager.getInstance(getApplicationContext()).isFirstIWinBoLLActivity(this)) {
 //            exit();
 //        } else {
-//            WinBollActivityManager.getInstance(this).finish(this);
+//            WinBoLLActivityManager.getInstance(this).finish(this);
 //            super.onBackPressed();
 //        }
     }
@@ -275,7 +275,7 @@ final public class MainActivity extends Activity {
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
         intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
         startActivity(intent);
-        //WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
+        //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, intent, AssetsHtmlActivity.class);
     }
 
     @Override

apputils/src/main/java/cc/winboll/studio/apputils/WinBoLLActivityBase.java

@@ -8,14 +8,13 @@ package cc.winboll.studio.apputils;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.PersistableBundle;
-import android.support.v7.app.AppCompatActivity;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import cc.winboll.studio.libappbase.winboll.WinBoLLActivityManager;
 
-public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity {
+public class WinBoLLActivityBase extends Activity implements IWinBoLLActivity {
 
-    public static final String TAG = "WinBollActivityBase";
+    public static final String TAG = "WinBoLLActivityBase";
 
     @Override
     public Activity getActivity() {
@@ -27,14 +26,14 @@ public class WinBollActivityBase extends AppCompatActivity implements IWinBollAc
         return TAG;
     }
 
-    WinBollActivityManager getWinBollActivityManager() {
+    WinBoLLActivityManager getWinBoLLActivityManager() {
-        return WinBollActivityManager.getInstance(GlobalApplication.getInstance());
+        return WinBoLLActivityManager.getInstance(GlobalApplication.getInstance());
     }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getWinBollActivityManager().add(this);
+        getWinBoLLActivityManager().add(this);
     }
 
     @Override
@@ -47,6 +46,6 @@ public class WinBollActivityBase extends AppCompatActivity implements IWinBollAc
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        getWinBollActivityManager().registeRemove(this);
+        getWinBoLLActivityManager().registeRemove(this);
     }
 }

apputils/src/main/res/values/colors.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- WinBoll 默认方案 -->
+    <!-- WinBoLL 默认方案 -->
     <color name="colorPrimary">#FF196ABC</color>
     <color name="colorPrimaryDark">#FF002B57</color>
     <color name="colorAccent">#FF80BFFF</color>

build.gradle

@@ -7,9 +7,9 @@ buildscript {
         maven { url "file:///sdcard/.m2/repository" }
         
         // Nexus Maven 库地址
-        // "WinBoll Release"
+        // "WinBoLL Release"
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }
-        // "WinBoll Snapshot"
+        // "WinBoLL Snapshot"
         maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
         
         maven { url 'https://maven.aliyun.com/repository/public/' } 
@@ -32,9 +32,9 @@ buildscript {
 allprojects {
     repositories {
         // Nexus Maven 库地址
-        // "WinBoll Release"
+        // "WinBoLL Release"
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }
-        // "WinBoll Snapshot"
+        // "WinBoLL Snapshot"
         maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
         
         maven { url 'https://maven.aliyun.com/repository/public/' } 
@@ -56,7 +56,7 @@ allprojects {
         bashCommitAppPublishBuildFlagInfoFilePath = ".winboll/bashCommitAppPublishBuildFlagInfo.sh"
         
         winbollFilePath = "winboll.properties"
-        keyPropsFilePath = "winboll-x/current.keystore"
+        keyPropsFilePath = "current.keystore"
         // 定义 lint 输出文件
         lintXmlReportFilePath = "build/reports/lint-results.xml"
         lintHTMLReportFilePath = "build/reports/lint-results.html"

current.keystore-demo

@@ -0,0 +1,4 @@
+keyAlias=WinBoLL.CC
+keyPassword=androiddebugkey
+storeFile=../WinBoLL.CC.jks
+storePassword=androiddebugkey

libaes/build.gradle

@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
     buildTypes {
         release {
@@ -45,12 +45,12 @@ dependencies {
     api 'com.squareup.okhttp3:okhttp:4.4.1'
     // AndroidX 类库
     api 'androidx.appcompat:appcompat:1.1.0'
-    api 'com.google.android.material:material:1.4.0'
+    //api 'com.google.android.material:material:1.4.0'
     //api 'androidx.viewpager:viewpager:1.0.0'
     //api 'androidx.vectordrawable:vectordrawable:1.1.0'
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
     
-    api 'cc.winboll.studio:libapputils:15.2.2'
+    api 'cc.winboll.studio:libapputils:15.3.4'
-    api 'cc.winboll.studio:libappbase:15.2.2'
+    api 'cc.winboll.studio:libappbase:15.7.6'
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 11:13:53 HKT 2025
+#Tue Apr 29 15:14:21 HKT 2025
-stageCount=7
+stageCount=1
 libraryProject=libaes
-baseVersion=15.2
+baseVersion=15.6
-publishVersion=15.2.6
+publishVersion=15.6.0
 buildCount=0
-baseBetaVersion=15.2.7
+baseBetaVersion=15.6.1

libaes/src/main/AndroidManifest.xml

@@ -17,13 +17,13 @@
         <activity android:name="cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity"
             android:exported="true"/>
 
-        <service android:name="cc.winboll.studio.libaes.winboll.WinBollClientService"
+        <service android:name="cc.winboll.studio.libaes.winboll.WinBoLLClientService"
             android:exported="true"/>
 
         <service android:name="cc.winboll.studio.libaes.winboll.AssistantService"
             android:exported="true"/>
 
-        <service android:name="cc.winboll.studio.libaes.winboll.WinBollMail"
+        <service android:name="cc.winboll.studio.libaes.winboll.WinBoLLMail"
             android:exported="true"/>
 
     </application>

libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java

@@ -29,11 +29,11 @@ import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.views.ADrawerMenuListView;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import com.baoyz.widget.PullRefreshLayout;
 import java.util.ArrayList;
 
-public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBollActivity,AdapterView.OnItemClickListener {
+public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBoLLActivity,AdapterView.OnItemClickListener {
 
     public static final String TAG = "DrawerFragmentActivity";
 
@@ -177,7 +177,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
                 getString(i);
             }
         } else if (R.id.item_log == item.getItemId()) {
-            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
+            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
         } else if (R.id.item_about == item.getItemId()) {
             LogUtils.d(TAG, "onAbout");
         } else if (android.R.id.home == item.getItemId()) {

libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java

@@ -7,14 +7,14 @@ import android.view.MenuItem;
 import android.widget.Toast;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
 /**
  * @Author ZhanGSKen@QQ.COM
  * @Date 2024/06/15 00:58:10
  * @Describe 第二级窗口
  */
-public class SecondaryLibraryActivity extends DrawerFragmentActivity implements IWinBollActivity {
+public class SecondaryLibraryActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
 
     public static final String TAG = "SecondaryLibraryActivity";
 

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java

@@ -11,9 +11,9 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBollActivity  {
+public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBoLLActivity  {
 
     public static final String TAG = "TestASupportToolbarActivity";
 

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java

@@ -10,9 +10,9 @@ import android.os.Bundle;
 import android.widget.Toolbar;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class TestAToolbarActivity extends Activity implements IWinBollActivity {
+public class TestAToolbarActivity extends Activity implements IWinBoLLActivity {
 
     public static final String TAG = "TestAToolbarActivity";
     

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java

@@ -11,16 +11,15 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.Toast;
-import android.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
 import cc.winboll.studio.libaes.beans.DrawerMenuBean;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import java.util.ArrayList;
 
-public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBollActivity {
+public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
 
     @Override
     public Activity getActivity() {

libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java

@@ -41,7 +41,7 @@ public class AESThemeUtil {
         activity.setTheme(getThemeTypeID(activity));
     }
 
-    /*public static <T extends WinBollActivity> void applyWinBollTheme(T activity) {
+    /*public static <T extends WinBoLLActivity> void applyWinBoLLTheme(T activity) {
         activity.setTheme(getThemeTypeID(activity.getApplicationContext()));
     }*/
 
@@ -53,7 +53,7 @@ public class AESThemeUtil {
         activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
     }
 
-    /*public static <T extends WinBollActivity> void applyWinBollTheme(Activity activity, AESThemeBean.ThemeType themeType) {
+    /*public static <T extends WinBoLLActivity> void applyWinBoLLTheme(Activity activity, AESThemeBean.ThemeType themeType) {
         activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
     }*/
 
@@ -65,7 +65,7 @@ public class AESThemeUtil {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
     }
 
-    /*public static <T extends WinBollActivity> void inflateWinBollMenu(T activity, Menu menu) {
+    /*public static <T extends WinBoLLActivity> void inflateWinBoLLMenu(T activity, Menu menu) {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
     }*/
 
@@ -131,7 +131,7 @@ public class AESThemeUtil {
         return false;
     }
 
-    public static <T extends AppCompatActivity> boolean onWinBollThemeItemSelected(T activity, MenuItem 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);
@@ -162,7 +162,7 @@ public class AESThemeUtil {
         return false;
     }
     
-    public static <T extends DrawerFragmentActivity> boolean onWinBollThemeItemSelected(T activity, MenuItem 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);

libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java

@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
 /**
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/03/24 15:08:52
- * @Describe WinBoll应用介绍视图
+ * @Describe WinBoLL应用介绍视图
  */
 import android.content.Context;
 import android.content.Intent;
@@ -43,7 +43,7 @@ public class AboutView extends LinearLayout {
     Context mContext;
     APPInfo mAPPInfo;
 
-    WinBollServiceStatusView mWinBollServiceStatusView;
+    WinBoLLServiceStatusView mWinBoLLServiceStatusView;
     OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener;
     String mszAppName = "";
     String mszAppAPKFolderName = "";
@@ -57,7 +57,7 @@ public class AboutView extends LinearLayout {
     String mszHomePage = "";
     String mszGitea = "";
     int mnAppIcon = 0;
-    String mszWinBollServerHost;
+    String mszWinBoLLServerHost;
     String mszReleaseAPKName;
     EditText metDevUserName;
     EditText metDevUserPassword;
@@ -107,7 +107,7 @@ public class AboutView extends LinearLayout {
         mszAppDescription = mAPPInfo.getAppDescription();
         mnAppIcon = mAPPInfo.getAppIcon();
 
-        mszWinBollServerHost = GlobalApplication.isDebuging() ?  "https://dev.winboll.cc": "https://www.winboll.cc";
+        mszWinBoLLServerHost = GlobalApplication.isDebuging() ?  "https://dev.winboll.cc": "https://www.winboll.cc";
 
         try {
             mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
@@ -115,7 +115,7 @@ public class AboutView extends LinearLayout {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
         mszCurrentAppPackageName = mszAppAPKName + "_" + mszAppVersionName + ".apk";
-        mszHomePage = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
+        mszHomePage = mszWinBoLLServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
         if (mAPPInfo.getAppGitAPPBranch().equals("")) {
             mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName;
         } else {
@@ -132,9 +132,9 @@ public class AboutView extends LinearLayout {
             metDevUserName.setText(PrefUtils.getString(mContext, "metDevUserName", ""));
             metDevUserPassword.setText(PrefUtils.getString(mContext, "metDevUserPassword", ""));
             //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context);
-            mWinBollServiceStatusView = addedView.findViewById(R.id.viewaboutdevWinBollServiceStatusView1);
+            mWinBoLLServiceStatusView = addedView.findViewById(R.id.viewaboutdevWinBoLLServiceStatusView1);
-            mWinBollServiceStatusView.setServerHost(mszWinBollServerHost);
+            mWinBoLLServiceStatusView.setServerHost(mszWinBoLLServerHost);
-            mWinBollServiceStatusView.setAuthInfo(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
+            mWinBoLLServiceStatusView.setAuthInfo(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
             //llMain.addView(mDevelopHostConnectionStatusView);
             llMain.addView(createAboutPage());
             addView(addedView);
@@ -143,9 +143,9 @@ public class AboutView extends LinearLayout {
             View addedView = inflater.inflate(R.layout.view_about_www, this, false);
             LinearLayout llMain = addedView.findViewById(R.id.viewaboutwwwLinearLayout1);
             //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context);
-            mWinBollServiceStatusView = addedView.findViewById(R.id.viewaboutwwwWinBollServiceStatusView1);
+            mWinBoLLServiceStatusView = addedView.findViewById(R.id.viewaboutwwwWinBoLLServiceStatusView1);
-            mWinBollServiceStatusView.setServerHost(mszWinBollServerHost);
+            mWinBoLLServiceStatusView.setServerHost(mszWinBoLLServerHost);
-            mWinBollServiceStatusView.setAuthInfo("", "");
+            mWinBoLLServiceStatusView.setAuthInfo("", "");
             //llMain.addView(mDevelopHostConnectionStatusView);
             llMain.addView(createAboutPage());
             addView(addedView);
@@ -291,7 +291,7 @@ public class AboutView extends LinearLayout {
             GlobalApplication.setIsDebuging(true);
             GlobalApplication.saveDebugStatus();
 
-            GlobalApplication.getWinBollActivityManager().finishAll();
+            GlobalApplication.getWinBoLLActivityManager().finishAll();
             context.startActivity(intent);
         } 
     }
@@ -303,7 +303,7 @@ public class AboutView extends LinearLayout {
             GlobalApplication.setIsDebuging(false);
             GlobalApplication.saveDebugStatus();
 
-            GlobalApplication.getWinBollActivityManager().finishAll();
+            GlobalApplication.getWinBoLLActivityManager().finishAll();
             context.startActivity(intent);
         } 
     }
@@ -323,7 +323,7 @@ public class AboutView extends LinearLayout {
             new Thread(new Runnable() {
                     @Override
                     public void run() {
-                        String szUrl = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
+                        String szUrl = mszWinBoLLServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
                         // 构建包含认证信息的请求
                         String credential = "";
                         if (GlobalApplication.isDebuging()) {
@@ -331,8 +331,8 @@ public class AboutView extends LinearLayout {
                             PrefUtils.saveString(mContext, "metDevUserName", metDevUserName.getText().toString());
                             PrefUtils.saveString(mContext, "metDevUserPassword", metDevUserPassword.getText().toString());
                         } else {
-                            String username = "WinBoll";
+                            String username = "WinBoLL";
-                            String password = "WinBollPowerByZhanGSKen";
+                            String password = "WinBoLLPowerByZhanGSKen";
                             credential = Credentials.basic(username, password);
                         }
 
@@ -384,7 +384,7 @@ public class AboutView extends LinearLayout {
     YesNoAlertDialog.OnDialogResultListener mIsDownlaodUpdateListener = new YesNoAlertDialog.OnDialogResultListener() {
         @Override
         public void onYes() {
-            String szUrl = mszWinBollServerHost + "/studio/download.php?appname=" + mszAppAPKFolderName + "&apkname=" + mszNewestAppPackageName;
+            String szUrl = mszWinBoLLServerHost + "/studio/download.php?appname=" + mszAppAPKFolderName + "&apkname=" + mszNewestAppPackageName;
             Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(szUrl));
             mContext.startActivity(browserIntent);
         }

libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java

@@ -11,14 +11,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import cc.winboll.studio.libaes.winboll.WinBollClientService;
+import cc.winboll.studio.libaes.winboll.WinBoLLClientService;
 import cc.winboll.studio.libappbase.utils.ServiceUtils;
 
 public class AssistantService extends Service {
 
     public final static String TAG = "AssistantService";
 
-    WinBollClientServiceBean mWinBollServiceBean;
+    WinBoLLClientServiceBean mWinBoLLServiceBean;
     MyServiceConnection mMyServiceConnection;
     volatile boolean mIsServiceRunning;
 
@@ -30,7 +30,7 @@ public class AssistantService extends Service {
     @Override
     public void onCreate() {
         super.onCreate();
-        mWinBollServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
+        mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
         if (mMyServiceConnection == null) {
             mMyServiceConnection = new MyServiceConnection();
         }
@@ -55,8 +55,8 @@ public class AssistantService extends Service {
     // 运行服务内容
     //
     void run() {
-        mWinBollServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
+        mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
-        if (mWinBollServiceBean.isEnable()) {
+        if (mWinBoLLServiceBean.isEnable()) {
             if (mIsServiceRunning == false) {
                 // 设置运行状态
                 mIsServiceRunning = true;
@@ -70,11 +70,11 @@ public class AssistantService extends Service {
     // 唤醒和绑定主进程
     //
     void wakeupAndBindMain() {
-        if (ServiceUtils.isServiceRunning(getApplicationContext(), WinBollClientService.class.getName()) == false) {
+        if (ServiceUtils.isServiceRunning(getApplicationContext(), WinBoLLClientService.class.getName()) == false) {
-            startForegroundService(new Intent(AssistantService.this, WinBollClientService.class));
+            startForegroundService(new Intent(AssistantService.this, WinBoLLClientService.class));
         }
 
-        bindService(new Intent(AssistantService.this, WinBollClientService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
+        bindService(new Intent(AssistantService.this, WinBoLLClientService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
     }
 
     //
@@ -87,8 +87,8 @@ public class AssistantService extends Service {
 
         @Override
         public void onServiceDisconnected(ComponentName name) {
-            mWinBollServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(AssistantService.this);
+            mWinBoLLServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(AssistantService.this);
-            if (mWinBollServiceBean.isEnable()) {
+            if (mWinBoLLServiceBean.isEnable()) {
                 wakeupAndBindMain();
             }
         }

libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java

@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
 /**
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/03/28 19:11:27
- * @Describe WinBoll UI 状态图标枚举
+ * @Describe WinBoLL UI 状态图标枚举
  */
 import cc.winboll.studio.libaes.R;
 

libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBoLLClientServiceBinder.java

@@ -3,15 +3,15 @@ package cc.winboll.studio.libaes.winboll;
 /**
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/03/28 19:08:45
- * @Describe WinBollService 服务 Binder。
+ * @Describe WinBoLLService 服务 Binder。
  */
 import android.graphics.drawable.Drawable;
 
-public interface IWinBollClientServiceBinder {
+public interface IWinBoLLClientServiceBinder {
 
-    public static final String TAG = "IWinBollClientServiceBinder";
+    public static final String TAG = "IWinBoLLClientServiceBinder";
 
-    public WinBollClientService getService();
+    public WinBoLLClientService getService();
 
     public Drawable getCurrentStatusIconDrawable();
 }

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientService.java

@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
 /**
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/03/28 19:06:54
- * @Describe WinBoll 客户端服务
+ * @Describe WinBoLL 客户端服务
  */
 import android.app.Service;
 import android.content.ComponentName;
@@ -19,28 +19,28 @@ import cc.winboll.studio.libappbase.utils.ServiceUtils;
 import cc.winboll.studio.libapputils.utils.PrefUtils;
 import com.hjq.toast.ToastUtils;
 
-public class WinBollClientService extends Service implements IWinBollClientServiceBinder {
+public class WinBoLLClientService extends Service implements IWinBoLLClientServiceBinder {
 
-    public static final String TAG = "WinBollClientService";
+    public static final String TAG = "WinBoLLClientService";
 
-    WinBollClientServiceBean mWinBollClientServiceBean;
+    WinBoLLClientServiceBean mWinBoLLClientServiceBean;
     MyServiceConnection mMyServiceConnection;
-    volatile boolean mIsWinBollClientThreadRunning;
+    volatile boolean mIsWinBoLLClientThreadRunning;
     volatile boolean mIsEnableService;
-    volatile WinBollClientThread mWinBollClientThread;
+    volatile WinBoLLClientThread mWinBoLLClientThread;
 
-    public boolean isWinBollClientThreadRunning() {
+    public boolean isWinBoLLClientThreadRunning() {
-        return mIsWinBollClientThreadRunning;
+        return mIsWinBoLLClientThreadRunning;
     }
 
     @Override
-    public WinBollClientService getService() {
+    public WinBoLLClientService getService() {
-        return WinBollClientService.this;
+        return WinBoLLClientService.this;
     }
 
     @Override
     public Drawable getCurrentStatusIconDrawable() {
-        return mIsWinBollClientThreadRunning ?
+        return mIsWinBoLLClientThreadRunning ?
             getDrawable(EWUIStatusIconDrawable.getIconDrawableId(EWUIStatusIconDrawable.NORMAL))
             : getDrawable(EWUIStatusIconDrawable.getIconDrawableId(EWUIStatusIconDrawable.NEWS));
     }
@@ -54,9 +54,9 @@ public class WinBollClientService extends Service implements IWinBollClientServi
     public void onCreate() {
         //ToastUtils.show("onCreate");
         super.onCreate();
-        mWinBollClientThread = null;
+        mWinBoLLClientThread = null;
-        mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
+        mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
-        mIsEnableService = mWinBollClientServiceBean.isEnable();
+        mIsEnableService = mWinBoLLClientServiceBean.isEnable();
 
         if (mMyServiceConnection == null) {
             mMyServiceConnection = new MyServiceConnection();
@@ -74,23 +74,23 @@ public class WinBollClientService extends Service implements IWinBollClientServi
 
         // 返回运行参数持久化存储后，服务状态控制参数
         // 无论 Intent 传入如何，服务状态一直以持久化存储后的参数控制，
-        // PS: 另外当然可以通过 Intent 传入的指标来修改 mWinBollServiceBean，
+        // PS: 另外当然可以通过 Intent 传入的指标来修改 mWinBoLLServiceBean，
         //     不过本服务的应用方向会变得繁琐，
-        //     现阶段只要满足手机端启动与停止本服务，WinBoll 客户端实例运行在手机端就可以了。
+        //     现阶段只要满足手机端启动与停止本服务，WinBoLL 客户端实例运行在手机端就可以了。
         return mIsEnableService ? Service.START_STICKY: super.onStartCommand(intent, flags, startId);
     }
 
     synchronized void runMainThread() {
-        if (mWinBollClientThread == null) {
+        if (mWinBoLLClientThread == null) {
             //ToastUtils.show("runMainThread()");
-            mWinBollClientThread = new WinBollClientThread();
+            mWinBoLLClientThread = new WinBoLLClientThread();
-            mWinBollClientThread.start();
+            mWinBoLLClientThread.start();
         }
     }
 
-    void syncWinBollClientThreadStatus() {
+    void syncWinBoLLClientThreadStatus() {
-        mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
+        mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
-        mIsEnableService = mWinBollClientServiceBean.isEnable();
+        mIsEnableService = mWinBoLLClientServiceBean.isEnable();
         LogUtils.d(TAG, String.format("mIsEnableService %s", mIsEnableService));
     }
 
@@ -99,9 +99,9 @@ public class WinBollClientService extends Service implements IWinBollClientServi
     //
     void wakeupAndBindAssistant() {
         if (ServiceUtils.isServiceRunning(getApplicationContext(), AssistantService.class.getName()) == false) {
-            startService(new Intent(WinBollClientService.this, AssistantService.class));
+            startService(new Intent(WinBoLLClientService.this, AssistantService.class));
             //LogUtils.d(TAG, "call wakeupAndBindAssistant() : Binding... AssistantService");
-            bindService(new Intent(WinBollClientService.this, AssistantService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
+            bindService(new Intent(WinBoLLClientService.this, AssistantService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
         }
     }
 
@@ -115,8 +115,8 @@ public class WinBollClientService extends Service implements IWinBollClientServi
 
         @Override
         public void onServiceDisconnected(ComponentName name) {            
-            mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(WinBollClientService.this);
+            mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(WinBoLLClientService.this);
-            if (mWinBollClientServiceBean.isEnable()) {
+            if (mWinBoLLClientServiceBean.isEnable()) {
                 // 唤醒守护进程
                 wakeupAndBindAssistant();
             }
@@ -134,15 +134,15 @@ public class WinBollClientService extends Service implements IWinBollClientServi
         super.onStart(intent, startId);
     }
 
-    void setWinBollServiceEnableStatus(boolean isEnable) {
+    void setWinBoLLServiceEnableStatus(boolean isEnable) {
-        WinBollClientServiceBean bean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
+        WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
         bean.setIsEnable(isEnable);
-        WinBollClientServiceBean.saveWinBollServiceBean(this, bean);
+        WinBoLLClientServiceBean.saveWinBoLLServiceBean(this, bean);
     }
 
-    boolean getWinBollServiceEnableStatus(Context context) {
+    boolean getWinBoLLServiceEnableStatus(Context context) {
-        mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(context);
+        mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(context);
-        return mWinBollClientServiceBean.isEnable();
+        return mWinBoLLClientServiceBean.isEnable();
     }
 
     /*public interface OnServiceStatusChangeListener {
@@ -153,24 +153,24 @@ public class WinBollClientService extends Service implements IWinBollClientServi
      mOnServerStatusChangeListener = l;
      }*/
 
-    class WinBollClientThread extends Thread {
+    class WinBoLLClientThread extends Thread {
         @Override
         public void run() {
             super.run();
-            LogUtils.d(TAG, "run syncWinBollClientThreadStatus");
+            LogUtils.d(TAG, "run syncWinBoLLClientThreadStatus");
-            syncWinBollClientThreadStatus();
+            syncWinBoLLClientThreadStatus();
             if (mIsEnableService) {
-                if (mIsWinBollClientThreadRunning == false) {
+                if (mIsWinBoLLClientThreadRunning == false) {
                     // 设置运行状态
-                    mIsWinBollClientThreadRunning = true;
+                    mIsWinBoLLClientThreadRunning = true;
-                    LogUtils.d(TAG, "WinBollClientThread run()");
+                    LogUtils.d(TAG, "WinBoLLClientThread run()");
 
                     // 唤醒守护进程
                     //wakeupAndBindAssistant();
                     
                     while (mIsEnableService) {
                         // 显示运行状态
-                        WinBollServiceStatusView.startConnection();
+                        WinBoLLServiceStatusView.startConnection();
                         LogUtils.d(TAG, String.format("while mIsEnableService is %s", mIsEnableService));
                         
                         try {
@@ -178,13 +178,13 @@ public class WinBollClientService extends Service implements IWinBollClientServi
                         } catch (InterruptedException e) {
                             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
                         }
-                        syncWinBollClientThreadStatus();
+                        syncWinBoLLClientThreadStatus();
                     }
 
                     // 服务进程退出, 重置进程运行状态
-                    WinBollServiceStatusView.stopConnection();
+                    WinBoLLServiceStatusView.stopConnection();
-                    mIsWinBollClientThreadRunning = false;
+                    mIsWinBoLLClientThreadRunning = false;
-                    mWinBollClientThread = null;
+                    mWinBoLLClientThread = null;
                 }
             }
         }

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientServiceBean.java

@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
 /**
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/03/28 19:05:15
- * @Describe WinBollService 运行参数配置
+ * @Describe WinBoLLService 运行参数配置
  */
 import android.content.Context;
 import android.util.JsonReader;
@@ -11,13 +11,13 @@ import android.util.JsonWriter;
 import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
-public class WinBollClientServiceBean extends BaseBean {
+public class WinBoLLClientServiceBean extends BaseBean {
 
-    public static final String TAG = "WinBollClientServiceBean";
+    public static final String TAG = "WinBoLLClientServiceBean";
 
     volatile boolean isEnable;
 
-    public WinBollClientServiceBean() {
+    public WinBoLLClientServiceBean() {
         isEnable = false;
     }
 
@@ -31,13 +31,13 @@ public class WinBollClientServiceBean extends BaseBean {
 
     @Override
     public String getName() {
-        return WinBollClientServiceBean.class.getName();
+        return WinBoLLClientServiceBean.class.getName();
     }
 
     @Override
     public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
         super.writeThisToJsonWriter(jsonWriter);
-        WinBollClientServiceBean bean = this;
+        WinBoLLClientServiceBean bean = this;
         jsonWriter.name("isEnable").value(bean.isEnable());
     }
 
@@ -67,12 +67,12 @@ public class WinBollClientServiceBean extends BaseBean {
         return this;
     }
 
-    public static WinBollClientServiceBean loadWinBollClientServiceBean(Context context) {
+    public static WinBoLLClientServiceBean loadWinBoLLClientServiceBean(Context context) {
-        WinBollClientServiceBean bean = WinBollClientServiceBean.loadBean(context, WinBollClientServiceBean.class);
+        WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadBean(context, WinBoLLClientServiceBean.class);
-        return bean == null ? new WinBollClientServiceBean() : bean;
+        return bean == null ? new WinBoLLClientServiceBean() : bean;
     }
 
-    public static boolean saveWinBollServiceBean(WinBollClientService service, WinBollClientServiceBean bean) {
+    public static boolean saveWinBoLLServiceBean(WinBoLLClientService service, WinBoLLClientServiceBean bean) {
-        return WinBollClientServiceBean.saveBean(service, bean);
+        return WinBoLLClientServiceBean.saveBean(service, bean);
     }
 }

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLMail.java

@@ -3,15 +3,15 @@ package cc.winboll.studio.libaes.winboll;
 /**
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/03/28 19:13:20
- * @Describe WinBoll 邮件服务
+ * @Describe WinBoLL 邮件服务
  */
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
 
-public class WinBollMail extends Service {
+public class WinBoLLMail extends Service {
 
-    public static final String TAG = "WinBollMail";
+    public static final String TAG = "WinBoLLMail";
 
     @Override
     public IBinder onBind(Intent intent) {

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServerConnectionThread.java

@@ -3,7 +3,7 @@ package cc.winboll.studio.libaes.winboll;
 /**
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/03/29 15:57:28
- * @Describe WinBoll 服务器服务情况测试访问进程。
+ * @Describe WinBoLL 服务器服务情况测试访问进程。
  */
 import cc.winboll.studio.libappbase.LogUtils;
 import java.io.IOException;
@@ -20,9 +20,9 @@ interface TextCallback {
     void onFailure(Exception e);
 }
 
-public class WinBollServerConnectionThread extends Thread {
+public class WinBoLLServerConnectionThread extends Thread {
 
-    public static final String TAG = "WinBollClientService";
+    public static final String TAG = "WinBoLLClientService";
 
     private final String url;
     private final String username;
@@ -33,12 +33,12 @@ public class WinBollServerConnectionThread extends Thread {
     private final TextCallback callback; // 新增回调成员变量
 
     // 新增带回调的构造函数
-    public WinBollServerConnectionThread(String url, String username, String password, TextCallback callback) {
+    public WinBoLLServerConnectionThread(String url, String username, String password, TextCallback callback) {
         this(url, username, password, 10000, 10000, 5, callback);
     }
 
     // 修改原有构造函数，添加回调参数
-    public WinBollServerConnectionThread(String url, String username, String password, 
+    public WinBoLLServerConnectionThread(String url, String username, String password, 
                                              int connectTimeout, int readTimeout, int maxRetries, TextCallback callback) {
         this.url = url;
         this.username = username;

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServiceStatusView.java

@@ -3,8 +3,9 @@ package cc.winboll.studio.libaes.winboll;
 /**
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/03/28 17:41:55
- * @Describe WinBoll 服务主机连接状态视图
+ * @Describe WinBoLL 服务主机连接状态视图
  */
+import cc.winboll.studio.libaes.R;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -18,10 +19,9 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import cc.winboll.studio.libaes.winboll.WinBollClientService;
+import cc.winboll.studio.libaes.winboll.WinBoLLClientService;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libapputils.R;
 import cc.winboll.studio.libapputils.utils.PrefUtils;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -32,23 +32,23 @@ import java.time.format.DateTimeFormatter;
 //import okhttp3.Response;
 //import okhttp3.Route;
 
-public class WinBollServiceStatusView extends LinearLayout {
+public class WinBoLLServiceStatusView extends LinearLayout {
 
-    public static final String TAG = "WinBollServiceStatusView";
+    public static final String TAG = "WinBoLLServiceStatusView";
 
     public static final int MSG_CONNECTION_INFO = 0;
     public static final int MSG_UPDATE_CONNECTION_STATUS = 1;
 
-    static WinBollServiceStatusView _WinBollServiceStatusView;
+    static WinBoLLServiceStatusView _WinBoLLServiceStatusView;
     Context mContext;
     //boolean mIsConnected;
     volatile ConnectionThread mConnectionThread;
 
     String mszServerHost;
-    WinBollClientService mWinBollService;
+    WinBoLLClientService mWinBoLLService;
     ImageView mImageView;
     TextView mTextView;
-    WinBollServiceViewHandler mWinBollServiceViewHandler;
+    WinBoLLServiceViewHandler mWinBoLLServiceViewHandler;
     //WebView mWebView;
     static volatile ConnectionStatus mConnectionStatus;
     View.OnClickListener mViewOnClickListener;
@@ -66,11 +66,11 @@ public class WinBollServiceStatusView extends LinearLayout {
     ServiceConnection connection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
-            IWinBollClientServiceBinder binder = (IWinBollClientServiceBinder) service;
+            IWinBoLLClientServiceBinder binder = (IWinBoLLClientServiceBinder) service;
-            mWinBollService = binder.getService();
+            mWinBoLLService = binder.getService();
             isBound = true;
             // 可以在这里调用Service的方法进行通信，比如获取数据
-            mImageView.setBackgroundDrawable(mWinBollService.getCurrentStatusIconDrawable());
+            mImageView.setBackgroundDrawable(mWinBoLLService.getCurrentStatusIconDrawable());
         }
 
         @Override
@@ -79,25 +79,25 @@ public class WinBollServiceStatusView extends LinearLayout {
         }
     };
 
-    public WinBollServiceStatusView(Context context) {
+    public WinBoLLServiceStatusView(Context context) {
         super(context);
         mContext = context;
         initView();
     }
 
-    public WinBollServiceStatusView(Context context, AttributeSet attrs) {
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs) {
         super(context, attrs);
         mContext = context;
         initView();
     }
 
-    public WinBollServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) {
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         mContext = context;
         initView();
     }
 
-    public WinBollServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
         mContext = context;
         initView();
@@ -110,13 +110,13 @@ public class WinBollServiceStatusView extends LinearLayout {
     }
 
     void initView() {
-        _WinBollServiceStatusView = this;
+        _WinBoLLServiceStatusView = this;
 
         mImageView = new ImageView(mContext);
         setImageViewByConnection(mImageView, false);
         mConnectionStatus = getConnectionStatus();
         //mIsConnected = false;
-        //mWinBollServerHostConnectionStatus = WinBollServerHostConnectionStatus.DISCONNECTED;
+        //mWinBoLLServerHostConnectionStatus = WinBoLLServerHostConnectionStatus.DISCONNECTED;
         //ToastUtils.show("initView()");
 
         mViewOnClickListener = new View.OnClickListener(){
@@ -125,10 +125,10 @@ public class WinBollServiceStatusView extends LinearLayout {
                 LogUtils.d(TAG, "onClick()");
                 if (mConnectionStatus == ConnectionStatus.CONNECTED) {
                     LogUtils.d(TAG, "Click to stop service.");
-                    WinBollClientServiceBean bean = WinBollClientServiceBean.loadWinBollClientServiceBean(mContext);
+                    WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(mContext);
                     bean.setIsEnable(false);
-                    WinBollClientServiceBean.saveBean(mContext, bean);
+                    WinBoLLClientServiceBean.saveBean(mContext, bean);
-                    Intent intent = new Intent(mContext, WinBollClientService.class);
+                    Intent intent = new Intent(mContext, WinBoLLClientService.class);
                     mContext.stopService(intent);
                     //stopConnectionThread();
                     mTextView.setText("");
@@ -136,10 +136,10 @@ public class WinBollServiceStatusView extends LinearLayout {
                     mConnectionStatus = ConnectionStatus.DISCONNECTED;
                 } else if (mConnectionStatus == ConnectionStatus.DISCONNECTED) {
                     LogUtils.d(TAG, "Click to start service.");
-                    WinBollClientServiceBean bean = WinBollClientServiceBean.loadWinBollClientServiceBean(mContext);
+                    WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(mContext);
                     bean.setIsEnable(true);
-                    WinBollClientServiceBean.saveBean(mContext, bean);
+                    WinBoLLClientServiceBean.saveBean(mContext, bean);
-                    Intent intent = new Intent(mContext, WinBollClientService.class);
+                    Intent intent = new Intent(mContext, WinBoLLClientService.class);
                     mContext.startService(intent);
                     //startConnectionThread();
                 }
@@ -148,7 +148,7 @@ public class WinBollServiceStatusView extends LinearLayout {
         setOnClickListener(mViewOnClickListener);
         addView(mImageView);
         mTextView = new TextView(mContext);
-        mWinBollServiceViewHandler = new WinBollServiceViewHandler(this);
+        mWinBoLLServiceViewHandler = new WinBoLLServiceViewHandler(this);
         addView(mTextView);
         /*mWebView = new WebView(mContext);
          mWebView.setWebViewClient(new WebViewClient() {
@@ -161,8 +161,8 @@ public class WinBollServiceStatusView extends LinearLayout {
          addView(mWebView);*/
     }
 
-    void checkWinBollServerStatusAndUpdateCurrentView() {
+    void checkWinBoLLServerStatusAndUpdateCurrentView() {
-        LogUtils.d(TAG, "checkWinBollServerStatusAndUpdateCurrentView()");
+        LogUtils.d(TAG, "checkWinBoLLServerStatusAndUpdateCurrentView()");
         /*if (getConnectionStatus() == ConnectionStatus.CONNECTED) {
          mConnectionStatus = ConnectionStatus.CONNECTED;
          } else {
@@ -170,8 +170,8 @@ public class WinBollServiceStatusView extends LinearLayout {
          }*/
     }
 
-    public void setServerHost(String szWinBollServerHost) {
+    public void setServerHost(String szWinBoLLServerHost) {
-        mszServerHost = szWinBollServerHost;
+        mszServerHost = szWinBoLLServerHost;
     }
 
     public void setAuthInfo(String username, String password) {
@@ -216,8 +216,8 @@ public class WinBollServiceStatusView extends LinearLayout {
             // 按照指定格式格式化时间并输出
             String formattedDateTime = now.format(formatter);
             String msg = "ClientIP<" + formattedDateTime + ">: " + text;
-            mWinBollServiceViewHandler.postMessageText(msg);
+            mWinBoLLServiceViewHandler.postMessageText(msg);
-            mWinBollServiceViewHandler.postMessageConnectionStatus(true);
+            mWinBoLLServiceViewHandler.postMessageConnectionStatus(true);
 
         }
 
@@ -227,8 +227,8 @@ public class WinBollServiceStatusView extends LinearLayout {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
             // 处理网络请求失败
             setImageViewByConnection(mImageView, false);
-            mWinBollServiceViewHandler.postMessageText(e.getMessage());
+            mWinBoLLServiceViewHandler.postMessageText(e.getMessage());
-            mWinBollServiceViewHandler.postMessageConnectionStatus(false);
+            mWinBoLLServiceViewHandler.postMessageConnectionStatus(false);
         }
     };
 
@@ -249,12 +249,12 @@ public class WinBollServiceStatusView extends LinearLayout {
             username = PrefUtils.getString(mContext, "metDevUserName", "");
             password = PrefUtils.getString(mContext, "metDevUserPassword", "");
         } else {
-            username = "WinBoll";
+            username = "WinBoLL";
-            password = "WinBollPowerByZhanGSKen";
+            password = "WinBoLLPowerByZhanGSKen";
         }
         
         LogUtils.d(TAG, String.format("Connection Start. targetUrl %s", targetUrl));
-        WinBollServerConnectionThread thread = new WinBollServerConnectionThread(
+        WinBoLLServerConnectionThread thread = new WinBoLLServerConnectionThread(
             targetUrl,
             username,
             password,
@@ -263,7 +263,7 @@ public class WinBollServiceStatusView extends LinearLayout {
         thread.start();
     }
 
-    /*void requestWithBasicAuth(final WinBollServiceViewHandler textViewHandler, String targetUrl, final String username, final String password) {
+    /*void requestWithBasicAuth(final WinBoLLServiceViewHandler textViewHandler, String targetUrl, final String username, final String password) {
      // 用户名和密码，替换为实际的认证信息
      //String username = "your_username";
      //String password = "your_password";
@@ -350,10 +350,10 @@ public class WinBollServiceStatusView extends LinearLayout {
 
      }*/
 
-    class WinBollServiceViewHandler extends Handler {
+    class WinBoLLServiceViewHandler extends Handler {
-        WinBollServiceStatusView mDevelopHostConnectionStatusView;
+        WinBoLLServiceStatusView mDevelopHostConnectionStatusView;
 
-        public WinBollServiceViewHandler(WinBollServiceStatusView view) {
+        public WinBoLLServiceViewHandler(WinBoLLServiceStatusView view) {
             mDevelopHostConnectionStatusView = view;
         }
 
@@ -384,14 +384,14 @@ public class WinBollServiceStatusView extends LinearLayout {
     }
 
     public static void startConnection() {
-        if (_WinBollServiceStatusView != null) {
+        if (_WinBoLLServiceStatusView != null) {
-            _WinBollServiceStatusView.startConnectionThread();
+            _WinBoLLServiceStatusView.startConnectionThread();
         }
     }
 
     public static void stopConnection() {
-        if (_WinBollServiceStatusView != null) {
+        if (_WinBoLLServiceStatusView != null) {
-            _WinBollServiceStatusView.stopConnectionThread();
+            _WinBoLLServiceStatusView.stopConnectionThread();
         }
     }
 
@@ -448,7 +448,7 @@ public class WinBollServiceStatusView extends LinearLayout {
                     requestCIPWithBasicAuth();
                 } else if (mConnectionStatus == ConnectionStatus.CONNECTED
                            || mConnectionStatus == ConnectionStatus.DISCONNECTED) {
-                    //ToastUtils.show("mWinBollServerHostConnectionStatus " + mConnectionStatus);
+                    //ToastUtils.show("mWinBoLLServerHostConnectionStatus " + mConnectionStatus);
                     LogUtils.d(TAG, String.format("mConnectionStatus done %s", mConnectionStatus));
                 } else {
                     LogUtils.d(TAG, String.format("mConnectionStatus unknow %s", mConnectionStatus));
@@ -465,7 +465,7 @@ public class WinBollServiceStatusView extends LinearLayout {
         }
     }
 
-    /*WinBollService.OnServiceStatusChangeListener mOnServerStatusChangeListener = new WinBollService.OnServiceStatusChangeListener(){
+    /*WinBoLLService.OnServiceStatusChangeListener mOnServerStatusChangeListener = new WinBoLLService.OnServiceStatusChangeListener(){
      @Override
      public void onServerStatusChange(boolean isServiceAlive) {
      }

libaes/src/main/res/layout/view_about_dev.xml

@@ -53,10 +53,10 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal">
 
-        <cc.winboll.studio.libaes.winboll.WinBollServiceStatusView
+        <cc.winboll.studio.libaes.winboll.WinBoLLServiceStatusView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/viewaboutdevWinBollServiceStatusView1"/>
+            android:id="@+id/viewaboutdevWinBoLLServiceStatusView1"/>
 
     </LinearLayout>
 

libaes/src/main/res/layout/view_about_www.xml

@@ -12,10 +12,10 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal">
 
-        <cc.winboll.studio.libaes.winboll.WinBollServiceStatusView
+        <cc.winboll.studio.libaes.winboll.WinBoLLServiceStatusView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/viewaboutwwwWinBollServiceStatusView1"/>
+            android:id="@+id/viewaboutwwwWinBoLLServiceStatusView1"/>
 
     </LinearLayout>
 

libaes/src/main/res/layout/view_toast.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
-    android:background="@drawable/toast_frame"
-    android:padding="10dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/app_name"
-        android:textStyle="bold"
-        android:textColor="#FFFFFFFF"/>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:src="@drawable/ic_launcher"/>
-
-        <TextView
-            android:id="@android:id/message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:textColor="#FFFFFFFF"/>
-
-    </LinearLayout>
-
-</LinearLayout>
-

libaes/src/main/res/values-zh/string.xml

@@ -2,7 +2,7 @@
 <resources>
 
     <string name="lib_name">libaes</string>
-    <string name="lib_description">云宝APP应用安卓元素类库示例。源码仅供调试参考，请勿直接引用。(WinBoll APP application Android element class library example. The source is just for demo debug test, Do not quote directly.)</string>
+    <string name="lib_description">云宝APP应用安卓元素类库示例。源码仅供调试参考，请勿直接引用。(WinBoLL APP application Android element class library example. The source is just for demo debug test, Do not quote directly.)</string>
     <string name="lib_home">https://winboll.cc/aes</string>
     <string name="text_about">关于</string>
     <string name="text_AppTheme">应用主题</string>

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

@@ -2,7 +2,7 @@
 <resources>
 
     <string name="lib_name">libaes</string>
-    <string name="lib_description">云宝APP应用安卓元素类库示例。源码仅供调试参考，请勿直接引用。(WinBoll APP application Android element class library example. The source is just for demo debug test, Do not quote directly.)</string>
+    <string name="lib_description">云宝APP应用安卓元素类库示例。源码仅供调试参考，请勿直接引用。(WinBoLL APP application Android element class library example. The source is just for demo debug test, Do not quote directly.)</string>
     <string name="lib_home">https://winboll.cc/libaes</string>
     <string name="text_about">About</string>
     <string name="text_AppTheme">AppTheme</string>

libappbase/build.gradle

@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
     buildTypes {
         release {
@@ -22,25 +22,4 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    
-    // Android 类库
-    //api 'com.android.support:appcompat-v7:28.0.0'
-    api('com.android.support:appcompat-v7:28.0.0'){
-        //exclude group: "com.android.support", module: "support-vector-drawable"
-        exclude group: "com.android.support:animated-vector-drawable:28.0.0"
-    }
-    // https://mvnrepository.com/artifact/com.android.support/support-compat
-    //api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
-    // https://mvnrepository.com/artifact/com.android.support/support-v4
-    api 'com.android.support:support-v4:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-media-compat
-    api 'com.android.support:support-media-compat:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-core-utils
-    api 'com.android.support:support-core-utils:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-core-ui
-    api 'com.android.support:support-core-ui:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-fragment
-    api 'com.android.support:support-fragment:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
-    api 'com.android.support:recyclerview-v7:28.0.0'
 }

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Apr 12 15:06:52 HKT 2025
+#Tue Apr 29 14:47:16 HKT 2025
-stageCount=6
+stageCount=7
 libraryProject=libappbase
-baseVersion=15.2
+baseVersion=15.7
-publishVersion=15.2.5
+publishVersion=15.7.6
 buildCount=0
-baseBetaVersion=15.2.6
+baseBetaVersion=15.7.7

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java

@@ -12,7 +12,7 @@ import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.Looper;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import cc.winboll.studio.libappbase.winboll.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.winboll.MyActivityLifecycleCallbacks;
 
 public class GlobalApplication extends Application {
@@ -46,8 +46,8 @@ public class GlobalApplication extends Application {
         return isDebuging;
     }
 
-    public static WinBollActivityManager getWinBollActivityManager() {
+    public static WinBoLLActivityManager getWinBoLLActivityManager() {
-        return WinBollActivityManager.getInstance(_GlobalApplication);
+        return WinBoLLActivityManager.getInstance(_GlobalApplication);
     }
 
     @Override
@@ -77,7 +77,7 @@ public class GlobalApplication extends Application {
             setIsDebuging(appBaseModel.isDebuging());
         }
         
-        getWinBollActivityManager().setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
+        getWinBoLLActivityManager().setWinBoLLUI_TYPE(WinBoLLActivityManager.WinBoLLUI_TYPE.Service);
         // 注册窗口回调监听
         mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
         registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java

@@ -4,20 +4,19 @@ package cc.winboll.studio.libappbase;
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/02/11 00:14:05
  */
+import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 import cc.winboll.studio.libappbase.R;
 
-public final class GlobalCrashActivity extends AppCompatActivity implements MenuItem.OnMenuItemClickListener {
+public final class GlobalCrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
 
     private static final int MENUITEM_COPY = 0;
     private static final int MENUITEM_RESTART = 1;
@@ -39,10 +38,10 @@ public final class GlobalCrashActivity extends AppCompatActivity implements Menu
         setContentView(R.layout.activity_globalcrash);
         mGlobalCrashReportView = findViewById(R.id.activityglobalcrashGlobalCrashReportView1);
         mGlobalCrashReportView.setReport(mLog);
-        setSupportActionBar(mGlobalCrashReportView.getToolbar());
+        setActionBar(mGlobalCrashReportView.getToolbar());
         
-        getSupportActionBar().setTitle(CrashHandler.TITTLE);
+        getActionBar().setTitle(CrashHandler.TITTLE);
-        getSupportActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
+        getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
     }
 
     @Override

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java

@@ -8,7 +8,6 @@ package cc.winboll.studio.libappbase;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
-import android.support.v7.widget.Toolbar;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.util.AttributeSet;
@@ -16,6 +15,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toolbar;
 import cc.winboll.studio.libappbase.R;
 
 public class GlobalCrashReportView extends LinearLayout {

libappbase/src/main/java/cc/winboll/studio/libappbase/WinBoll.java

@@ -1,3 +0,0 @@
-package cc.winboll.studio.libappbase;
-
-

libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOS.java

@@ -3,7 +3,7 @@ package cc.winboll.studio.libappbase.sos;
 /**
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/03/02 09:36:29
- * @Describe WinBoll 应用 SOS 机理保护类
+ * @Describe WinBoLL 应用 SOS 机理保护类
  */
 import android.content.Context;
 import android.content.Intent;

libappbase/src/main/java/cc/winboll/studio/libappbase/sos/WinBoLL.java

@@ -3,17 +3,17 @@ package cc.winboll.studio.libappbase.sos;
 /**
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/03/02 09:54:28
- * @Describe WinBoll 系列应用通用管理类
+ * @Describe WinBoLL 系列应用通用管理类
  */
 import android.content.Context;
 import android.content.Intent;
 import cc.winboll.studio.libappbase.LogUtils;
 
-public class WinBoll {
+public class WinBoLL {
 
-    public static final String TAG = "WinBoll";
+    public static final String TAG = "WinBoLL";
 
-    public static final String ACTION_BIND = WinBoll.class.getName() + ".ACTION_BIND";
+    public static final String ACTION_BIND = WinBoLL.class.getName() + ".ACTION_BIND";
     public static final String EXTRA_APPMODEL = "EXTRA_APPMODEL";
 
     public static void bindToAPPBase(Context context, String appMainService) {

libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/IWinBoLLActivity.java

@@ -3,14 +3,14 @@ package cc.winboll.studio.libappbase.winboll;
 /**
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/03/24 08:23:40
- * @Describe WinBoll 活动窗口通用接口
+ * @Describe WinBoLL 活动窗口通用接口
  */
 import android.app.Activity;
 import android.widget.Toolbar;
 
-public interface IWinBollActivity {
+public interface IWinBoLLActivity {
 
-    public static final String TAG = "IWinBollActivity";
+    public static final String TAG = "IWinBoLLActivity";
 
     // 获取活动窗口
     abstract public Activity getActivity();

libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java

@@ -13,7 +13,7 @@ import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.R;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 
-public class LogActivity extends Activity implements IWinBollActivity {
+public class LogActivity extends Activity implements IWinBoLLActivity {
 
     public static final String TAG = "LogActivity";
 

libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java

@@ -19,70 +19,70 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-public class WinBollActivityManager {
+public class WinBoLLActivityManager {
 
-    public static final String TAG = "WinBollActivityManager";
+    public static final String TAG = "WinBoLLActivityManager";
     public static final String EXTRA_TAG = "EXTRA_TAG";
 
-    public static enum WinBollUI_TYPE {
+    public static enum WinBoLLUI_TYPE {
         Aplication, // 退出应用后，保持最近任务栏任务记录主窗口
         Service // 退出应用后，清理所有最近任务栏任务记录窗口
         };
 
     // 应用类型标志
-    static volatile WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;
+    static volatile WinBoLLUI_TYPE _mWinBoLLUI_TYPE = WinBoLLUI_TYPE.Service;
 
     GlobalApplication mGlobalApplication;
-    static volatile WinBollActivityManager _Instance;
+    static volatile WinBoLLActivityManager _Instance;
-    static volatile Map<String, IWinBollActivity> _mapIWinBollList;
+    static volatile Map<String, IWinBoLLActivity> _mapIWinBoLLList;
-    volatile IWinBollActivity mFirstIWinBollActivity;
+    volatile IWinBoLLActivity mFirstIWinBoLLActivity;
 
-    WinBollActivityManager(GlobalApplication application) {
+    WinBoLLActivityManager(GlobalApplication application) {
         mGlobalApplication = application;
-        _mapIWinBollList = new HashMap<String, IWinBollActivity>();
+        _mapIWinBoLLList = new HashMap<String, IWinBoLLActivity>();
     }
 
-    public static synchronized WinBollActivityManager getInstance(GlobalApplication application) {
+    public static synchronized WinBoLLActivityManager getInstance(GlobalApplication application) {
         LogUtils.d(TAG, "getInstance");
         if (_Instance == null) {
             LogUtils.d(TAG, "_Instance == null");
-            _Instance = new WinBollActivityManager(application);
+            _Instance = new WinBoLLActivityManager(application);
         }
         return _Instance;
     }
 
     //
-    // 设置 WinBoll 应用 UI 类型
+    // 设置 WinBoLL 应用 UI 类型
     //
-    public synchronized static void setWinBollUI_TYPE(WinBollUI_TYPE mWinBollUI_TYPE) {
+    public synchronized static void setWinBoLLUI_TYPE(WinBoLLUI_TYPE mWinBoLLUI_TYPE) {
-        _mWinBollUI_TYPE = mWinBollUI_TYPE;
+        _mWinBoLLUI_TYPE = mWinBoLLUI_TYPE;
     }
 
     //
-    // 获取 WinBoll 应用 UI 类型
+    // 获取 WinBoLL 应用 UI 类型
     //
-    public synchronized static WinBollUI_TYPE getWinBollUI_TYPE() {
+    public synchronized static WinBoLLUI_TYPE getWinBoLLUI_TYPE() {
-        return _mWinBollUI_TYPE;
+        return _mWinBoLLUI_TYPE;
     }
 
     //
     // 把Activity添加到管理中
     //
-    public <T extends IWinBollActivity> void add(T iWinBoll) {
+    public <T extends IWinBoLLActivity> void add(T iWinBoLL) {
-        String tag = ((IWinBollActivity)iWinBoll).getTag();
+        String tag = ((IWinBoLLActivity)iWinBoLL).getTag();
-        LogUtils.d(TAG, String.format("add(T iWinBoll) tag is %s", tag));
+        LogUtils.d(TAG, String.format("add(T iWinBoLL) tag is %s", tag));
         if (isActive(tag)) {
             LogUtils.d(TAG, String.format("isActive(tag) is true, tag : %s.", tag));
         } else {
             // 设置起始活动窗口，以便最后退出时提问
-            if (mFirstIWinBollActivity == null && _mapIWinBollList.size() == 0) {
+            if (mFirstIWinBoLLActivity == null && _mapIWinBoLLList.size() == 0) {
-                LogUtils.d(TAG, "Set firstIWinBollActivity, iWinBoll.getTag() is %s" + iWinBoll.getTag());
+                LogUtils.d(TAG, "Set firstIWinBoLLActivity, iWinBoLL.getTag() is %s" + iWinBoLL.getTag());
-                mFirstIWinBollActivity = iWinBoll;
+                mFirstIWinBoLLActivity = iWinBoLL;
             }
 
             // 添加到活动窗口列表
-            _mapIWinBollList.put(iWinBoll.getTag(), iWinBoll);
+            _mapIWinBoLLList.put(iWinBoLL.getTag(), iWinBoLL);
-            LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", iWinBoll.getTag(), _mapIWinBollList.size()));
+            LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", iWinBoLL.getTag(), _mapIWinBoLLList.size()));
         }
     }
 
@@ -93,16 +93,16 @@ public class WinBollActivityManager {
     // activity: 不为 null 时，
     // intent.putExtra 函数 "tag" 参数为 activity.getTag()
     //
-    public <T extends IWinBollActivity> void startWinBollActivity(Context context, Class<T> clazz) {
+    public <T extends IWinBoLLActivity> void startWinBoLLActivity(Context context, Class<T> clazz) {
         try {
             // 如果窗口已存在就重启窗口
-            String tag = ((IWinBollActivity)clazz.newInstance()).getTag();
+            String tag = ((IWinBoLLActivity)clazz.newInstance()).getTag();
-            LogUtils.d(TAG, String.format("startWinBollActivity(Context context, Class<T> clazz) tag is %s", tag));
+            LogUtils.d(TAG, String.format("startWinBoLLActivity(Context context, Class<T> clazz) tag is %s", tag));
             if (isActive(tag)) {
                 resumeActivity(context, tag);
                 return;
             }
-            //ToastUtils.show("startWinBollActivity(Context context, Class<T> clazz)");
+            //ToastUtils.show("startWinBoLLActivity(Context context, Class<T> clazz)");
 
             // 新建一个任务窗口
             Intent intent = new Intent(context, clazz);
@@ -117,11 +117,11 @@ public class WinBollActivityManager {
         }
     }
 
-    public <T extends IWinBollActivity> void startWinBollActivity(Context context, Intent intent, Class<T> clazz) {
+    public <T extends IWinBoLLActivity> void startWinBoLLActivity(Context context, Intent intent, Class<T> clazz) {
         try {
             // 如果窗口已存在就重启窗口
-            String tag = ((IWinBollActivity)clazz.newInstance()).getTag();
+            String tag = ((IWinBoLLActivity)clazz.newInstance()).getTag();
-            LogUtils.d(TAG, String.format("startWinBollActivity(Context context, Intent intent, Class<T> clazz) tag is %s", tag));
+            LogUtils.d(TAG, String.format("startWinBoLLActivity(Context context, Intent intent, Class<T> clazz) tag is %s", tag));
             if (isActive(tag)) {
                 resumeActivity(context, tag);
                 return;
@@ -140,7 +140,7 @@ public class WinBollActivityManager {
         }
     }
 
-    public <T extends IWinBollActivity> void startLogActivity(Context context) {
+    public <T extends IWinBoLLActivity> void startLogActivity(Context context) {
         // 如果窗口已存在就重启窗口
         String tag = LogActivity.TAG;
         if (isActive(tag)) {
@@ -167,8 +167,8 @@ public class WinBollActivityManager {
         context.startActivity(intent);
     }
 
-    public boolean isFirstIWinBollActivity(IWinBollActivity iWinBollActivity) {
+    public boolean isFirstIWinBoLLActivity(IWinBoLLActivity iWinBoLLActivity) {
-        return mFirstIWinBollActivity != null && mFirstIWinBollActivity == iWinBollActivity;
+        return mFirstIWinBoLLActivity != null && mFirstIWinBoLLActivity == iWinBoLLActivity;
     }
 
     //
@@ -176,15 +176,15 @@ public class WinBollActivityManager {
     //
     public boolean isActive(String tag) {
         LogUtils.d(TAG, String.format("isActive(String tag) tag is %s", tag));
-        //printIWinBollListInfo();
+        //printIWinBoLLListInfo();
-        IWinBollActivity iWinBoll = getIWinBoll(tag);
+        IWinBoLLActivity iWinBoLL = getIWinBoLL(tag);
-        if (iWinBoll != null) {
+        if (iWinBoLL != null) {
             //LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
             //ToastUtils.show("activity != null tag " + tag);
             //判断是否为 BaseActivity,如果已经销毁，则移除
-            if (iWinBoll.getActivity().isFinishing() || iWinBoll.getActivity().isDestroyed()) {
+            if (iWinBoLL.getActivity().isFinishing() || iWinBoLL.getActivity().isDestroyed()) {
-                _mapIWinBollList.remove(iWinBoll.getTag());
+                _mapIWinBoLLList.remove(iWinBoLL.getTag());
-                //_mWinBollActivityList.remove(activity);
+                //_mWinBoLLActivityList.remove(activity);
                 LogUtils.d(TAG, String.format("isActive(...) remove activity.\ntag : %s", tag));
                 return false;
             } else {
@@ -192,44 +192,44 @@ public class WinBollActivityManager {
                 return true;
             }
         } else {
-            LogUtils.d(TAG, String.format("isActive(...) iWinBoll is null tag by %s", tag));
+            LogUtils.d(TAG, String.format("isActive(...) iWinBoLL is null tag by %s", tag));
             return false;
         }
     }
 
-    static IWinBollActivity getIWinBoll(String tag) {
+    static IWinBoLLActivity getIWinBoLL(String tag) {
-        LogUtils.d(TAG, String.format("getIWinBoll(String tag) %s", tag));
+        LogUtils.d(TAG, String.format("getIWinBoLL(String tag) %s", tag));
-        return _mapIWinBollList.get(tag);
+        return _mapIWinBoLLList.get(tag);
     }
 
     //
     // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
     //
-    public <T extends IWinBollActivity> void resumeActivity(Context context, String tag) {
+    public <T extends IWinBoLLActivity> void resumeActivity(Context context, String tag) {
         LogUtils.d(TAG, "resumeActivity(Context context, String tag)");
-        T iWinBoll = (T)getIWinBoll(tag);
+        T iWinBoLL = (T)getIWinBoLL(tag);
-        LogUtils.d(TAG, String.format("iWinBoll.getTag() %s", iWinBoll.getTag()));
+        LogUtils.d(TAG, String.format("iWinBoLL.getTag() %s", iWinBoLL.getTag()));
         //LogUtils.d(TAG, "activity " + activity.getTag());
-        if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
+        if (iWinBoLL != null && !iWinBoLL.getActivity().isFinishing() && !iWinBoLL.getActivity().isDestroyed()) {
-            resumeActivity(context, iWinBoll);
+            resumeActivity(context, iWinBoLL);
         }
     }
 
     //
     // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
     //
-    public <T extends IWinBollActivity> void resumeActivity(Context context, T iWinBoll) {
+    public <T extends IWinBoLLActivity> void resumeActivity(Context context, T iWinBoLL) {
-        LogUtils.d(TAG, "resumeActivity(Context context, T iWinBoll)");
+        LogUtils.d(TAG, "resumeActivity(Context context, T iWinBoLL)");
         ActivityManager am = (ActivityManager) mGlobalApplication.getSystemService(Context.ACTIVITY_SERVICE);
         //返回启动它的根任务（home 或者 MainActivity）
-        Intent intent = new Intent(mGlobalApplication, iWinBoll.getClass());
+        Intent intent = new Intent(mGlobalApplication, iWinBoLL.getClass());
         TaskStackBuilder stackBuilder = TaskStackBuilder.create(mGlobalApplication);
         stackBuilder.addNextIntentWithParentStack(intent);
         stackBuilder.startActivities();
         //moveTaskToFront(YourTaskId, 0);
         //ToastUtils.show("resumeActivity am.moveTaskToFront");
-        LogUtils.d(TAG, String.format("iWinBoll.getActivity().getTaskId() %d", iWinBoll.getActivity().getTaskId()));
+        LogUtils.d(TAG, String.format("iWinBoLL.getActivity().getTaskId() %d", iWinBoLL.getActivity().getTaskId()));
-        am.moveTaskToFront(iWinBoll.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
+        am.moveTaskToFront(iWinBoLL.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
         LogUtils.d(TAG, "am.moveTaskToFront");
     }
 
@@ -239,23 +239,23 @@ public class WinBollActivityManager {
     //
     public void finishAll() {
         try {
-            for (String key : _mapIWinBollList.keySet()) {
+            for (String key : _mapIWinBoLLList.keySet()) {
                 //System.out.println("Key: " + key + ", Value: " + _mapActivityList.get(key));
-                IWinBollActivity iWinBoll = _mapIWinBollList.get(key);
+                IWinBoLLActivity iWinBoLL = _mapIWinBoLLList.get(key);
                 //ToastUtils.show("finishAll() activity");
-                if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
+                if (iWinBoLL != null && !iWinBoLL.getActivity().isFinishing() && !iWinBoLL.getActivity().isDestroyed()) {
                     //ToastUtils.show("activity != null ...");
-                    if (getWinBollUI_TYPE() == WinBollUI_TYPE.Service) {
+                    if (getWinBoLLUI_TYPE() == WinBoLLUI_TYPE.Service) {
                         // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。
-                        iWinBoll.getActivity().finishAndRemoveTask();
+                        iWinBoLL.getActivity().finishAndRemoveTask();
                         //ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
-                    } else if (getWinBollUI_TYPE() == WinBollUI_TYPE.Aplication) {
+                    } else if (getWinBoLLUI_TYPE() == WinBoLLUI_TYPE.Aplication) {
                         // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。
-                        iWinBoll.getActivity().finish();
+                        iWinBoLL.getActivity().finish();
                         //ToastUtils.show("finishAll() activity.finish();");
                     } else {
-                        LogUtils.d(TAG, "WinBollApplication.WinBollUI_TYPE error.");
+                        LogUtils.d(TAG, "WinBoLLApplication.WinBoLLUI_TYPE error.");
-                        //ToastUtils.show("WinBollApplication.WinBollUI_TYPE error.");
+                        //ToastUtils.show("WinBoLLApplication.WinBoLLUI_TYPE error.");
                     }
                 }
             }
@@ -267,14 +267,14 @@ public class WinBollActivityManager {
     //
     // 结束指定Activity
     //
-    public <T extends IWinBollActivity> void finish(T iWinBoll) {
+    public <T extends IWinBoLLActivity> void finish(T iWinBoLL) {
         try {
-            if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
+            if (iWinBoLL != null && !iWinBoLL.getActivity().isFinishing() && !iWinBoLL.getActivity().isDestroyed()) {
                 //根据tag 移除 MyActivity
                 //String tag= activity.getTag();
-                //_mWinBollActivityList.remove(tag);
+                //_mWinBoLLActivityList.remove(tag);
                 //ToastUtils.show("remove");
-                //ToastUtils.show("_mWinBollActivityArrayMap.size() " + Integer.toString(_mWinBollActivityArrayMap.size()));
+                //ToastUtils.show("_mWinBoLLActivityArrayMap.size() " + Integer.toString(_mWinBoLLActivityArrayMap.size()));
 
                 // 窗口回调规则：
                 // [] 当前窗口位置 >> 调度出的窗口位置
@@ -284,10 +284,10 @@ public class WinBollActivityManager {
                 // ★：0 1 2 3 [4] >> 3
                 // ★：[0] >> 直接关闭当前窗口
                 //LogUtils.d(TAG, "finish no yet.");
-                IWinBollActivity preIWinBoll = getPreIWinBoll(iWinBoll);
+                IWinBoLLActivity preIWinBoLL = getPreIWinBoLL(iWinBoLL);
-                iWinBoll.getActivity().finish();
+                iWinBoLL.getActivity().finish();
-                if (preIWinBoll != null) {
+                if (preIWinBoLL != null) {
-                    resumeActivity(mGlobalApplication, preIWinBoll);
+                    resumeActivity(mGlobalApplication, preIWinBoLL);
                 }
             }
 
@@ -299,21 +299,21 @@ public class WinBollActivityManager {
     //
     // 获取窗口队列中的前一个窗口
     //
-    IWinBollActivity getPreIWinBoll(IWinBollActivity iWinBoll) {
+    IWinBoLLActivity getPreIWinBoLL(IWinBoLLActivity iWinBoLL) {
         try {
             boolean bingo = false;
-            IWinBollActivity preIWinBoll = null;
+            IWinBoLLActivity preIWinBoLL = null;
-            for (Map.Entry<String, IWinBollActivity> entity : _mapIWinBollList.entrySet()) {
+            for (Map.Entry<String, IWinBoLLActivity> entity : _mapIWinBoLLList.entrySet()) {
-                if (entity.getKey().equals(iWinBoll.getTag())) {
+                if (entity.getKey().equals(iWinBoLL.getTag())) {
                     bingo = true;
                     //LogUtils.d(TAG, "bingo");
                     break;
                 }
-                preIWinBoll = entity.getValue();
+                preIWinBoLL = entity.getValue();
             }
 
             if (bingo) {
-                return preIWinBoll;
+                return preIWinBoLL;
             }
         } catch (Exception e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
@@ -325,10 +325,10 @@ public class WinBollActivityManager {
     //
     // 从管理列表中移除管理项
     //
-    public <T extends IWinBollActivity> boolean registeRemove(T activity) {
+    public <T extends IWinBoLLActivity> boolean registeRemove(T activity) {
-        IWinBollActivity iWinBollTest = _mapIWinBollList.get(activity.getTag());
+        IWinBoLLActivity iWinBoLLTest = _mapIWinBoLLList.get(activity.getTag());
-        if (iWinBollTest != null) {
+        if (iWinBoLLTest != null) {
-            _mapIWinBollList.remove(activity.getTag());
+            _mapIWinBoLLList.remove(activity.getTag());
             return true;
         }
         return false;
@@ -337,13 +337,13 @@ public class WinBollActivityManager {
     //
     // 打印管理列表项列表里的信息
     //
-    public static void printIWinBollListInfo() {
+    public static void printIWinBoLLListInfo() {
         //LogUtils.d(TAG, "printAvtivityListInfo");
-        if (!_mapIWinBollList.isEmpty()) {
+        if (!_mapIWinBoLLList.isEmpty()) {
-            StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(_mapIWinBollList.size()));
+            StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(_mapIWinBoLLList.size()));
-            Iterator<Map.Entry<String, IWinBollActivity>> iterator = _mapIWinBollList.entrySet().iterator();
+            Iterator<Map.Entry<String, IWinBoLLActivity>> iterator = _mapIWinBoLLList.entrySet().iterator();
             while (iterator.hasNext()) {
-                Map.Entry<String, IWinBollActivity> entry = iterator.next();
+                Map.Entry<String, IWinBoLLActivity> entry = iterator.next();
                 sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag());
                 //ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag());
             }

libappbase/src/main/res/layout/view_globalcrashreport.xml

@@ -7,7 +7,7 @@
 	android:layout_height="match_parent"
 	android:id="@+id/viewglobalcrashreportLinearLayout1">
 
-    <android.support.v7.widget.Toolbar
+    <android.widget.Toolbar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
 		android:id="@+id/viewglobalcrashreportToolbar1"/>

libappbase/src/main/res/menu/toolbar_appbase.xml

@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/item_minimal"
         android:title="MINIMAL"
-        android:icon="@drawable/ic_winboll_point"
+        android:icon="@drawable/ic_winboll_point"/>
-        app:showAsAction="always"/>
     <item
         android:id="@+id/item_about"
         android:title="ABOUT"
-        android:icon="@drawable/ic_winboll_logo"
+        android:icon="@drawable/ic_winboll_logo"/>
-        app:showAsAction="always"/>
     <item
         android:id="@+id/item_help"
         android:title="HELP"
-        android:icon="@drawable/ic_winboll_help"
+        android:icon="@drawable/ic_winboll_help"/>
-        app:showAsAction="always"/>
 
     <item
         android:id="@+id/item_log"
         android:title="LOG"
-        android:icon="@drawable/ic_winboll_log"
+        android:icon="@drawable/ic_winboll_log"/>
-        app:showAsAction="always"/>
 </menu>

libappbase/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="APPBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
         <item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item>
     </style>
 

libapputils/build.gradle

@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
     buildTypes {
         release {
@@ -21,28 +21,7 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    // Android 类库
+    api 'cc.winboll.studio:libappbase:15.7.6'
-    //api 'com.android.support:appcompat-v7:28.0.0'
-    api('com.android.support:appcompat-v7:28.0.0'){
-        //exclude group: "com.android.support", module: "support-vector-drawable"
-        exclude group: "com.android.support:animated-vector-drawable:28.0.0"
-    }
-    // https://mvnrepository.com/artifact/com.android.support/support-compat
-    //api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
-    // https://mvnrepository.com/artifact/com.android.support/support-v4
-    api 'com.android.support:support-v4:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-media-compat
-    api 'com.android.support:support-media-compat:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-core-utils
-    api 'com.android.support:support-core-utils:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-core-ui
-    api 'com.android.support:support-core-ui:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-fragment
-    api 'com.android.support:support-fragment:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
-    api 'com.android.support:recyclerview-v7:28.0.0'
-
-    api 'cc.winboll.studio:libappbase:15.2.0'
     
     // 二维码类库
     api 'com.google.zxing:core:3.4.1'

libapputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Mar 29 12:14:39 HKT 2025
+#Tue Apr 29 15:03:54 HKT 2025
-stageCount=2
+stageCount=5
 libraryProject=libapputils
-baseVersion=15.2
+baseVersion=15.3
-publishVersion=15.2.1
+publishVersion=15.3.4
 buildCount=0
-baseBetaVersion=15.2.2
+baseBetaVersion=15.3.5

libapputils/src/main/assets/winboll/studio/html/index.html

@@ -3,10 +3,10 @@
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device - width, initial - scale = 1.0">
-    <title>WinBoll-APP</title>
+    <title>WinBoLL-APP</title>
   </head>
   <body>
-    <h2><a href="https://www.winboll.cc">访问 WWW.WinBoll.CC</a></h2>
+    <h2><a href="https://www.winboll.cc">访问 WWW.WinBoLL.CC</a></h2>
   </body>
 </html>
 

libapputils/src/main/assets/winboll/studio/html/javascript_test.html

@@ -7,10 +7,10 @@
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device - width, initial - scale = 1.0">
-    <title>WinBoll</title>
+    <title>WinBoLL</title>
   </head>
   <body>
-    <canvas id="ChangeText">WinBoll Studio</canvas>
+    <canvas id="ChangeText">WinBoLL Studio</canvas>
 
 <script type="text/javascript">
     const COLOR = "#39BC54"; // 设定粒子特效颜色

libapputils/src/main/java/cc/winboll/studio/libapputils/git/IAPPFiles.java

@@ -29,7 +29,7 @@ public interface IAPPFiles {
         static String _mFilesRoot = "";
 
         HashFile(Context context) {
-            _mapFiles.put(UUID_WINBOLLCLIENTSERVICEBEAN_JSON, "/BaseBean/cc.winboll.studio.shared.service.WinBollClientServiceBean.json");
+            _mapFiles.put(UUID_WINBOLLCLIENTSERVICEBEAN_JSON, "/BaseBean/cc.winboll.studio.shared.service.WinBoLLClientServiceBean.json");
             _mapFiles.put(UUID_LOGUTILS_JSON, "/LogUtils/LogUtils.json");
         }
 

libapputils/src/main/res/values-v21/styles.xml

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

libapputils/src/main/res/values/styles.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="UtilsTheme" parent="APPBaseTheme">
+    <style name="UtilsTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
     </style>
 </resources>

libjc/jcc/libs

@@ -1 +0,0 @@
-Subproject commit 645058e1e350a80eb4bfe33bd252f58f4dbe09c9

powerbell/build.gradle

@@ -19,7 +19,7 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.powerbell"
@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "4.0" 
+        versionName "15.3" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,17 +41,39 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }
 
 dependencies {
-	api 'cc.winboll.studio:winboll-shared:1.8.0'
+    api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'io.github.medyo:android-about-page:2.0.0'
+    api 'cc.winboll.studio:libaes:15.6.0'
+    api 'cc.winboll.studio:libapputils:15.3.4'
+    api 'cc.winboll.studio:libappbase:15.7.6'
+    
+    // 吐司提示库
     api 'com.github.getActivity:ToastUtils:10.5'
+    // 应用介绍页类库
+    api 'io.github.medyo:android-about-page:2.0.0'
+    // SSH
+    api 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    api 'com.google.zxing:core:3.4.1'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
+    // 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    
+    // AndroidX 类库
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'com.google.android.material:material:1.4.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.fragment:fragment:1.1.0'
+    
+    
+    /*api 'cc.winboll.studio:winboll-shared:1.8.0'
+    api 'io.github.medyo:android-about-page:2.0.0'
     api 'com.jcraft:jsch:0.1.55'
     api 'org.jsoup:jsoup:1.13.1'
     api 'com.squareup.okhttp3:okhttp:4.4.1'
@@ -67,6 +89,5 @@ dependencies {
     api 'com.squareup.okhttp3:okhttp:4.4.1'
     
     api 'cc.winboll.studio:libaes:7.6.0'
-    
+    */
-    api fileTree(dir: 'libs', include: ['*.jar'])
 }

powerbell/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jan 02 11:13:45 HKT 2025
+#Tue Apr 29 12:41:13 GMT 2025
-stageCount=6
+stageCount=0
 libraryProject=
-baseVersion=4.0
+baseVersion=15.3
-publishVersion=4.0.5
+publishVersion=15.3.0
-buildCount=0
+buildCount=4
-baseBetaVersion=4.0.6
+baseBetaVersion=15.3.1

powerbell/src/beta/AndroidManifest.xml

@@ -6,20 +6,18 @@
         tools:replace="android:icon"
         android:icon="@drawable/ic_launcher_beta">
 
-        <!-- Put flavor specific code here -->
         <provider
-            tools:replace="android:authorities"
             android:name="androidx.core.content.FileProvider"
             android:authorities="cc.winboll.studio.powerbell.beta.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
 
             <meta-data
-                tools:replace="android:resource"
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_provider"/>
 
         </provider>
+
     </application>
 
 </manifest>

powerbell/src/main/AndroidManifest.xml

@@ -3,9 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="cc.winboll.studio.powerbell">
 
-    <uses-permission android:name="android.permission.CAMERA" />
+    <!-- 拍摄照片和视频 -->
-    <uses-feature android:name="android.hardware.camera" />
+    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera.autofocus" />
 
     <!-- 运行前台服务 -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
@@ -22,8 +21,15 @@
     <!-- MANAGE_EXTERNAL_STORAGE -->
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
 
+    <!-- 显示通知 -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
+    <uses-feature android:name="android.hardware.camera"/>
+
+    <uses-feature android:name="android.hardware.camera.autofocus"/>
+
     <application
-        android:name=".GlobalApplication"
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
@@ -34,7 +40,8 @@
 
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:exported="true">
 
             <intent-filter>
 
@@ -110,6 +117,8 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
+        <activity android:name="cc.winboll.studio.powerbell.activities.BatteryReporterActivity"/>
+
         <activity android:name="cc.winboll.studio.powerbell.activities.AboutActivity"/>
 
     </application>

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

@@ -2,14 +2,14 @@ package cc.winboll.studio.powerbell;
 
 import android.content.Context;
 import android.view.Gravity;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.powerbell.receivers.GlobalApplicationReceiver;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
-import cc.winboll.studio.shared.app.WinBollApplication;
 import com.hjq.toast.ToastUtils;
-import com.hjq.toast.style.WhiteToastStyle;
+import java.io.File;
 
-public class GlobalApplication extends WinBollApplication {
+public class App extends GlobalApplication {
 
     public static final String TAG = "GlobalApplication";
 
@@ -17,16 +17,29 @@ public class GlobalApplication extends WinBollApplication {
     static AppConfigUtils _mAppConfigUtils;
     static AppCacheUtils _mAppCacheUtils;
     GlobalApplicationReceiver mReceiver;
+    static String szTempDir = "";
+    
+    public static String getTempDirPath() {
+        return szTempDir;
+    }
 
     @Override
     public void onCreate() {
         super.onCreate();
         
+        // 初始化临时文件夹目录
+        File fTempDir = new File(getExternalCacheDir(), "TempDir");
+        if(!fTempDir.exists()) {
+            fTempDir.mkdirs();
+        }
+        szTempDir = fTempDir.getAbsolutePath();
+        
+        
         // 初始化 Toast 框架
         ToastUtils.init(this);
         // 设置 Toast 布局样式
         //ToastUtils.setView(R.layout.toast_custom_view);
-        ToastUtils.setStyle(new WhiteToastStyle());
+        //ToastUtils.setStyle(new WhiteToastStyle());
         ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
 
         // 设置数据配置存储工具

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

@@ -12,14 +12,14 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 import cc.winboll.studio.libaes.views.AToolbar;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.activities.AboutActivity;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
+import cc.winboll.studio.powerbell.activities.BatteryReporterActivity;
 import cc.winboll.studio.powerbell.activities.ClearRecordActivity;
 import cc.winboll.studio.powerbell.fragments.MainViewFragment;
-import cc.winboll.studio.powerbell.utils.NotificationUtils;
-import cc.winboll.studio.shared.log.LogUtils;
-import cc.winboll.studio.shared.log.LogView;
 
 public class MainActivity extends Activity {
     public static final String TAG = "MainActivity";
@@ -28,7 +28,7 @@ public class MainActivity extends Activity {
     public static MainActivity _mMainActivity;
     LogView mLogView;
     //ArrayList<Fragment> mlistFragment;
-    GlobalApplication mApplication;
+    App mApplication;
     //AppConfigUtils mAppConfigUtils;
     Menu mMenu;
     Fragment mCurrentShowFragment;
@@ -48,12 +48,13 @@ public class MainActivity extends Activity {
         mLogView.updateLogView();
 
         _mMainActivity = MainActivity.this;
-        mApplication = (GlobalApplication) getApplication();
+        mApplication = (App) getApplication();
         //mAppConfigUtils = AppConfigUtils.getInstance(mApplication);
 
         // 初始化工具栏
         mAToolbar = (AToolbar) findViewById(R.id.toolbar);
         setActionBar(mAToolbar);
+        //mAToolbar.setSubtitle("Main");
         mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
 
         if (mMainViewFragment == null) {
@@ -64,8 +65,10 @@ public class MainActivity extends Activity {
         }
         showFragment(mMainViewFragment);
 
-        NotificationUtils notificationUtils = new NotificationUtils(this);
+//        NotificationHelper notificationUtils = new NotificationHelper(this);
-        notificationUtils.createNotificationChannel();
+//        notificationUtils.createNotificationChannels();
+
+
     }
 
     void showFragment(Fragment fragment) {
@@ -113,7 +116,7 @@ public class MainActivity extends Activity {
     protected void onResume() {
         super.onResume();
         // 回到窗口自动取消提醒消息
-        NotificationUtils.cancelRemindNotification(this);
+        //NotificationHelper.cancelRemindNotification(this);
 
         reloadBackground();
     }
@@ -140,8 +143,11 @@ public class MainActivity extends Activity {
         super.onOptionsItemSelected(item); 
         int menuItemId = item.getItemId();
         if (menuItemId == R.id.action_about) {
+            Intent intent = new Intent(this, AboutActivity.class);
+            startActivity(intent);
+        } else if (menuItemId == R.id.action_battery_reporter) {
             Intent intent = new Intent();
-            intent.setClass(this, AboutActivity.class);
+            intent.setClass(this, BatteryReporterActivity.class);
             startActivity(intent);
         } else if (menuItemId == R.id.action_clearrecord) {
             Intent intent = new Intent();

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/AboutActivity.java

@@ -1,42 +1,65 @@
 package cc.winboll.studio.powerbell.activities;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen@AliYun.Com
- * @Date 2024/07/12 13:33:59
+ * @Date 2025/03/25 01:16:32
- * @Describe AboutActivity
+ * @Describe 应用介绍窗口
  */
 import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
-import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import cc.winboll.studio.libaes.views.AToolbar;
+import cc.winboll.studio.libaes.winboll.APPInfo;
+import cc.winboll.studio.libaes.winboll.AboutView;
 import cc.winboll.studio.powerbell.R;
 
 public class AboutActivity extends Activity {
 
-    public static final String TAG = "AboutActivity";
+    Context mContext;
 
-    AToolbar mAToolbar;
+    public static final String TAG = "AboutActivity";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
+        mContext = this;
 
         // 初始化工具栏
-        mAToolbar = (AToolbar) findViewById(R.id.toolbar);
+        AToolbar mAToolbar = (AToolbar) findViewById(R.id.toolbar);
-        setActionBar(mAToolbar);
-        //mAToolbar.setTitle(getTitle() + "-" + getString(R.string.subtitle_activity_backgroundpicture));
-        mAToolbar.setSubtitle(R.string.subtitle_activity_about);
-        mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
-        mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
-        //mAToolbar.setBackgroundColor(getColor(R.color.colorPrimary));
         setActionBar(mAToolbar);
+        mAToolbar.setSubtitle(getString(R.string.text_about));
+        //mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
         getActionBar().setDisplayHomeAsUpEnabled(true);
-        mAToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+
-                @Override
+        AboutView aboutView = CreateAboutView();
-                public void onClick(View v) {
+        // 在 Activity 的 onCreate 或其他生命周期方法中调用
-                    finish();
+        LinearLayout llRoot = findViewById(R.id.root_ll);
-                }
+        //layout.setOrientation(LinearLayout.VERTICAL);
-            });
+        // 创建布局参数（宽度和高度）
+        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        );
+        llRoot.addView(aboutView, params);
+
+    }
+
+    public AboutView CreateAboutView() {
+        String szBranchName = "powerbell";
+        APPInfo appInfo = new APPInfo();
+        appInfo.setAppName(getString(R.string.app_name));
+        appInfo.setAppIcon(R.drawable.ic_launcher);
+        appInfo.setAppDescription(getString(R.string.app_description));
+        appInfo.setAppGitName("APP");
+        appInfo.setAppGitOwner("Studio");
+        appInfo.setAppGitAPPBranch(szBranchName);
+        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
+        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=PowerBell");
+        appInfo.setAppAPKName("PowerBell");
+        appInfo.setAppAPKFolderName("PowerBell");
+        return new AboutView(mContext, appInfo);
     }
 }

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundPictureActivity.java

@@ -7,12 +7,14 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.provider.MediaStore;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.Toast;
 import cc.winboll.studio.libaes.views.AToolbar;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
@@ -20,8 +22,6 @@ import cc.winboll.studio.powerbell.dialogs.BackgroundPicturePreviewDialog;
 import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
 import cc.winboll.studio.powerbell.utils.FileUtils;
 import cc.winboll.studio.powerbell.utils.UriUtil;
-import cc.winboll.studio.shared.log.LogUtils;
-import com.hjq.toast.ToastUtils;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -59,18 +59,21 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
     static String _mszCommonFileType = "jpeg";
     // 背景图片的压缩比
     int mnPictureCompress = 100;
+    static String _RecivedPictureFileName;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_backgroundpicture);
+        initEnv();
 
         mBackgroundPictureUtils = BackgroundPictureUtils.getInstance(this);
         mfBackgroundDir = new File(mBackgroundPictureUtils.getBackgroundDir());
         if (!mfBackgroundDir.exists()) {
             mfBackgroundDir.mkdirs();
         }
-        mfPictureDir = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), getString(R.string.app_projectname));
+        //mfPictureDir = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), getString(R.string.app_projectname));
+        mfPictureDir = new File(App.getTempDirPath());
         if (!mfPictureDir.exists()) {
             mfPictureDir.mkdirs();
         }
@@ -84,8 +87,8 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
         setActionBar(mAToolbar);
         //mAToolbar.setTitle(getTitle() + "-" + getString(R.string.subtitle_activity_backgroundpicture));
         mAToolbar.setSubtitle(R.string.subtitle_activity_backgroundpicture);
-        mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+        //mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
-        mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
+        //mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
         //mAToolbar.setBackgroundColor(getColor(R.color.colorPrimary));
         setActionBar(mAToolbar);
         getActionBar().setDisplayHomeAsUpEnabled(true);
@@ -130,6 +133,11 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
         }
     }
 
+    void initEnv() {
+        LogUtils.d(TAG, "initEnv()");
+        _RecivedPictureFileName = "Recived.data";
+    }
+
     public static String getBackgroundFileName() {
         return _mszRecivedCropPicture;
     }
@@ -330,10 +338,9 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
     }
 
     public static File getRecivedPictureFile(Context context) {
-        String szRecivedPictureFileName = "Recived.data";
         BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(context);
         utils.loadBackgroundPictureBean();
-        return new File(utils.getBackgroundDir(), szRecivedPictureFileName);
+        return new File(utils.getBackgroundDir(), _RecivedPictureFileName);
     }
 
     @Override

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BatteryReporterActivity.java

@@ -0,0 +1,51 @@
+package cc.winboll.studio.powerbell.activities;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/22 14:20:15
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.adapters.BatteryAdapter;
+import cc.winboll.studio.powerbell.beans.BatteryData;
+import java.util.Arrays;
+import java.util.List;
+
+public class BatteryReporterActivity extends Activity {
+    public static final String TAG = "BatteryReporterActivity";
+
+    private RecyclerView rvBatteryReport;
+    private BatteryAdapter adapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_battery_reporter);
+
+        rvBatteryReport = findViewById(R.id.rvBatteryReport);
+        setupRecyclerView();
+        loadSampleData();
+    }
+
+    private void setupRecyclerView() {
+        adapter = new BatteryAdapter();
+        rvBatteryReport.setLayoutManager(new LinearLayoutManager(this));
+        rvBatteryReport.setAdapter(adapter);
+        rvBatteryReport.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
+    }
+
+    private void loadSampleData() {
+        List<BatteryData> dataList = Arrays.asList(
+            new BatteryData(95, "01:23:45", "00:05:12"),
+            new BatteryData(80, "02:15:30", "00:10:00"),
+            new BatteryData(65, "03:45:15", "00:15:30"),
+            new BatteryData(50, "05:00:00", "00:20:45")
+        );
+        adapter.updateData(dataList);
+    }
+}
+

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java

@@ -7,14 +7,14 @@ import android.view.View;
 import android.widget.TextView;
 import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 import cc.winboll.studio.libaes.views.AToolbar;
-import cc.winboll.studio.powerbell.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.beans.BatteryInfoBean;
 import cc.winboll.studio.powerbell.receivers.ControlCenterServiceReceiver;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.StringUtils;
-import cc.winboll.studio.shared.log.LogUtils;
-import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
 
 public class ClearRecordActivity extends Activity {
@@ -23,21 +23,21 @@ public class ClearRecordActivity extends Activity {
 
     AToolbar mAToolbar;
     TextView mtvRecordText;
-    GlobalApplication mApplication;
+    App mApplication;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_clearrecord);
-        mApplication = (GlobalApplication) getApplication();
+        mApplication = (App) getApplication();
 
         // 初始化工具栏
         mAToolbar = (AToolbar) findViewById(R.id.toolbar);
         setActionBar(mAToolbar);
         //mAToolbar.setTitle(getTitle() + " - " + getString(R.string.subtitle_activity_clearrecord));
         mAToolbar.setSubtitle(R.string.subtitle_activity_clearrecord);
-        mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+        //mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
-        mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
+        //mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
         //mAToolbar.setBackgroundColor(getColor(R.color.colorPrimary));
         setActionBar(mAToolbar);
         getActionBar().setDisplayHomeAsUpEnabled(true);

powerbell/src/main/java/cc/winboll/studio/powerbell/adapters/BatteryAdapter.java

@@ -0,0 +1,61 @@
+package cc.winboll.studio.powerbell.adapters;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/22 14:38:55
+ * @Describe 电池报告数据适配器
+ */
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.adapters.BatteryAdapter;
+import cc.winboll.studio.powerbell.beans.BatteryData;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BatteryAdapter extends RecyclerView.Adapter<BatteryAdapter.ViewHolder> {
+    public static final String TAG = "BatteryAdapter";
+    private List<BatteryData> dataList = new ArrayList<>();
+
+    public void updateData(List<BatteryData> newData) {
+        dataList = newData;
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+            .inflate(R.layout.item_battery_report, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(ViewHolder holder, int position) {
+        BatteryData item = dataList.get(position);
+        holder.tvLevel.setText(String.format("%d%%", item.getCurrentLevel()));
+        holder.tvDischargeTime.setText("使用时间: " + item.getDischargeTime());
+        holder.tvChargeTime.setText("充电时间: " + item.getChargeTime());
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList.size();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        TextView tvLevel;
+        TextView tvDischargeTime;
+        TextView tvChargeTime;
+
+        ViewHolder(View itemView) {
+            super(itemView);
+            tvLevel = itemView.findViewById(R.id.tvLevel);
+            tvDischargeTime = itemView.findViewById(R.id.tvDischargeTime);
+            tvChargeTime = itemView.findViewById(R.id.tvChargeTime);
+        }
+    }
+}
+

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/AppConfigBean.java

@@ -7,7 +7,7 @@ package cc.winboll.studio.powerbell.beans;
  */
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.shared.app.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 import java.io.Serializable;
 

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BackgroundPictureBean.java

@@ -7,7 +7,7 @@ package cc.winboll.studio.powerbell.beans;
  */
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.shared.app.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
 public class BackgroundPictureBean extends BaseBean {

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BatteryData.java

@@ -0,0 +1,26 @@
+package cc.winboll.studio.powerbell.beans;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/22 14:30:51
+ * @Describe 电池报告数据模型
+ */
+public class BatteryData {
+
+    public static final String TAG = "BatteryData";
+
+    private int currentLevel;
+    private String dischargeTime;
+    private String chargeTime;
+
+    public BatteryData(int currentLevel, String dischargeTime, String chargeTime) {
+        this.currentLevel = currentLevel;
+        this.dischargeTime = dischargeTime;
+        this.chargeTime = chargeTime;
+    }
+
+    public int getCurrentLevel() { return currentLevel; }
+    public String getDischargeTime() { return dischargeTime; }
+    public String getChargeTime() { return chargeTime; }
+}
+

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BatteryInfoBean.java

@@ -2,7 +2,7 @@ package cc.winboll.studio.powerbell.beans;
 
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.shared.app.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 import java.io.Serializable;