<mymessagemanager>APK 15.0.0 release Publish.

1.启用了只接受通讯录，通讯录里有记录
2.如果不是数字通讯地址，但是在通讯录内
3.通讯地址是数字，并且在短信接收规则内。
以上3种情况就接收，其他一律放到回收站。

.gitmodules

@@ -1,3 +1,6 @@
+[submodule "winboll-x"]
+	path = winboll-x
+	url = https://gitea.winboll.cc/Studio/WinBollX.git
 [submodule "libjc/jcc/libs"]
 	path = libjc/jcc/libs
 	url = https://gitea.winboll.cc/Studio/APP_libjc_jcc_libs.git

.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 >";
-	# 检查是否已经添加了 WinBoLL Tag
+	echo "< WinBoll Tag To: $tag >";
+	# 检查是否已经添加了 WinBoll Tag
 	if [ "$(git tag -l ${tag})" == "${tag}" ]; then
-        echo -e "< WinBoLL Tag ${tag} exist! >"
-        return 1 # WinBoLL标签重复
+        echo -e "< WinBoll Tag ${tag} exist! >"
+        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 标签
-    result=$(addWinBoLLTag $1)
+    # 添加 WinBoll 标签
+    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."
-        exit 1 # addWinBoLLTag 异常
+    	echo -e "${0}: addWinBollTag $1\n${result}\nAdd WinBoll tag cancel."
+        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 >";
-    # 检查是否已经添加了 WinBoLL Tag
+    echo "< WinBoll Tag To: $tag >";
+    # 检查是否已经添加了 WinBoll Tag
     if [ "$(git tag -l ${tag})" == "${tag}" ]; then
-        echo -e "< WinBoLL Tag ${tag} exist! >"
-        return 1 # WinBoLL标签重复
+        echo -e "< WinBoll Tag ${tag} exist! >"
+        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 标签
-    result=$(addWinBoLLTag $1)
+    # 添加 WinBoll 标签
+    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."
-        exit 1 # addWinBoLLTag 异常
+        echo -e "${0}: addWinBollTag $1\n${result}\nAdd WinBoll tag cancel."
+        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 发布接口文件夹
-            File fWinBoLLStudioDir = file("/sdcard/WinBoLLStudio/APKs");
-            if(!fWinBoLLStudioDir.exists()) {
-                //fWinBoLLStudioDir.mkdirs();
+            // 创建 WinBoll Studio 发布接口文件夹
+            File fWinBollStudioDir = file("/sdcard/WinBollStudio/APKs");
+            if(!fWinBollStudioDir.exists()) {
+                //fWinBollStudioDir.mkdirs();
                 // 如果没有发布接口文件就不用进行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.'
+                // 当前编译环境不是 WinBoll 主机, 以下将忽略APK发布和源码管理操作。
+                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, "/" + project.rootDir.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}")
                                 // 创建目标路径目录
                                 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, "/" + project.rootDir.name + "/tag/")
+                                //File outTagDir = new File(fWinBollStudioDir, "/${rootProject.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@188.com' // 开发者邮箱地址
+def DeveloperEMail='ZhanGSKen@QQ.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 Studio Android 应用开源项目。☁ ☁   ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁  ☁ ☁ ☁ 
-# ☁ ☁ ☁ WinBoLL 网站地址 https://www.winboll.cc/ ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
+# ☁ ☁ ☁ WinBoll APP ☁ ☁ ☁ ☁ ☁ ☁   ☁ ☁   ☁  ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁ ☁ 
+# ☁    ☁ 这是 WinBoll 系列 APP 汇总项目。☁ ☁   ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁  ☁ ☁ ☁ 
+# ☁ ☁ ☁ WinBoll 网站地址 https://www.winboll.cc/studio/app/ ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
 
-## WinBoLL 提问
+## WinBoll 提问
 同样是 /sdcard 目录，在开发 Android 应用时，
 能否实现手机编译与电脑编译的源码同步。
-☁因而 WinBoLL 项目组诞生了。
+☁因而 WinBoll 项目组诞生了。
 
-## WinBoLL 项目组研发计划
-致力于把 WinBoLL-APP 应用在手机端 Android 项目开发。
-也在探索 https://gitea.winboll.cc/<WinBoLL 项目组>/APP.git 应用于 WinBoLL-APP APK 分发。
-更想进阶 https://github.com/<WinBoLL 项目组>/APP.git 应用于 WinBoLL-APP Beta APK 分发。
+## WinBoll 项目组研发计划
+致力于把 WinBoll-APP 应用在手机端 Android 项目开发。
+也在探索 https://gitea.winboll.cc/<WinBoll 项目组>/WinBoll-APP.git 应用于 WinBoll-APP APK 分发。
+更想进阶 https://github.com/<WinBoll 项目组>/WinBoll-APP.git 应用于 WinBoll-APP Beta APK 分发。
 
-## WinBoLL-APP 汗下...
+## WinBoll-APP 汗下...
 #### ☁应用何置如此呢。且观用户云云。
 
 #### ☁ 正当下 ☁ ###
-#### ☁ 且容傻家叙说 ☁ WinBoLL-APP 应用场景
-### ☁ WinBoLL 设备资源概述
+#### ☁ 且容傻家叙说 ☁ WinBoll-APP 应用场景
+### ☁ WinBoll 设备资源概述
 #### ☁ 1. Raid Disk.
 概述：这是一个矩阵存储类设备。
 优点：该设备具有数据容错存储功能，
@@ -40,79 +40,74 @@
      设备位于操作系统内部文件系统。
      数据持久性与操作系统挂钩。
      
-#### ☁ 4. WinBoLL 用户资源概述。
-1> /home/<用户名> 位于 WinBoLL 操作系统目录下。
+#### ☁ 4. 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 主机建立 1Panel MySQL 应用。
-☁ WinBoLL 主机建立 1Panel Gitea 应用。
-☁ WinBoLL 主机设置 WinBoLL 应用为非登录状态。
-☁ WinBoLL 主机建立 WinBoLL 账户与 WinBoLL 用户组。
-☁ WinBoLL 账户 User ID 为： J。
-☁ WinBoLL 用户组 Group ID 为： Studio。
-☁ WinBoLL 主机 WinBoLL 1Panel Gitea 建立 WinBoLL 工作组。
-☁ WinBoLL 主机 WinBoLL 1Panel Gitea 用户项目 APK 编译输出目录为 /sdcard/WinBoLLStudio/<用户名>/APKs/
-☁ WinBoLL 项目配置文件示例为 "<WinBoLL 项目根目录>/.winboll/winboll.properties-demo"(WinBoLL 项目已设置)
-☁ WinBoLL 项目配置文件为 "<WinBoLL 项目根目录>/.winboll/winboll.properties"
-☁ WinBoLL 项目配置文件设定为源码提交时忽略。(WinBoLL 项目已设置)
-☁ Gradle 项目配置文件示例为 "<WinBoLL 项目根目录>/.winboll/local.properties-demo"(WinBoLL 项目已设置)
-☁ Gradle 项目配置文件为 "<WinBoLL 项目根目录>/local.properties"(WinBoLL 项目已设置)
-☁ Gradle 项目配置文件设定为源码提交时忽略。(WinBoLL 项目已设置)
+### ☁ 急急停 ☁ WinBoll 应用前置条件
+☁ WinBoll 主机建立 1Panel MySQL 应用。
+☁ WinBoll 主机建立 1Panel Gitea 应用。
+☁ WinBoll 主机设置 WinBoll 应用为非登录状态。
+☁ WinBoll 主机建立 WinBoll 账户与 WinBoll 用户组。
+☁ WinBoll 账户 User ID 为： winboll。
+☁ WinBoll 用户组 Group ID 为： winboll。
+☁ WinBoll 主机 WinBoll 1Panel Gitea 建立 WinBoll 工作组。
+☁ WinBoll 主机 WinBoll 1Panel Gitea 用户项目 APK 编译输出目录为 /sdcard/<用户名>/WinBoll/app/
+☁ WinBoll 项目配置文件示例为 "<WinBoll 项目根目录>/.winboll/winboll.properties-demo"(WinBoll 项目已设置)
+☁ WinBoll 项目配置文件为 "<WinBoll 项目根目录>/.winboll/winboll.properties"
+☁ WinBoll 项目配置文件设定为源码提交时忽略。(WinBoll 项目已设置)
+☁ Gradle 项目配置文件示例为 "<WinBoll 项目根目录>/.winboll/local.properties-demo"(WinBoll 项目已设置)
+☁ Gradle 项目配置文件为 "<WinBoll 项目根目录>/local.properties"(WinBoll 项目已设置)
+☁ Gradle 项目配置文件设定为源码提交时忽略。(WinBoll 项目已设置)
 
-### ☁ 登高处 ☁ WinBoLL 应用需求规划
-☁ WinBoLL 主机建立 WinBoLL 客户端用户数据库为 MySQL winbollclient 数据库。
-☁ WinBoLL 主机设置 WinBoLL 客户端用户信息存储在 winbollclient 数据库中。
+### ☁ 登高处 ☁ WinBoll 应用需求规划
+☁ WinBoll 主机建立 WinBoll 客户端用户数据库为 MySQL 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 应用的 WinBoLL 项目源码仓库存取功能。（Gitea 应用已提供）
-☁ WinBoLL 主机提供 WinBoLL Gitea 项目仓库存档功能。（Gitea 应用已提供）
-☁ 提供 WinBoLL 客户端用户登录功能。（Gitea 应用已提供）
+☁ WinBoll 项目源码仓库托管在 WinBoll 1Panel Gitea 目录 /opt/1panel/apps/gitea/gitea/data/git/repositories/winboll/winboll.git中。
+☁ WinBoll 主机提供 WinBoll 1Panel Gitea 应用的 WinBoll 项目源码仓库存取功能。（Gitea 应用已提供）
+☁ WinBoll 主机提供 WinBoll Gitea 项目仓库存档功能。（Gitea 应用已提供）
+☁ 提供 WinBoll 客户端用户登录功能。（Gitea 应用已提供）
 
 ### ☁ 看远方 ☁ ###
-### ☁ 心忧虑 ☁ WinBoLL-APP 应用前置需求
-☁ WinBoLL-APP WinBoLL 项目根目录设定为手机的 /sdcard/WinBoLLStudio/Sources 目录。（需要用户手动建立文件夹）
-☁ WinBoLL-APP 具有手机 /sdcard/WinBoLL 目录的存储权限。（需要手机操作系统授权）
-☁ WinBoLL-APP WinBoLL 项目仓库源码存储路径为 /sdcard/WinBoLLStudio/Sources/APP.git（需要用户手动建立文件夹）
-☁ WinBoLL-APP 项目 APK 编译输出目录为 /sdcard/WinBoLLStudio/APKs/
-☁ WinBoLL-APP 应用签名验证可定制化。（WinBoLL 项目已提供）
-☁ WinBoLL-APP 与系列衍生 APP 应用共享 cc.winboll.studio 命名空间资源。（WinBoLL 项目已提供）
-☁ WinBoLL-APP 用户客户端信息存储在命名空间为 WinBoLL APP MySQLLite 应用的 winbollappclient 数据库中。
-☁ WinBoLL-APP MySQLLite 应用的 winbollappclient 数据库中， 
-   WinBoLL 用户客户端信息设定为：
+### ☁ 心忧虑 ☁ WinBoll-APP 应用前置需求
+☁ WinBoll-APP WinBoll 项目根目录设定为手机的 /sdcard/WinBoll 目录。（需要用户手动建立文件夹）
+☁ WinBoll-APP 具有手机 /sdcard/WinBoll 目录的存储权限。（需要手机操作系统授权）
+☁ WinBoll-APP WinBoll 项目仓库源码存储路径为 /sdcard/WinBoll/repositories/winboll.git（需要用户手动建立文件夹）
+☁ WinBoll-APP 项目 APK 编译输出目录为 /sdcard/WinBoll/app/
+☁ WinBoll-APP 应用签名验证可定制化。（WinBoll 项目已提供）
+☁ WinBoll-APP 与系列衍生 APP 应用共享 cc.winboll.studio 命名空间资源。（WinBoll 项目已提供）
+☁ WinBoll-APP 用户客户端信息存储在命名空间为 WinBoll APP MySQLLite 应用的 winbollappclient 数据库中。
+☁ WinBoll-APP MySQLLite 应用的 winbollappclient 数据库中， 
+   WinBoll 用户客户端信息设定为：
    <用户名, 唯一存储令牌Token>。
 
 ### ☁ 云游四方 ☁ ###
-### ☁ 呔！ ☁ WinBoLL-APP 应用需求规划
-☁ 如要使用 WinBoLL Android 项目的 Gradle 编译功能，则需要设置以下两个文件夹。
-☁ 1. 则需要建立数据存储目录 /sdcard/WinBoLLStudio/APKs。
-   WinBoLL 项目源码编译出来的安装包会拷贝一份到 /sdcard/WinBoLLStudio/APKs 目录下。 
-☁ 2. 则需要建立数据存储目录 /sdcard/AppProjects。
-   WinBoLL 项目源码编译出来的安装包会拷贝一份并命名 "app.apk" 的安装文件为到 /sdcard/AppProjects 目录下。 
+### ☁ 呔！ ☁ WinBoll-APP 应用需求规划
+☁ WinBoll-APP 提供手机目录 /sdcard/WinBoll 的 WinBoll 项目源码管理功能。 
 
+### ☁ 吁！ ☁ WinBoll-APP 共享计划前景
+☁ WinBoll-APP 将会实现 https://winboll.cc/api 访问功能。
+☁ WinBoll-APP 将会实现手机端 Android 应用的开发与管理功能。
 
-### ☁ 吁！ ☁ WinBoLL-APP 共享计划前景
-☁ WinBoLL-APP 将会实现 https://winboll.cc/api 访问功能。
-☁ WinBoLL-APP 将会实现手机端 Android 应用的开发与管理功能。
-
-## ☁ WinBoLL ☁ WinBoLL 主机忧虑
-☁ WinBoLL 将会提供 gitea.winboll.cc 域名用户注册登录功能。
-☁ WinBoLL 将会提供 WinBoLL-APP 及其衍生应用的 Gitea 仓库管理服务。
-☁ 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 库登录用户信息。
 
 
 # ☆类库型项目编译方法
@@ -121,12 +116,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

@@ -19,7 +19,7 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    buildToolsVersion "33.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.aes"
@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.6" 
+        versionName "7.6" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,9 +41,29 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
 }
 
 dependencies {
 	api project(':libaes')
+    
+    //api 'cc.winboll.studio:winboll-shared:1.6.5'
+    api 'io.github.medyo:android-about-page:2.0.0'
+    api 'com.github.getActivity:ToastUtils:10.5'
+    api 'com.jcraft:jsch:0.1.55'
+    api 'org.jsoup:jsoup:1.13.1'
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    
+    api 'androidx.appcompat:appcompat:1.0.0'
+    api 'androidx.fragment:fragment:1.0.0'
+    api 'com.google.android.material:material:1.0.0'
+    
+    api 'cc.winboll.studio:libapputils:9.2.1'
+    api 'cc.winboll.studio:libappbase:1.0.3'
+    
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun May 04 06:42:28 GMT 2025
-stageCount=1
+#Sun Jan 19 04:58:59 GMT 2025
+stageCount=3
 libraryProject=libaes
-baseVersion=15.6
-publishVersion=15.6.0
-buildCount=10
-baseBetaVersion=15.6.1
+baseVersion=7.6
+publishVersion=7.6.2
+buildCount=4
+baseBetaVersion=7.6.3

aes/src/main/AndroidManifest.xml

@@ -8,10 +8,9 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/MyAESTheme"
+        android:theme="@style/WinBoll.SupportThemeNoActionBar"
         android:requestLegacyExternalStorage="true"
-        android:supportsRtl="true"
-        android:networkSecurityConfig="@xml/network_security_config">
+        android:supportsRtl="true">
 
         <activity
             android:name=".MainActivity"
@@ -31,8 +30,6 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
-        <activity android:name=".AboutActivity"/>
-
     </application>
 
 </manifest>

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

@@ -1,93 +0,0 @@
-package cc.winboll.studio.aes;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/24 23:52:29
- * @Describe AES应用介绍窗口
- */
-import android.app.Activity;
-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;
-
-public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity {
-
-    public static final String TAG = "AboutActivity";
-
-    Context mContext;
-    Toolbar mToolbar;
-    
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mContext = this;
-        setContentView(R.layout.activity_about);
-        
-        mToolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(mToolbar);
-        mToolbar.setSubtitle(TAG);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        
-        AboutView aboutView = CreateAboutView();
-        // 在 Activity 的 onCreate 或其他生命周期方法中调用
-//        LinearLayout layout = new LinearLayout(this);
-//        layout.setOrientation(LinearLayout.VERTICAL);
-//        // 创建布局参数（宽度和高度）
-//        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
-//            ViewGroup.LayoutParams.MATCH_PARENT,
-//            ViewGroup.LayoutParams.MATCH_PARENT
-//        );
-//        addContentView(aboutView, params);
-        
-        LinearLayout layout = findViewById(R.id.aboutviewroot_ll);
-        // 创建布局参数（宽度和高度）
-        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.MATCH_PARENT
-        );
-        layout.addView(aboutView, params);
-
-        GlobalApplication.getWinBoLLActivityManager().add(this);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
-    }
-
-    public AboutView CreateAboutView() {
-        String szBranchName = "aes";
-        APPInfo appInfo = new APPInfo();
-        appInfo.setAppName("AES");
-        appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
-        appInfo.setAppDescription("AES Description");
-        appInfo.setAppGitName("APP");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(szBranchName);
-        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=AES");
-        appInfo.setAppAPKName("AES");
-        appInfo.setAppAPKFolderName("AES");
-        //appInfo.setIsAddDebugTools(false);
-        appInfo.setIsAddDebugTools(BuildConfig.DEBUG);
-        return new AboutView(mContext, appInfo);
-    }
-}

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

@@ -5,27 +5,16 @@ package cc.winboll.studio.aes;
  * @Date 2024/06/13 19:03:58
  * @Describe 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 {
-
+    
     public static final String TAG = "App";
 
     @Override
     public void onCreate() {
         super.onCreate();
-
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
-        // 设置 Toast 布局样式
-        //ToastUtils.setView(R.layout.view_toast);
-        ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
-
+        //setIsDebug(BuildConfig.DEBUG);
     }
-
+    
 }

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

@@ -5,193 +5,12 @@ package cc.winboll.studio.aes;
  * @Date 2024/06/13 19:05:52
  * @Describe 应用主窗口
  */
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.Toast;
-import cc.winboll.studio.aes.R;
-import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libaes.beans.DrawerMenuBean;
-import cc.winboll.studio.libaes.dialogs.LocalFileSelectDialog;
-import cc.winboll.studio.libaes.dialogs.StoragePathDialog;
-import cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity;
-import cc.winboll.studio.libaes.unittests.TestAButtonFragment;
-import cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity;
-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 com.a4455jkjh.colorpicker.ColorPickerDialog;
-import com.hjq.toast.ToastUtils;
-import java.util.ArrayList;
+import cc.winboll.studio.libaes.unittests.LibraryActivity;
 
-public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
-
-
-    public static final String TAG = "MainActivity";
-
-    TestAButtonFragment mTestAButtonFragment;
-    TestViewPageFragment mTestViewPageFragment;
+public class MainActivity extends LibraryActivity {
+    
+    public static final String TAG = "MainActivity";
     
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (mTestAButtonFragment == null) {
-            mTestAButtonFragment = new TestAButtonFragment();
-            addFragment(mTestAButtonFragment);
-        }
-        showFragment(mTestAButtonFragment);
-        //setSubtitle(TAG);
-        //ToastUtils.show("onCreate");
-    }
-
-    @Override
-    public void initDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
-        super.initDrawerMenuItemList(listDrawerMenu);
-        LogUtils.d(TAG, "initDrawerMenuItemList");
-        //listDrawerMenu.clear();
-        // 添加抽屉菜单项
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
-        notifyDrawerMenuDataChanged();
-    }
-
-    @Override
-    public void reinitDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
-        super.reinitDrawerMenuItemList(listDrawerMenu);
-        LogUtils.d(TAG, "reinitDrawerMenuItemList");
-        //listDrawerMenu.clear();
-        // 添加抽屉菜单项
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
-        notifyDrawerMenuDataChanged();
-    }
-
-    @Override
-    public DrawerFragmentActivity.ActivityType initActivityType() {
-        return DrawerFragmentActivity.ActivityType.Main;
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.toolbar_library, menu);
-        if(App.isDebuging()) {
-            getMenuInflater().inflate(cc.winboll.studio.libapputils.R.menu.toolbar_studio_debug, menu);
-        }
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        super.onItemClick(parent, view, position, id);
-        switch (position) {
-            case 0 : {
-                    if (mTestAButtonFragment == null) {
-                        mTestAButtonFragment = new TestAButtonFragment();
-                        addFragment(mTestAButtonFragment);
-                    }
-                    showFragment(mTestAButtonFragment);
-                    break;
-                }
-            case 1 : {
-                    if (mTestViewPageFragment == null) {
-                        mTestViewPageFragment = new TestViewPageFragment();
-                        addFragment(mTestViewPageFragment);
-                    }
-                    showFragment(mTestViewPageFragment);
-                    break;
-                }
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int nItemId = item.getItemId();
-//        if (item.getItemId() == R.id.item_log) {
-//            WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(getApplicationContext(), LogActivity.class);
-//        } else 
-        if (nItemId == R.id.item_atoast) {
-            Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();
-        } else if (nItemId == R.id.item_atoolbar) {
-            Intent intent = new Intent(this, TestAToolbarActivity.class);
-            startActivity(intent);
-
-        } else if (nItemId == R.id.item_asupporttoolbar) {
-            Intent intent = new Intent(this, TestASupportToolbarActivity.class);
-            startActivity(intent);
-
-        } else if (nItemId == R.id.item_colordialog) {
-            ColorPickerDialog dlg = new ColorPickerDialog(this, getResources().getColor(R.color.colorPrimary));
-            dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() {
-
-                    @Override
-                    public void beforeColorChanged() {
-                    }
-
-                    @Override
-                    public void onColorChanged(int color) {
-
-                    }
-
-                    @Override
-                    public void afterColorChanged() {
-                    }
-
-
-                });
-            dlg.show();
-
-        } else if (nItemId ==  R.id.item_dialogstoragepath) {
-            final StoragePathDialog dialog = new StoragePathDialog(this, 0);
-            dialog.setOnOKClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        dialog.dismiss();
-                    }
-                });
-            dialog.show();
-
-        } else if (nItemId ==  R.id.item_localfileselectdialog) {
-            final LocalFileSelectDialog dialog = new LocalFileSelectDialog(this);
-            dialog.setOnOKClickListener(new LocalFileSelectDialog.OKClickListener() {
-                    @Override
-                    public void onOKClick(String sz) {
-                        Toast.makeText(getApplication(), sz, Toast.LENGTH_SHORT).show();
-                        //dialog.dismiss();
-                    }
-                });
-            dialog.open();
-
-        } else if (nItemId ==  R.id.item_secondarylibraryactivity) {
-            Intent intent = new Intent(this, SecondaryLibraryActivity.class);
-            startActivity(intent);
-        } else if (nItemId ==  R.id.item_drawerfragmentactivity) {
-            Intent intent = new Intent(this, TestDrawerFragmentActivity.class);
-            startActivity(intent);
-        } 
-        else if (nItemId ==  R.id.item_about) {
-            Intent intent = new Intent(this, AboutActivity.class);
-            startActivity(intent);
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
     
     
 }

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#FF00B322</color>
-    <color name="colorPrimaryDark">#FF005C12</color>
-    <color name="colorAccent">#FF8DFFA2</color>
-    <color name="colorText">#FFFFFB8D</color>
-</resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="MyAESTheme" parent="AESTheme">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
     </style>
 </resources>

aes/src/main/res/xml/network_security_config.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">winboll.cc</domain>
-    </domain-config>
-</network-security-config>

androiddemo/build.gradle

@@ -23,7 +23,7 @@ android {
 
     defaultConfig {
         applicationId "cc.winboll.studio.androiddemo"
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
@@ -46,12 +46,11 @@ android {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
+    // 吐司类库
+    api 'com.github.getActivity:ToastUtils:10.5'
+
     // 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"
-    }
+    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
     // 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
@@ -67,6 +66,6 @@ dependencies {
     // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
     api 'com.android.support:recyclerview-v7:28.0.0'
     
-    api 'cc.winboll.studio:libapputils:15.2.2'
-    api 'cc.winboll.studio:libappbase:15.2.2'
+    api 'cc.winboll.studio:libappbase:15.0.9'
+    api 'cc.winboll.studio:libapputils:15.0.11'
 }

androiddemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 03:17:18 GMT 2025
+#Wed Mar 26 07:23:51 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=21
+buildCount=11
 baseBetaVersion=15.0.1

androidxdemo/build.gradle

@@ -23,7 +23,7 @@ android {
 
     defaultConfig {
         applicationId "cc.winboll.studio.androidxdemo"
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
@@ -60,14 +60,13 @@ dependencies {
     // 网络连接类库
     api 'com.squareup.okhttp3:okhttp:4.4.1'
     // AndroidX 类库
-    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.appcompat:appcompat:1.0.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:libaes:15.2.6'
-    api 'cc.winboll.studio:libapputils:15.2.2'
-    api 'cc.winboll.studio:libappbase:15.2.2'
+    api 'cc.winboll.studio:libappbase:15.0.9'
+    api 'cc.winboll.studio:libapputils:15.0.11'
 }

androidxdemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 03:15:55 GMT 2025
+#Mon Mar 24 06:19:57 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=18
+buildCount=8
 baseBetaVersion=15.0.1

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

@@ -14,7 +14,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.ViewGroup;
@@ -22,9 +21,7 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
-import cc.winboll.studio.androidxdemo.R;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import com.hjq.toast.ToastUtils;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -49,14 +46,6 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-        
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
-        // 设置 Toast 布局样式
-        ToastUtils.setView(R.layout.view_toast);
-        //ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
-        
         //CrashHandler.getInstance().registerGlobal(this);
         //CrashHandler.getInstance().registerPart(this);
     }

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

@@ -4,7 +4,6 @@ import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libappbase.LogView;
-import com.hjq.toast.ToastUtils;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -19,8 +18,6 @@ public class MainActivity extends AppCompatActivity {
 		setSupportActionBar(toolbar);
 
         mLogView = findViewById(R.id.logview);
-        
-        ToastUtils.show("onCreate");
     }
 
     @Override

app/build.gradle

@@ -18,19 +18,18 @@ def genVersionName(def versionName){
 }
 
 android {
-    
     compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    buildToolsVersion "33.0.3"
 
     defaultConfig {
-        applicationId "cc.winboll.studio.appbase"
-        minSdkVersion 24
-        targetSdkVersion 29
+        applicationId "cc.winboll.studio.app"
+        minSdkVersion 21
+        targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
-        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
+        // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.2"
+        versionName "1.8" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -42,9 +41,14 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
-    api project(':libappbase')
+	api project(':winboll-shared')
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

app/build.properties

@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Sun Jan 05 07:55:24 HKT 2025
+stageCount=17
+libraryProject=winboll-shared
+baseVersion=1.8
+publishVersion=1.8.16
+buildCount=0
+baseBetaVersion=1.8.17

app/src/beta/AndroidManifest.xml

@@ -3,12 +3,10 @@
     xmlns:tools="http://schemas.android.com/tools" >
 
     <application
-        tools:replace="android:icon,android:roundIcon"
-        android:icon="@drawable/ic_launcher_stage"
-        android:roundIcon="@drawable/ic_launcher_stage">
+        tools:replace="android:icon"
+        android:icon="@drawable/ic_winbollbeta">
 
         <!-- Put flavor specific code here -->
-
     </application>
 
 </manifest>

app/src/beta/res/values/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">WinBoll-APP+</string>
+
+</resources>

app/src/main/AndroidManifest.xml

@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cc.winboll.studio.app">
+
+    <!-- BIND_AUTOFILL_SERVICE -->
+    <uses-permission android:name="android.permission.BIND_AUTOFILL_SERVICE"/>
+
+    <application
+        android:name=".App"
+        android:allowBackup="true"
+        android:icon="@drawable/ic_winboll"
+        android:label="@string/app_name"
+        android:theme="@style/WinBoll.SupportThemeNoActionBar"
+        android:supportsRtl="true">
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTask"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/studio_provider"/>
+
+        </provider>
+
+
+    </application>
+
+</manifest>

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

@@ -0,0 +1,24 @@
+package cc.winboll.studio.app;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2024/12/08 15:10:51
+ * @Describe 全局应用类
+ */
+import cc.winboll.studio.shared.app.WinBollApplication;
+import cc.winboll.studio.shared.log.LogUtils;
+
+public class App extends WinBollApplication {
+
+    public static final String TAG = "App";
+
+    @Override
+    public void onCreate() {
+        // 必须在调用基类前设置应用调试标志，
+        // 这样可以预先设置日志与数据的存储根目录。
+        //setIsDebug(BuildConfig.DEBUG);
+        super.onCreate();
+        LogUtils.d(TAG, "onCreate");
+    }
+
+}

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

@@ -0,0 +1,168 @@
+package cc.winboll.studio.app;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.shared.app.WinBollActivity;
+import cc.winboll.studio.shared.app.WinBollActivityManager;
+import cc.winboll.studio.shared.app.WinBollApplication;
+import cc.winboll.studio.shared.log.LogUtils;
+import cc.winboll.studio.shared.util.UriUtils;
+import cc.winboll.studio.shared.view.StringToQrCodeView;
+import cc.winboll.studio.shared.view.YesNoAlertDialog;
+import cc.winboll.studio.unittest.UnitTestActivity;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.UUID;
+
+final public class MainActivity extends WinBollActivity {
+
+	public static final String TAG = "MainActivity";
+
+    public static final int REQUEST_HOME_ACTIVITY = 0;
+    public static final int REQUEST_ABOUT_ACTIVITY = 1;
+
+    @Override
+    protected boolean isEnableDisplayHomeAsUp() {
+        return false;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        // 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回
+        if (prosessIntents(getIntent())) return;
+        // 以下正常创建主窗口
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        // 设置 WinBoll 应用 UI 类型
+        WinBollApplication.setWinBollUI_TYPE(WinBollApplication.WinBollUI_TYPE.Aplication);
+        //ToastUtils.show("WinBollUI_TYPE " + WinBollApplication.getWinBollUI_TYPE());
+        LogUtils.d(TAG, "BuildConfig.DEBUG : " + Boolean.toString(BuildConfig.DEBUG));
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        setSubTitle("");
+    }
+
+    //
+    // 处理传入的 Intent 数据
+    //
+    boolean prosessIntents(Intent intent) {
+        if (intent == null 
+            || intent.getAction() == null
+            || intent.getAction().equals(""))
+            return false;
+
+        if (intent.getAction().equals(StringToQrCodeView.ACTION_UNITTEST_QRCODE)) {
+            try {
+                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);
+                subIntent.setAction(intent.getAction());
+                File file = new File(getCacheDir(), UUID.randomUUID().toString());
+                //取出文件uri
+                Uri uri = intent.getData();
+                if (uri == null) {
+                    uri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
+                }
+                //获取文件真实地址
+                String szSrcPath = UriUtils.getFileFromUri(getApplication(), uri);
+                if (TextUtils.isEmpty(szSrcPath)) {
+                    return false;
+                }
+
+                Files.copy(Paths.get(szSrcPath), Paths.get(file.getPath()));
+                //startWinBollActivity(subIntent, tag);
+                WinBollActivityManager.getInstance(this).startWinBollActivity(this, subIntent, UnitTestActivity.class);
+            } catch (IllegalAccessException | InstantiationException | IOException e) {
+                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                // 函数处理异常返回失败
+                return false;
+            }
+        } else {
+            LogUtils.d(TAG, "prosessIntents|" + intent.getAction() + "|yet");
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+
+    @Override
+    protected boolean isAddWinBollToolBar() {
+        return true;
+    }
+
+    @Override
+    public void onBackPressed() {
+        exit();
+    }
+
+    void exit() {
+        YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
+
+            @Override
+            public void onYes() {
+                WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
+            }
+
+            @Override
+            public void onNo() {
+            }
+        };
+        YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
+    }
+
+    @Override
+    protected Toolbar initToolBar() {
+        return findViewById(R.id.activitymainToolbar1);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_winboll_app_main, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.item_unittest) {
+            WinBollActivityManager.getInstance(this).startWinBollActivity(this, UnitTestActivity.class);
+        } else if (item.getItemId() == R.id.item_exit) {
+            exit();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (resultCode) {
+            case REQUEST_HOME_ACTIVITY : {
+                    LogUtils.d(TAG, "REQUEST_HOME_ACTIVITY");
+                    break;
+                }
+            case REQUEST_ABOUT_ACTIVITY : {
+                    LogUtils.d(TAG, "REQUEST_ABOUT_ACTIVITY");
+                    break;
+                }
+            default : {
+                    super.onActivityResult(requestCode, resultCode, data);
+                }
+        }
+    }
+}

app/src/main/res/drawable/ic_launcher.xml

@@ -3,9 +3,9 @@
     android:clickable="true">
     <item android:drawable="@drawable/ic_launcher_background"/> 
     <item 
-        android:left="0dp" 
-        android:top="0dp" 
-        android:right="0dp" 
-        android:bottom="0dp"
-        android:drawable="@drawable/winboll_logo"/>
+        android:left="15dp" 
+        android:top="15dp" 
+        android:right="15dp" 
+        android:bottom="15dp"
+        android:drawable="@drawable/ic_launcher_foreground"/>
 </layer-list>

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<androidx.appcompat.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/activitymainToolbar1"/>
+
+	<LinearLayout
+		xmlns:app="http://schemas.android.com/apk/res-auto"
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:gravity="center"
+		android:layout_weight="1.0">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Hello, WinBoll!"/>
+
+	</LinearLayout>
+
+</LinearLayout>
+

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_gradient"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="10dp">
+    
+    <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="#FF000000"
+            android:textSize="16sp"/>
+
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/menu/toolbar_winboll_app_main.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
-    
-    
+
 </menu>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- WinBoll 默认方案 -->
+    <color name="colorPrimary">#FF196ABC</color>
+    <color name="colorPrimaryDark">#FF002B57</color>
+    <color name="colorAccent">#FF80BFFF</color>
+    <color name="colorToastFrame">#FFA9A9A9</color>
+    <color name="colorToastShadow">#FF000000</color>
+    <color name="colorToastBackgroung">#FFFFFFFF</color>
+</resources>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">TimeStamp +</string>
+    <string name="app_name">WinBoll-APP</string>
 
 </resources>

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

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>

app/src/main/res/xml/studio_provider.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-path
+        name="external_storage_root"
+        path="." />
+    <files-path
+        name="files_path"
+        path="." />
+    <cache-path
+        name="cache_path"
+        path="." />
+    <!--/storage/emulated/0/Android/data/...-->
+    <external-files-path
+        name="external_file_path"
+        path="." />
+    <!--代表app 外部存储区域根目录下的文件 Context.getExternalCacheDir目录下的目录-->
+    <external-cache-path
+        name="external_cache_path"
+        path="." />
+    <!--配置root-path。这样子可以读取到sd卡和一些应用分身的目录，否则微信分身保存的图片，就会导致 java.lang.IllegalArgumentException: Failed to find configured root that contains /storage/emulated/999/tencent/MicroMsg/WeiXin/export1544062754693.jpg，在小米6的手机上微信分身有这个crash，华为没有
+    -->
+    <root-path
+        name="root_path"
+        path="" />
+</paths>

appbase/build.gradle

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

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat May 03 10:32:21 GMT 2025
-stageCount=7
+#Wed Mar 26 15:43:21 HKT 2025
+stageCount=1
 libraryProject=libappbase
-baseVersion=15.7
-publishVersion=15.7.6
-buildCount=4
-baseBetaVersion=15.7.7
+baseVersion=15.1
+publishVersion=15.1.0
+buildCount=0
+baseBetaVersion=15.1.1

appbase/src/main/AndroidManifest.xml

@@ -5,18 +5,18 @@
 
     <application
         android:name=".App"
-        android:icon="@drawable/ic_miapp"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/MyAPPBaseTheme"
-        android:resizeableActivity="true"
-        android:process=":App">
+        android:resizeableActivity="true">
 
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:exported="true"
             android:resizeableActivity="true"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
+            android:launchMode="singleInstance"
+            android:taskAffinity="cc.winboll.studio.appbase.task.main"
+            android:exported="true">
 
             <intent-filter>
 
@@ -32,18 +32,7 @@
 
         </activity>
 
-        <activity
-            android:name=".activities.NewActivity"
-            android:label="NewActivity"
-            android:exported="true"
-            android:resizeableActivity="true"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
-
-        <activity android:name=".activities.New2Activity"
-            android:label="New2Activity"
-            android:exported="true"
-            android:resizeableActivity="true"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
+        <activity android:name=".GlobalApplication$CrashActivity"/>
 
         <service
             android:name=".MyTileService"
@@ -122,6 +111,9 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
+        <activity android:name=".activities.NewActivity"/>
+
+        <activity android:name=".activities.New2Activity"/>
 
     </application>
 

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

@@ -1,29 +1,32 @@
 package cc.winboll.studio.appbase;
 
 import android.app.Activity;
+import android.app.ActivityOptions;
 import android.content.ComponentName;
 import android.content.Intent;
+import android.graphics.Rect;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 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;
 import cc.winboll.studio.appbase.services.TestDemoBindService;
 import cc.winboll.studio.appbase.services.TestDemoService;
-import cc.winboll.studio.libappbase.CrashHandler;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.GlobalCrashActivity;
 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.winboll.LogActivity;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import android.support.v7.widget.Toolbar;
 
-public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
+public class MainActivity extends AppCompatActivity implements IWinBollActivity {
 
     public static final String TAG = "MainActivity";
 
@@ -47,7 +50,7 @@ public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivit
         setContentView(R.layout.activity_main);
 
         mToolbar = findViewById(R.id.toolbar);
-        setActionBar(mToolbar);
+        setSupportActionBar(mToolbar);
 
         CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
         cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
@@ -62,12 +65,15 @@ public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivit
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.toolbar_main, menu);
-        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+            onLogActivity();
+            return true;
+        }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
         return super.onOptionsItemSelected(item);
     }
@@ -85,13 +91,6 @@ public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivit
 	public void onSwitchDebugMode(View view) {
         boolean isDebuging = ((CheckBox)view).isChecked();
         GlobalApplication.setIsDebuging(isDebuging);
-        GlobalApplication.saveDebugStatus();
-    }
-   
-    public void onPreviewGlobalCrashActivity(View view) {
-        Intent intent = new Intent(this, GlobalCrashActivity.class);
-        intent.putExtra(CrashHandler.EXTRA_CRASH_INFO, "Demo log...");
-        startActivity(intent);
     }
 
     public void onStartCenter(View view) {
@@ -137,8 +136,6 @@ public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivit
         startService(intent);
 
     }
-    
-    
 
     public void onStopTestDemoService(View view) {
         Intent intent = new Intent(this, TestDemoService.class);
@@ -176,8 +173,26 @@ public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivit
     }
 
     public void onTestOpenNewActivity(View view) {
-        GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, NewActivity.class);
+        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
     }
 
-    
+    public void onLogActivity() {
+        
+        
+        Intent intent = new Intent(MainActivity.this, LogActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
+        // Define the bounds.
+        Rect bounds = new Rect(500, 300, 100, 0);
+
+// Set the bounds as an activity option.
+
+        ActivityOptions options = ActivityOptions.makeBasic();
+
+        options.setLaunchBounds(bounds);
+
+        //Intent intent = new Intent(this, LpgActivity.class);
+
+        startActivity(intent, options.toBundle());
+        //WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, LogActivity.class);
+    }
 }

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

@@ -1,81 +0,0 @@
-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,20 +7,16 @@ package cc.winboll.studio.appbase.activities;
  */
 import android.app.Activity;
 import android.os.Bundle;
-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.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
 
-public class New2Activity extends WinBoLLActivityBase implements IWinBoLLActivity {
+public class New2Activity extends Activity implements IWinBollActivity {
 
     public static final String TAG = "New2Activity";
 
-    Toolbar mToolbar;
     //LogView mLogView;
 
     @Override
@@ -40,9 +36,6 @@ public class New2Activity extends WinBoLLActivityBase implements IWinBoLLActivit
 
 //        mLogView = findViewById(R.id.logview);
 //        mLogView.start();
-        mToolbar = findViewById(R.id.toolbar);
-        setActionBar(mToolbar);
-        
     }
 
     @Override
@@ -52,32 +45,14 @@ public class New2Activity extends WinBoLLActivityBase implements IWinBoLLActivit
     }
 
     public void onCloseThisActivity(View view) {
-        GlobalApplication.getWinBoLLActivityManager().finish(this);
+        WinBollActivityManager.getInstance(this).finish(this);
     }
 
     public void onCloseAllActivity(View view) {
-        GlobalApplication.getWinBoLLActivityManager().finishAll();
+        WinBollActivityManager.getInstance(this).finishAll();
     }
 
     public void onNewActivity(View view) {
-        GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, NewActivity.class);
-    }
-    
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.toolbar_main, menu);
-        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
-            return true;
-        }
-        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
-        return super.onOptionsItemSelected(item);
+        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
     }
 }

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

@@ -6,20 +6,16 @@ package cc.winboll.studio.appbase.activities;
  */
 import android.app.Activity;
 import android.os.Bundle;
-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.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
 
-public class NewActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
+public class NewActivity extends Activity implements IWinBollActivity {
 
     public static final String TAG = "NewActivity";
 
-    Toolbar mToolbar;
     //LogView mLogView;
 
     @Override
@@ -38,9 +34,6 @@ public class NewActivity extends WinBoLLActivityBase implements IWinBoLLActivity
         setContentView(R.layout.activity_new);
 //        mLogView = findViewById(R.id.logview);
 //        mLogView.start();
-        mToolbar = findViewById(R.id.toolbar);
-        setActionBar(mToolbar);
-        
     }
 
     @Override
@@ -50,32 +43,14 @@ public class NewActivity extends WinBoLLActivityBase implements IWinBoLLActivity
     }
 
     public void onCloseThisActivity(View view) {
-        GlobalApplication.getWinBoLLActivityManager().finish(this);
+        WinBollActivityManager.getInstance(this).finish(this);
     }
 
     public void onCloseAllActivity(View view) {
-        GlobalApplication.getWinBoLLActivityManager().finishAll();
+        WinBollActivityManager.getInstance(this).finishAll();
     }
 
     public void onNew2Activity(View view) {
-        GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, New2Activity.class);
-    }
-    
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.toolbar_main, menu);
-        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
-            return true;
-        }
-        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
-        return super.onOptionsItemSelected(item);
+        WinBollActivityManager.getInstance(this).startWinBollActivity(this, New2Activity.class);
     }
 }

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) {
-        initWinBoLLNewsBeanList(context);
-        _WinBoLLNewsBeanList.add(0, bean);
+    public synchronized static void addWinBollNewsBean(Context context, WinBollNewsBean bean) {
+        initWinBollNewsBeanList(context);
+        _WinBollNewsBeanList.add(0, bean);
         // 控制记录总数
-        while (_WinBoLLNewsBeanList.size() > _MAX_PAGES * _OnePageLinesCount) {
-            _WinBoLLNewsBeanList.remove(_WinBoLLNewsBeanList.size() - 1);
+        while (_WinBollNewsBeanList.size() > _MAX_PAGES * _OnePageLinesCount) {
+            _WinBollNewsBeanList.remove(_WinBollNewsBeanList.size() - 1);
         }
-        WinBoLLNewsBean.saveBeanList(context, _WinBoLLNewsBeanList, WinBoLLNewsBean.class);
+        WinBollNewsBean.saveBeanList(context, _WinBollNewsBeanList, WinBollNewsBean.class);
     }
 
-    synchronized static void initWinBoLLNewsBeanList(Context context) {
-        if (_WinBoLLNewsBeanList == null) {
-            _WinBoLLNewsBeanList = new ArrayList<WinBoLLNewsBean>();
-            WinBoLLNewsBean.loadBeanList(context, _WinBoLLNewsBeanList, WinBoLLNewsBean.class);
+    synchronized static void initWinBollNewsBeanList(Context context) {
+        if (_WinBollNewsBeanList == null) {
+            _WinBollNewsBeanList = new ArrayList<WinBollNewsBean>();
+            WinBollNewsBean.loadBeanList(context, _WinBollNewsBeanList, WinBollNewsBean.class);
         }
-        if (_WinBoLLNewsBeanList == null) {
-            _WinBoLLNewsBeanList = new ArrayList<WinBoLLNewsBean>();
-            WinBoLLNewsBean.saveBeanList(context, _WinBoLLNewsBeanList, WinBoLLNewsBean.class);
+        if (_WinBollNewsBeanList == null) {
+            _WinBollNewsBeanList = new ArrayList<WinBollNewsBean>();
+            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;
-            for (int i = start, j = 0; i < _WinBoLLNewsBeanList.size() && j < _OnePageLinesCount && start > -1; i++, j++) {
-                msgTemp.add(_WinBoLLNewsBeanList.get(i).getMessage());
+            start = _WinBollNewsBeanList.size() > start ? start : _WinBollNewsBeanList.size() - 1;
+            for (int i = start, j = 0; i < _WinBollNewsBeanList.size() && j < _OnePageLinesCount && start > -1; i++, j++) {
+                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 ((_CurrentPageIndex + 1) * _OnePageLinesCount < _WinBoLLNewsBeanList.size()) {
+        if (_WinBollNewsBeanList != null) {
+            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 currentPageCount = _WinBoLLNewsBeanList.size() / _OnePageLinesCount + (leftCount == 0 ?0: 1);
+        int leftCount = _WinBollNewsBeanList.size() % _OnePageLinesCount;
+        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.widget.Toolbar
+	<android.support.v7.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>
@@ -32,48 +32,35 @@
 				<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"
 					android:layout_height="wrap_content"
 					android:text="Android版本10的代号是“Q”，API级别是29。   Android 10开始谷歌不再公开使用甜品作为版本代号，但内部仍保留了大量与“Q”相关的元素。Android 10本身并没有严格对应某个特定的Java版本，但在开发Android 10应用时，通常可以使用Java 8或更高版本。   Java 8为Android开发带来了诸如Lambda表达式、方法引用等新特性，能提高开发效率和代码可读性，与Android 10开发适配良好。Java 9及更高版本也可用于Android 10开发，能使用一些新的语言特性和API，但可能需要注意兼容性和配置问题。"/>
 
-				<HorizontalScrollView
+				<LinearLayout
+					android:orientation="horizontal"
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content">
+					android:layout_height="wrap_content"
+					android:gravity="right|center_vertical">
 
-					<LinearLayout
-						android:orientation="horizontal"
+					<CheckBox
+						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:gravity="right|center_vertical"
-						android:layout_width="wrap_content">
+						android:text="Debug Mode"
+						android:layout_weight="1.0"
+						android:onClick="onSwitchDebugMode"
+						android:id="@+id/activitymainCheckBox1"/>
 
-						<CheckBox
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:text="Debug Mode"
-							android:layout_weight="1.0"
-							android:onClick="onSwitchDebugMode"
-							android:id="@+id/activitymainCheckBox1"/>
+					<Button
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:text="Test Application CrashReport"
+						android:textAllCaps="false"
+						android:onClick="onTestApplicationCrashReport"/>
 
-						<Button
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:text="Test Application CrashReport"
-							android:textAllCaps="false"
-							android:onClick="onTestApplicationCrashReport"/>
-
-						<Button
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:text="PreviewGlobalCrashActivity"
-							android:textAllCaps="false"
-							android:onClick="onPreviewGlobalCrashActivity"/>
-
-					</LinearLayout>
-
-				</HorizontalScrollView>
+				</LinearLayout>
 
 				<ScrollView
 					android:layout_width="match_parent"
@@ -85,27 +72,26 @@
 						android:layout_height="wrap_content"
 						android:gravity="right">
 
-						<LinearLayout
-							android:orientation="horizontal"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content">
+                        <LinearLayout
+                            android:orientation="horizontal"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
 
-							<Button
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:text="StartCenter"
-								android:textAllCaps="false"
-								android:onClick="onStartCenter"/>
-
-							<Button
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:text="StopCenter"
-								android:textAllCaps="false"
-								android:onClick="onStopCenter"/>
-
-						</LinearLayout>
+                            <Button
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="StartCenter"
+                                android:textAllCaps="false"
+                                android:onClick="onStartCenter"/>
 
+                            <Button
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="StopCenter"
+                                android:textAllCaps="false"
+                                android:onClick="onStopCenter"/>
+                        </LinearLayout>
+                        
 						<HorizontalScrollView
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content">
@@ -174,6 +160,7 @@
 
 						</HorizontalScrollView>
 
+
 						<Button
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
@@ -194,14 +181,14 @@
 							android:text="TestDemoServiceSOS"
 							android:textAllCaps="false"
 							android:onClick="onTestDemoServiceSOS"/>
-
-						<Button
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:text="TestOpenNewActivity"
-							android:textAllCaps="false"
-							android:onClick="onTestOpenNewActivity"/>
-
+                        
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="TestOpenNewActivity"
+                            android:textAllCaps="false"
+                            android:onClick="onTestOpenNewActivity"/>
+                        
 					</LinearLayout>
 
 				</ScrollView>
@@ -211,6 +198,6 @@
 		</LinearLayout>
 
 	</ScrollView>
-
+    
 </LinearLayout>
 

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

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

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

@@ -6,9 +6,9 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-    <android.widget.Toolbar
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+	<android.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>
 
 	<TextView
@@ -30,6 +30,13 @@
 		android:textAllCaps="false"
 		android:onClick="onCloseAllActivity"/>
 
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="CloseAllActivity"
+		android:textAllCaps="false"
+		android:onClick="onCloseAllActivity"/>
+
 	<Button
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"

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/menu/toolbar_main.xml

@@ -2,5 +2,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
     
+    <item
+        android:id="@+id/item_log"
+        android:title="Log"/>
     
 </menu>

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

@@ -19,17 +19,17 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    buildToolsVersion "33.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.apputils"
-        minSdkVersion 26
+        minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.3" 
+        versionName "9.2" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,9 +41,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
 	api project(':libapputils')
+    api 'cc.winboll.studio:libappbase:1.0.3'
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 15:04:17 HKT 2025
-stageCount=5
+#Sat Jan 18 13:03:10 HKT 2025
+stageCount=2
 libraryProject=libapputils
-baseVersion=15.3
-publishVersion=15.3.4
+baseVersion=9.2
+publishVersion=9.2.1
 buildCount=0
-baseBetaVersion=15.3.5
+baseBetaVersion=9.2.2

apputils/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_winboll"
         android:label="@string/app_name"
-        android:theme="@style/MyUtilsTheme"
+        android:theme="@style/WinBoll.SupportThemeNoActionBar"
         android:supportsRtl="true">
 
         <activity
@@ -27,13 +27,9 @@
 
         </activity>
 
-        <activity android:name=".TestStringToQRCodeViewActivity"/>
+        <activity android:name=".TestWinBollActivity"/>
 
-        <activity android:name=".TestBBMorseCodeActivity"/>
-
-        <activity android:name=".AssetsHtmlActivity"/>
-
-        <activity android:name=".QRCodeDecodeActivity"/>
+        <activity android:name=".TestStringToQrCodeViewActivity"/>
 
     </application>
 

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

@@ -5,16 +5,27 @@ package cc.winboll.studio.apputils;
  * @Date 2024/12/08 15:10:51
  * @Describe 全局应用类
  */
-import android.app.Application;
-import android.content.Context;
-import cc.winboll.studio.libappbase.GlobalApplication;
+import android.view.Gravity;
+import cc.winboll.studio.libapputils.app.WinBollApplication;
+import com.hjq.toast.ToastUtils;
+import com.hjq.toast.style.WhiteToastStyle;
 
-public class App extends GlobalApplication {
+public class App extends WinBollApplication {
 
     public static final String TAG = "App";
 
+    public static final String _ACTION_DEBUGVIEW = WinBollApplication.class.getName() + "_ACTION_DEBUGVIEW";
+
     @Override
     public void onCreate() {
         super.onCreate();
+        // 初始化 Toast 框架
+        //
+        ToastUtils.init(this);
+        // 设置 Toast 布局样式
+        //ToastUtils.setView(R.layout.view_toast);
+        ToastUtils.setStyle(new WhiteToastStyle());
+        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
     }
+
 }

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

@@ -1,159 +1,87 @@
 package cc.winboll.studio.apputils;
 
-import android.app.Activity;
-import android.content.ComponentName;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
-import android.widget.Toolbar;
-import cc.winboll.studio.apputils.R;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
-import java.util.List;
-import java.util.Set;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
+import cc.winboll.studio.libapputils.activities.QRCodeDecodeActivity;
+import cc.winboll.studio.libapputils.app.WinBollActivity;
+import cc.winboll.studio.libapputils.app.WinBollActivityManager;
+import cc.winboll.studio.libapputils.log.LogActivity;
+import cc.winboll.studio.libapputils.log.LogUtils;
+import com.hjq.toast.ToastUtils;
 
-final public class MainActivity extends Activity {
+final public class MainActivity extends WinBollActivity {
 
 	public static final String TAG = "MainActivity";
 
     public static final int REQUEST_QRCODEDECODE_ACTIVITY = 0;
 
-    Toolbar mToolbar;
-    LogView mLogView;
-//
-//    @Override
-//    public Activity getActivity() {
-//        return this;
-//    }
+    @Override
+    protected boolean isEnableDisplayHomeAsUp() {
+        return false;
+    }
 
-    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        mLogView = findViewById(R.id.logview);
-        mLogView.start();
-
-        // 初始化工具栏
-        mToolbar = findViewById(R.id.toolbar);
-        setActionBar(mToolbar);
-//        if (isEnableDisplayHomeAsUp()) {
-//            // 显示后退按钮
-//            getActionBar().setDisplayHomeAsUpEnabled(true);
-//        }
-//        getActionBar().setSubtitle(getTag());
-
-        checkResolveActivity();
-        archiveInstance();
-
-
+        //Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
+        //setActionBar(toolbar);
 
         // 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回
         //if (prosessIntents(getIntent())) return;
         // 以下正常创建主窗口
 
-//        // 设置 WinBoLL 应用 UI 类型
-//        WinBoLLApplication.setWinBoLLUI_TYPE(WinBoLLApplication.WinBoLLUI_TYPE.Aplication);
-//        //ToastUtils.show("WinBoLLUI_TYPE " + WinBoLLApplication.getWinBoLLUI_TYPE());
+//        // 设置 WinBoll 应用 UI 类型
+//        WinBollApplication.setWinBollUI_TYPE(WinBollApplication.WinBollUI_TYPE.Aplication);
+//        //ToastUtils.show("WinBollUI_TYPE " + WinBollApplication.getWinBollUI_TYPE());
 //        LogUtils.d(TAG, "BuildConfig.DEBUG : " + Boolean.toString(BuildConfig.DEBUG));
     }
 
-    boolean checkResolveActivity() {
-        PackageManager packageManager = getPackageManager();
-        //Intent intent = new Intent("your_action_here");
-        Intent intent = getIntent();
-        if (intent != null) {
-            List<ResolveInfo> resolveInfoList = packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
-            if (resolveInfoList.size() > 0) {
-                // 传入的Intent action在Activity清单的intent-filter的action节点里有定义
-                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());
-//
-//                    }
-                }
-                return true;
-            } else {
-                // 传入的Intent action在Activity清单的intent-filter的action节点里没有定义
-                //ToastUtils.show("false : " + intent.getAction());
-                return false;
-            }
-
-        }
-
-        // action在清单文件中没有声明
-        ToastUtils.show("false");
-        return false;
-    }
-
-    void archiveInstance() {
-        Intent intent = getIntent();
-        StringBuilder sb = new StringBuilder("\n### Archive Instance ###\n");
-
-        if (intent != null) {
-            ComponentName componentName = intent.getComponent();
-            if (componentName != null) {
-                String packageName = componentName.getPackageName();
-                //Log.d("AppStarter", "启动本应用的应用包名: " + packageName);
-                sb.append("启动本应用的应用包名: \n" + packageName);
-            }
-
-            sb.append("\nImplicit Intent Tracker ：\n接收到的 Intent 动作: \n" + intent.getAction());
-            Set<String> categories = intent.getCategories();
-            if (categories != null) {
-                for (String category : categories) {
-                    sb.append("\n接收到的 Intent 类别 :\n" + category);
-                }
-            }
-            Uri data = intent.getData();
-            if (data != null) {
-                sb.append("\n接收到的 Intent 数据 :\n" + data.toString());
-            }
-        } else {
-            sb.append("Intent is null.");
-        }
-        sb.append("\n\n");
-        LogUtils.d(TAG, sb.toString());
-    }
-
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        // 缓存当前 activity
-        //WinBoLLActivityManager.getInstance(this).add(this);
-    }
-
-    @Override
-    public void onDestroy() {
-        //WinBoLLActivityManager.getInstance(this).registeRemove(this);
-        super.onDestroy();
-    }
-
     public void onTestLogClick(View view) {
         LogUtils.d(TAG, "onTestLogClick");
         Toast.makeText(getApplication(), "onTestLogClick", Toast.LENGTH_SHORT).show();
     }
 
-    public void onTestLogActivity(View view) {
-//        Intent intent = new Intent(this, LogActivity.class);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-//        startActivity(intent);
-
-        //WinBoLLActivityManager.getInstance().printAvtivityListInfo();
-        //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, LogActivity.class);
+    public void onLogUtilsClick(View view) {
+        Intent intent = new Intent(this, LogActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+        startActivity(intent);
     }
 
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+//        setSubTitle("");
+    }
+
+    @Override
+    public void onBackPressed() {
+//        exit();
+    }
+
+//    void exit() {
+//        YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
+//
+//            @Override
+//            public void onYes() {
+//                WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
+//            }
+//
+//            @Override
+//            public void onNo() {
+//            }
+//        };
+//        YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
+//    }
+
     //
     // 处理传入的 Intent 数据
     //
@@ -165,7 +93,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 +111,8 @@ final public class MainActivity extends Activity {
 //                }
 //
 //                Files.copy(Paths.get(szSrcPath), Paths.get(file.getPath()));
-//                //startWinBoLLActivity(subIntent, tag);
-//                WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, subIntent, UnitTestActivity.class);
+//                //startWinBollActivity(subIntent, tag);
+//                WinBollActivityManager.getInstance(this).startWinBollActivity(this, subIntent, UnitTestActivity.class);
 //            } catch (IllegalAccessException | InstantiationException | IOException e) {
 //                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
 //                // 函数处理异常返回失败
@@ -198,106 +126,57 @@ final public class MainActivity extends Activity {
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        //ToastUtils.show("onCreateOptionsMenu");
-        getMenuInflater().inflate(R.menu.toolbar_main, menu);
-//        if (isAddWinBoLLToolBar()) {
-//            //ToastUtils.show("mIWinBoLL.isAddWinBoLLToolBar()");
-//            getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu);
-//        }
-        if (App.isDebuging()) {
-            getMenuInflater().inflate(R.menu.toolbar_studio_debug, menu);
-        }
+    public String getTag() {
+        return TAG;
+    }
 
+    @Override
+    protected boolean isAddWinBollToolBar() {
+        return true;
+    }
+
+    @Override
+    protected Toolbar initToolBar() {
+        return findViewById(R.id.activitymainToolbar1);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.item_exit) {
-            //exit();
-            return true;
+        if (item.getItemId() == R.id.item_testwinboll) {
+            WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestWinBollActivity.class);
         } 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);
-        } else if (item.getItemId() == R.id.item_testcrashreport) {
-            for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
-                getString(i);
-            }
-            return true;
-        } else if (item.getItemId() == R.id.item_log) {
-            //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);
-            return true;
         }
         return super.onOptionsItemSelected(item);
     }
 
-//    void exit() {
-//        YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
-//
-//            @Override
-//            public void onYes() {
-//                //WinBoLLActivityManager.getInstance(getApplicationContext()).finishAll();
-//            }
-//
-//            @Override
-//            public void onNo() {
-//            }
-//        };
-//        YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
-//
-//    }
-
-    @Override
-    public void onBackPressed() {
-//        if (WinBoLLActivityManager.getInstance(getApplicationContext()).isFirstIWinBoLLActivity(this)) {
-//            exit();
-//        } else {
-//            WinBoLLActivityManager.getInstance(this).finish(this);
-//            super.onBackPressed();
-//        }
-    }
-
-    
-    public void onTestAssetsHtmlActivity(View view) {
+    public void onTestJavascriptHtmlActivity(View view) {
         Intent intent = new Intent(this, AssetsHtmlActivity.class);
         intent.putExtra(AssetsHtmlActivity.EXTRA_HTMLFILENAME, "javascript_test.html");
-        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
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case REQUEST_QRCODEDECODE_ACTIVITY : {
+                    String text = data.getStringExtra(QRCodeDecodeActivity.EXTRA_RESULT);
+                    ToastUtils.show(text);
+                    break;
+                }
+            default : {
+                    ToastUtils.show(String.format("%d, %d", requestCode, resultCode));
+                    super.onActivityResult(requestCode, resultCode, data);
+                }
+        }
     }
-
-    /*@Override
-     protected void onActivithyResult(int requestCode, int resultCode, Intent data) {
-     switch (requestCode) {
-     case REQUEST_QRCODEDECODE_ACTIVITY : {
-     if (data != null) {
-     String text = data.getStringExtra(QRCodeDecodeActivity.EXTRA_RESULT);
-     ToastUtils.show(text);
-     }
-     break;
-     }
-     default : {
-     //ToastUtils.show(String.format("%d, %d", requestCode, resultCode));
-     super.prosessActivityResult(requestCode, resultCode, data);
-     }
-     }
-     }*/
 }

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

@@ -1,20 +0,0 @@
-package cc.winboll.studio.apputils;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/23 16:14:45
- */
-import android.app.Activity;
-import android.os.Bundle;
-
-public class TestBBMorseCodeActivity extends Activity {
-
-    public static final String TAG = "TestBBMorseCodeActivity";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_testbbmorsecode);
-
-    }
-}

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

@@ -1,36 +0,0 @@
-package cc.winboll.studio.apputils;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2025/01/17 19:50:46
- */
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.Toolbar;
-import cc.winboll.studio.apputils.R;
-import cc.winboll.studio.libapputils.views.StringToQrCodeView;
-
-public class TestStringToQRCodeViewActivity extends Activity {
-
-    public static final String TAG = "TestStringToQrCodeViewActivity";
-
-    StringToQrCodeView mStringToQrCodeView;
-//
-//    @Override
-//    public Activity getActivity() {
-//        return this;
-//    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_teststringtoqrcodeview);
-        
-        // 初始化工具栏
-        Toolbar mToolbar = findViewById(R.id.toolbar);
-        mToolbar.setSubtitle(TAG);
-        setActionBar(mToolbar);
-        
-        mStringToQrCodeView = findViewById(R.id.activityteststringtoqrcodeviewStringToQrCodeView1);
-    }
-}

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

@@ -0,0 +1,50 @@
+package cc.winboll.studio.apputils;
+
+import android.os.Bundle;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libapputils.app.WinBollActivity;
+import cc.winboll.studio.libapputils.view.StringToQrCodeView;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2025/01/17 19:50:46
+ */
+public class TestStringToQrCodeViewActivity extends WinBollActivity {
+    
+    public static final String TAG = "TestStringToQrCodeViewActivity";
+    
+    StringToQrCodeView mStringToQrCodeView;
+    
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected Toolbar initToolBar() {
+        return findViewById(R.id.activityteststringtoqrcodeviewToolbar1);
+    }
+
+    @Override
+    protected boolean isEnableDisplayHomeAsUp() {
+        return true;
+    }
+
+    @Override
+    protected boolean isAddWinBollToolBar() {
+        return true;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_teststringtoqrcodeview);
+        mStringToQrCodeView = findViewById(R.id.activityteststringtoqrcodeviewStringToQrCodeView1);
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        setSubTitle(TAG);
+    }
+}

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

@@ -0,0 +1,52 @@
+package cc.winboll.studio.apputils;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
+import cc.winboll.studio.libapputils.app.WinBollActivity;
+import cc.winboll.studio.libapputils.app.WinBollActivityManager;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2025/01/13 15:09:46
+ */
+public class TestWinBollActivity extends WinBollActivity {
+
+    public static final String TAG = "TestWinBollActivity";
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected Toolbar initToolBar() {
+        return findViewById(R.id.activitytestwinbollToolbar1);
+    }
+
+    @Override
+    protected boolean isEnableDisplayHomeAsUp() {
+        return true;
+    }
+
+    @Override
+    protected boolean isAddWinBollToolBar() {
+        return true;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_testwinboll);
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        setSubTitle(TAG);
+    }
+    
+    
+}

apputils/src/main/res/layout/activity_assetshtml.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.widget.Toolbar
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/toolbar"/>
-
-    <cc.winboll.studio.libapputils.views.SimpleWebView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1.0"
-        android:id="@+id/activityassetshtmlSimpleWebView1"/>
-
-</LinearLayout>
-

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

@@ -5,10 +5,10 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.widget.Toolbar
+	<androidx.appcompat.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/toolbar"/>
+		android:id="@+id/activitymainToolbar1"/>
 
 	<LinearLayout
 		xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -27,39 +27,32 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="TestLog"
-				android:textAllCaps="false"
+                android:textAllCaps="false"
 				android:onClick="onTestLogClick"/>
 
 			<Button
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="TestLogActivity"
+				android:text="LogUtils"
 				android:textAllCaps="false"
-				android:onClick="onTestLogActivity"/>
+				android:onClick="onLogUtilsClick"/>
 
 		</LinearLayout>
 
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="right">
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right">
 
-			<Button
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:textAllCaps="false"
-				android:text="TestAssetsHtmlActivity"
-				android:onClick="onTestAssetsHtmlActivity"/>
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAllCaps="false"
+                android:text="Test Javascript Html Activity"
+                android:onClick="onTestJavascriptHtmlActivity"/>
 
-		</LinearLayout>
-
-		<cc.winboll.studio.libappbase.LogView
-			android:layout_width="match_parent"
-			android:layout_height="0dp"
-			android:text="Button"
-			android:id="@+id/logview"
-			android:layout_weight="1.0"/>
+        </LinearLayout>
 
 	</LinearLayout>
 

apputils/src/main/res/layout/activity_qrcodedecode.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="QRCodeDecodeActivity"/>
-
-    <com.journeyapps.barcodescanner.DecoratedBarcodeView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/activityqrcodedecodeDecoratedBarcodeView1"/>
-
-</LinearLayout>
-

apputils/src/main/res/layout/activity_teststringtoqrcodeview.xml

@@ -6,10 +6,10 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.widget.Toolbar
+	<androidx.appcompat.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/toolbar"/>
+		android:id="@+id/activityteststringtoqrcodeviewToolbar1"/>
 
 	<LinearLayout
 		android:orientation="vertical"
@@ -17,7 +17,7 @@
 		android:layout_height="0dp"
 		android:layout_weight="1.0">
 
-		<cc.winboll.studio.libapputils.views.StringToQrCodeView
+		<cc.winboll.studio.libapputils.view.StringToQrCodeView
 			android:layout_width="300dp"
 			android:layout_height="300dp"
 			android:id="@+id/activityteststringtoqrcodeviewStringToQrCodeView1"/>

apputils/src/main/res/layout/activity_testwinboll.xml

@@ -7,7 +7,7 @@
 	android:layout_height="match_parent"
 	android:background="#FF36B5B3">
 
-	<android.widget.Toolbar
+	<androidx.appcompat.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/activitytestwinbollToolbar1"/>

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_gradient"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="10dp">
+    
+    <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="#FF000000"
+            android:textSize="16sp"/>
+
+    </LinearLayout>
+
+</LinearLayout>

apputils/src/main/res/menu/toolbar_main.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/item_testwinboll"
+        android:title="TestWinBollActivity"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/item_teststringtoqrcodeview"
-        android:title="TestStringToQRCodeViewActivity"/>
+        android:title="TestStringToQrCodeViewActivity"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/item_testqrcodedecodeactivity"
-        android:title="TestQRCodeDecodeActivity"/>
-    <item
-        android:id="@+id/item_testcrashreport"
-        android:title="TestCrashReportActivity"/>
+        android:title="TestQRCodeDecodeActivity"
+        app:showAsAction="ifRoom"/>
 </menu>

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

@@ -1,7 +1,10 @@
 <?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>
+    <color name="colorToastFrame">#FFA9A9A9</color>
+    <color name="colorToastShadow">#FF000000</color>
+    <color name="colorToastBackgroung">#FFFFFFFF</color>
 </resources>

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

@@ -1,14 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="MyUtilsTheme" parent="UtilsTheme">
-        <item name="attrColorPrimary">@color/colorPrimary</item>
-        <item name="themeGlobalCrashActivity">@style/MyUtilsGlobalCrashActivityTheme</item>
-    </style>
-
-    <style name="MyUtilsGlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
-        <item name="colorTittle">#FFF2F2F2</item>
-        <item name="colorTittleBackgound">#FF55ABF8</item>
-        <item name="colorText">#FF55ABF8</item>
-        <item name="colorTextBackgound">#FFF2F2F2</item>
-	</style>
 </resources>

build.gradle

@@ -1,12 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        //本地 maven 库
-        maven { url "file:///sdcard/.aide/maven/" }
         // 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/' } 
@@ -17,7 +15,7 @@ buildscript {
         maven { url "https://jitpack.io" }
         mavenCentral()
         google()
-        //mavenLocal()
+        mavenLocal()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.2.1' // 对应 compileSdkVersion 32
@@ -28,12 +26,10 @@ buildscript {
 
 allprojects {
     repositories {
-        //本地 maven 库
-        maven { url "file:///sdcard/.aide/maven/" }
         // 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/' } 
@@ -55,7 +51,7 @@ allprojects {
         bashCommitAppPublishBuildFlagInfoFilePath = ".winboll/bashCommitAppPublishBuildFlagInfo.sh"
         
         winbollFilePath = "winboll.properties"
-        keyPropsFilePath = "current.keystore"
+        keyPropsFilePath = "winboll-x/current.keystore"
         // 定义 lint 输出文件
         lintXmlReportFilePath = "build/reports/lint-results.xml"
         lintHTMLReportFilePath = "build/reports/lint-results.html"

contacts/build.gradle

@@ -19,17 +19,17 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    buildToolsVersion "33.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.contacts"
-        minSdkVersion 24
-        targetSdkVersion 29
+        minSdkVersion 21
+        targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.2" 
+        versionName "1.0" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,48 +41,31 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-    
-    // 权限请求框架：https://github.com/getActivity/XXPermissions
-    api 'com.github.getActivity:XXPermissions:18.63'
-    // 下拉控件
-    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
-    // 拼音搜索
-    // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
-    api 'com.github.open-android:pinyin4j:2.5.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 'io.github.medyo:android-about-page:2.0.0'
-    // 吐司类库
     api 'com.github.getActivity:ToastUtils:10.5'
-    // 网络连接类库
+    api 'com.jcraft:jsch:0.1.55'
+    api 'org.jsoup:jsoup:1.13.1'
     api 'com.squareup.okhttp3:okhttp:4.4.1'
     
-    // AndroidX 类库
-    /*implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.viewpager:viewpager:1.0.0'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    implementation 'androidx.fragment:fragment:1.1.0'
-    implementation 'com.google.android.material:material:1.4.0'
-    */
     api 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.viewpager:viewpager:1.0.0'
+    api 'androidx.fragment:fragment: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:libaes:15.2.4'
-    api 'cc.winboll.studio:libapputils:15.2.1'
-    api 'cc.winboll.studio:libappbase:15.2.2'
+    api 'cc.winboll.studio:libapputils:9.3.2'
+    api 'cc.winboll.studio:libappbase:1.5.6'
+    
+    api fileTree(dir: 'libs', include: ['*.jar'])
 }

contacts/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Apr 13 02:46:09 HKT 2025
-stageCount=8
+#Tue Feb 25 00:17:29 HKT 2025
+stageCount=2
 libraryProject=
-baseVersion=15.2
-publishVersion=15.2.7
+baseVersion=1.0
+publishVersion=1.0.1
 buildCount=0
-baseBetaVersion=15.2.8
+baseBetaVersion=1.0.2

contacts/src/main/AndroidManifest.xml

@@ -29,13 +29,9 @@
 
     <!-- 更改您的音频设置 -->
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-
-    <!-- 读取通话记录 -->
-    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
-
-    <!-- 录音 -->
-    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-
+        
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+        
     <application
         android:name=".App"
         android:allowBackup="true"
@@ -69,7 +65,7 @@
 
         <activity
             android:name=".phonecallui.PhoneCallActivity"
-            android:launchMode="singleTask"
+            android:launchMode="singleInstance"
             android:exported="true">
 
             <intent-filter>
@@ -186,10 +182,6 @@
 
         </provider>
 
-        <activity android:name="cc.winboll.studio.contacts.activities.UnitTestActivity"/>
-
-        <activity android:name="cc.winboll.studio.contacts.activities.AboutActivity"/>
-
     </application>
 
-</manifest>
+</manifest>

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

@@ -5,10 +5,9 @@ package cc.winboll.studio.contacts;
  * @Date 2024/12/08 15:10:51
  * @Describe 全局应用类
  */
-import android.view.Gravity;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libapputils.app.WinBollActivityManager;
 
 public class App extends GlobalApplication {
 
@@ -18,20 +17,12 @@ public class App extends GlobalApplication {
     public void onCreate() {
         // 必须在调用基类前设置应用调试标志，
         // 这样可以预先设置日志与数据的存储根目录。
-        //setIsDebuging(BuildConfig.DEBUG);
+        setIsDebuging(this, BuildConfig.DEBUG);
         super.onCreate();
         // 设置 WinBoll 应用 UI 类型
         WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Aplication);
         
-        //LogUtils.d(TAG, "onCreate");
-        
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
-        // 设置 Toast 布局样式
-        //ToastUtils.setView(R.layout.toast_custom_view);
-        //ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
-        
+        LogUtils.d(TAG, "onCreate");
     }
 
 }

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

@@ -1,44 +1,52 @@
 package cc.winboll.studio.contacts;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.ActivityManager;
+import android.app.role.RoleManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.telecom.TelecomManager;
-import android.telephony.PhoneStateListener;
-import android.telephony.TelephonyManager;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Switch;
 import android.widget.Toast;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.core.content.ContextCompat;
 import androidx.viewpager.widget.ViewPager;
 import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.activities.SettingsActivity;
+import cc.winboll.studio.contacts.activities.CallActivity;
+import cc.winboll.studio.contacts.adapters.MyPagerAdapter;
 import cc.winboll.studio.contacts.beans.MainServiceBean;
-import cc.winboll.studio.contacts.fragments.CallLogFragment;
-import cc.winboll.studio.contacts.fragments.ContactsFragment;
-import cc.winboll.studio.contacts.fragments.LogFragment;
 import cc.winboll.studio.contacts.services.MainService;
-import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libapputils.app.IWinBollActivity;
+import cc.winboll.studio.libapputils.app.WinBollActivityManager;
+import cc.winboll.studio.libapputils.bean.APPInfo;
+import cc.winboll.studio.libapputils.view.YesNoAlertDialog;
+import cc.winboll.studio.contacts.listenphonecall.CallListenerService;
 import com.google.android.material.tabs.TabLayout;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import android.content.DialogInterface;
+import cc.winboll.studio.contacts.activities.SettingsActivity;
 
 final public class MainActivity extends AppCompatActivity implements IWinBollActivity, ViewPager.OnPageChangeListener, View.OnClickListener {
 
@@ -49,13 +57,11 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 
     public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoll.ACTION_SOS";
 
-    static MainActivity _MainActivity;
     LogView mLogView;
     Toolbar mToolbar;
     CheckBox cbMainService;
     MainServiceBean mMainServiceBean;
-    private TabLayout tabLayout;
-    private ViewPager viewPager;
+    ViewPager viewPager;
     private List<View> views; //用来存放放进ViewPager里面的布局
     //实例化存储imageView（导航原点）的集合
     ImageView[] imageViews;
@@ -64,20 +70,15 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
     LinearLayout linearLayout;//下标所在在LinearLayout布局里
     int currentPoint = 0;//当前被选中中页面的下标
 
-    private TelephonyManager telephonyManager;
-    private MyPhoneStateListener phoneStateListener;
-    List<Fragment> fragmentList;
-    List<String> tabTitleList;
-
     private static final int DIALER_REQUEST_CODE = 1;
 
     @Override
-    public Activity getActivity() {
+    public AppCompatActivity getActivity() {
         return this;
     }
 
-//    @Override
-//    public APPInfo getAppInfo() {
+    @Override
+    public APPInfo getAppInfo() {
 //        String szBranchName = "contacts";
 //
 //        APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo();
@@ -92,8 +93,8 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //        appInfo.setAppAPKName("Contacts");
 //        appInfo.setAppAPKFolderName("Contacts");
 //        return appInfo;
-//        return null;
-//    }
+        return null;
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -101,51 +102,28 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
         //if (prosessIntents(getIntent())) return;
         // 以下正常创建主窗口
         super.onCreate(savedInstanceState);
-        _MainActivity = this;
         setContentView(R.layout.activity_main);
 
         // 初始化工具栏
         mToolbar = findViewById(R.id.activitymainToolbar1);
         setSupportActionBar(mToolbar);
-//        if (isEnableDisplayHomeAsUp()) {
-//            // 显示后退按钮
-//            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-//        }
+        if (isEnableDisplayHomeAsUp()) {
+            // 显示后退按钮
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        }
         getSupportActionBar().setSubtitle(getTag());
 
-        tabLayout = findViewById(R.id.tabLayout);
-        viewPager = findViewById(R.id.viewPager);
+        initData();
+        initView();
+        //initPoint();//调用初始化导航原点的方法
+        viewPager.addOnPageChangeListener(this);//滑动事件
 
-        // 创建Fragment列表和标题列表
-        fragmentList = new ArrayList<>();
-        tabTitleList = new ArrayList<>();
-        fragmentList.add(CallLogFragment.newInstance(0));
-        fragmentList.add(ContactsFragment.newInstance(1));
-        fragmentList.add(LogFragment.newInstance(2));
-        tabTitleList.add("通话记录");
-        tabTitleList.add("联系人");
-        tabTitleList.add("应用日志");
-
-        // 设置ViewPager的适配器
-        MyPagerAdapter adapter = new MyPagerAdapter(getSupportFragmentManager(), fragmentList, tabTitleList);
-        viewPager.setAdapter(adapter);
-
-        // 关联TabLayout和ViewPager
+        ViewPager viewPager = findViewById(R.id.activitymainViewPager1);
+        MyPagerAdapter pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
+        viewPager.setAdapter(pagerAdapter);
+        TabLayout tabLayout = findViewById(R.id.activitymainTabLayout1);
         tabLayout.setupWithViewPager(viewPager);
 
-
-
-//        initData();
-//        initView();
-//        //initPoint();//调用初始化导航原点的方法
-//        viewPager.addOnPageChangeListener(this);//滑动事件
-
-        //ViewPager viewPager = findViewById(R.id.activitymainViewPager1);
-        //MyPagerAdapter pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
-        //viewPager.setAdapter(pagerAdapter);
-        //TabLayout tabLayout = findViewById(R.id.activitymainTabLayout1);
-        //tabLayout.setupWithViewPager(viewPager);
-
 //        mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
 //        if (mMainServiceBean == null) {
 //            mMainServiceBean = new MainServiceBean();
@@ -162,86 +140,36 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //                    }
 //                }
 //            });
-
-        MainServiceBean mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
-        if (mMainServiceBean == null) {
-            mMainServiceBean = new MainServiceBean();
-            MainServiceBean.saveBean(this, mMainServiceBean);
-        }
-        if (mMainServiceBean.isEnable()) {
-            MainService.startMainService(this);
-        }
-
-        // 初始化TelephonyManager和PhoneStateListener
-        telephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
-        phoneStateListener = new MyPhoneStateListener();
-        telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
-    }
-
-
-    // ViewPager的适配器
-    private class MyPagerAdapter extends FragmentPagerAdapter {
-
-        private List<Fragment> fragmentList;
-        private List<String> tabTitleList;
-
-        public MyPagerAdapter(FragmentManager fm, List<Fragment> fragmentList, List<String> tabTitleList) {
-            super(fm);
-            this.fragmentList = fragmentList;
-            this.tabTitleList = tabTitleList;
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            return fragmentList.get(position);
-        }
-
-        @Override
-        public int getCount() {
-            return fragmentList.size();
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            return tabTitleList.get(position);
-        }
-    }
-
-    public static void dialPhoneNumber(String phoneNumber) {
-        Intent intent = new Intent(Intent.ACTION_DIAL);
-        intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
-        if (ActivityCompat.checkSelfPermission(_MainActivity, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
-            return;
-        }
-        _MainActivity.startActivity(intent);
+        MainService.startMainService(MainActivity.this);
     }
 
     //初始化view，即显示的图片
-//    void initView() {
-//        viewPager = findViewById(R.id.activitymainViewPager1);
-//        pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
-//        viewPager.setAdapter(pagerAdapter);
-//        //adapter = new MyPagerAdapter(views);
-//        //viewPager = findViewById(R.id.activitymainViewPager1);
-//        //viewPager.setAdapter(adapter);
-//        //linearLayout = findViewById(R.id.activitymainLinearLayout1);
-//        //initPoint();//初始化页面下方的点
-//        viewPager.setOnPageChangeListener(this);
-//
-//    }
+    void initView() {
+        viewPager = findViewById(R.id.activitymainViewPager1);
+        pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
+        viewPager.setAdapter(pagerAdapter);
+        //adapter = new MyPagerAdapter(views);
+        //viewPager = findViewById(R.id.activitymainViewPager1);
+        //viewPager.setAdapter(adapter);
+        //linearLayout = findViewById(R.id.activitymainLinearLayout1);
+        //initPoint();//初始化页面下方的点
+        viewPager.setOnPageChangeListener(this);
+
+    }
 
     //初始化所要显示的布局
-//    void initData() {
-//        LayoutInflater inflater = LayoutInflater.from(getActivity());
-//        View view1 = inflater.inflate(R.layout.fragment_call_log, viewPager, false);
-//        View view2 = inflater.inflate(R.layout.fragment_contacts, viewPager, false);
-//        View view3 = inflater.inflate(R.layout.fragment_log, viewPager, false);
-//
-//        views = new ArrayList<>();
-//        views.add(view1);
-//        views.add(view2);
-//        views.add(view3);
-//    }
+    void initData() {
+        ViewPager viewPager = findViewById(R.id.activitymainViewPager1);
+        LayoutInflater inflater = LayoutInflater.from(getActivity());
+        View view1 = inflater.inflate(R.layout.fragment_call, viewPager, false);
+        View view2 = inflater.inflate(R.layout.fragment_contacts, viewPager, false);
+        View view3 = inflater.inflate(R.layout.fragment_log, viewPager, false);
+
+        views = new ArrayList<>();
+        views.add(view1);
+        views.add(view2);
+        views.add(view3);
+    }
 
 //    void initPoint() {
 //        imageViews = new ImageView[5];//实例化5个图片
@@ -303,23 +231,6 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
         //setSubTitle("");
     }
 
-    private class MyPhoneStateListener extends PhoneStateListener {
-        @Override
-        public void onCallStateChanged(int state, String incomingNumber) {
-            switch (state) {
-                case TelephonyManager.CALL_STATE_IDLE:
-                    LogUtils.d(TAG, "电话已挂断");
-                    break;
-                case TelephonyManager.CALL_STATE_OFFHOOK:
-                    LogUtils.d(TAG, "正在通话中");
-                    break;
-                case TelephonyManager.CALL_STATE_RINGING:
-                    LogUtils.d(TAG, "来电: " + incomingNumber);
-                    break;
-            }
-        }
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -376,25 +287,40 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
         return TAG;
     }
 
-//    @Override
-//    public void onBackPressed() {
-//        exit();
-//    }
-//
-//    void exit() {
-//        YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
-//
-//            @Override
-//            public void onYes() {
-//                WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
-//            }
-//
-//            @Override
-//            public void onNo() {
-//            }
-//        };
-//        YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
-//    }
+    @Override
+    public Toolbar initToolBar() {
+        return findViewById(R.id.activitymainToolbar1);
+    }
+
+    @Override
+    public boolean isAddWinBollToolBar() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnableDisplayHomeAsUp() {
+        return false;
+    }
+
+    @Override
+    public void onBackPressed() {
+        exit();
+    }
+
+    void exit() {
+        YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
+
+            @Override
+            public void onYes() {
+                WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
+            }
+
+            @Override
+            public void onNo() {
+            }
+        };
+        YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
+    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -405,7 +331,11 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.item_settings) {
+        if (item.getItemId() == R.id.item_call) {
+            Intent intent = new Intent(this, CallActivity.class);
+            startActivity(intent);
+            //WinBollActivityManager.getInstance(this).startWinBollActivity(this, CallActivity.class);
+        } else if (item.getItemId() == R.id.item_settings) {
             Intent intent = new Intent(this, SettingsActivity.class);
             startActivity(intent);
             //WinBollActivityManager.getInstance(this).startWinBollActivity(this, CallActivity.class);

contacts/src/main/java/cc/winboll/studio/contacts/PhoneCallManager.java

@@ -0,0 +1,35 @@
+package cc.winboll.studio.contacts;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/02/20 21:14:52
+ * @Describe PhoneCallManager
+ */
+
+import android.telecom.Call;
+import android.telecom.VideoProfile;
+
+public class PhoneCallManager {
+    
+    public static final String TAG = "PhoneCallManager";
+    
+    public static Call call;
+
+    /**
+     * 接听电话
+     */
+    public void answer() {
+        if (call != null) {
+            call.answer(VideoProfile.STATE_AUDIO_ONLY);
+        }
+    }
+
+    /**
+     * 断开电话，包括来电时的拒接以及接听后的挂断
+     */
+    public void disconnect() {
+        if (call != null) {
+            call.disconnect();
+        }
+    }
+}

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

@@ -1,91 +0,0 @@
-package cc.winboll.studio.contacts.activities;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/31 15:15:54
- * @Describe 应用介绍窗口
- */
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.contacts.R;
-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;
-
-public class AboutActivity extends WinBollActivity implements IWinBollActivity {
-
-    public static final String TAG = "AboutActivity";
-
-    Context mContext;
-    Toolbar mToolbar;
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mContext = this;
-        setContentView(R.layout.activity_about);
-
-        mToolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(mToolbar);
-        mToolbar.setSubtitle(TAG);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        AboutView aboutView = CreateAboutView();
-        // 在 Activity 的 onCreate 或其他生命周期方法中调用
-//        LinearLayout layout = new LinearLayout(this);
-//        layout.setOrientation(LinearLayout.VERTICAL);
-//        // 创建布局参数（宽度和高度）
-//        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
-//            ViewGroup.LayoutParams.MATCH_PARENT,
-//            ViewGroup.LayoutParams.MATCH_PARENT
-//        );
-//        addContentView(aboutView, params);
-
-        LinearLayout layout = findViewById(R.id.aboutviewroot_ll);
-        // 创建布局参数（宽度和高度）
-        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.MATCH_PARENT
-        );
-        layout.addView(aboutView, params);
-
-        GlobalApplication.getWinBollActivityManager().add(this);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        GlobalApplication.getWinBollActivityManager().registeRemove(this);
-    }
-
-    public AboutView CreateAboutView() {
-        String szBranchName = "contacts";
-        APPInfo appInfo = new APPInfo();
-        appInfo.setAppName("Contacts");
-        appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
-        appInfo.setAppDescription("通讯录与拨号");
-        appInfo.setAppGitName("APP");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(szBranchName);
-        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=Contacts");
-        appInfo.setAppAPKName("Contacts");
-        appInfo.setAppAPKFolderName("Contacts");
-        return new AboutView(mContext, appInfo);
-    }
-}

contacts/src/main/java/cc/winboll/studio/contacts/activities/CallActivity.java

@@ -34,7 +34,6 @@ public class CallActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        
         super.onCreate(savedInstanceState);
         //setContentView(R.layout.activity_main);
         setContentView(R.layout.activity_call);

contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java

@@ -4,6 +4,7 @@ package cc.winboll.studio.contacts.activities;
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/02/21 05:37:42
  */
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -14,33 +15,17 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.view.View;
 import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.SeekBar;
 import android.widget.Switch;
-import android.widget.TextView;
 import android.widget.Toast;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.adapters.PhoneConnectRuleAdapter;
-import cc.winboll.studio.contacts.beans.MainServiceBean;
-import cc.winboll.studio.contacts.beans.PhoneConnectRuleModel;
 import cc.winboll.studio.contacts.beans.RingTongBean;
-import cc.winboll.studio.contacts.beans.SettingsModel;
-import cc.winboll.studio.contacts.bobulltoon.TomCat;
-import cc.winboll.studio.contacts.dun.Rules;
-import cc.winboll.studio.contacts.services.MainService;
-import cc.winboll.studio.contacts.views.DuInfoTextView;
-import cc.winboll.studio.libaes.winboll.APPInfo;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.IWinBollActivity;
+import cc.winboll.studio.libappbase.bean.APPInfo;
 import com.hjq.toast.ToastUtils;
 import java.lang.reflect.Field;
-import java.util.List;
-import cc.winboll.studio.contacts.App;
 
 public class SettingsActivity extends AppCompatActivity implements IWinBollActivity {
 
@@ -48,25 +33,11 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
 
     Toolbar mToolbar;
     Switch swSilent;
-    SeekBar msbVolume;
-    TextView mtvVolume;
-    int mnStreamMaxVolume;
-    int mnStreamVolume;
-    Switch mswMainService;
-    static DuInfoTextView _DuInfoTextView;
 
-    // 云盾防御层数量
-    EditText etDunTotalCount;
-    // 防御层恢复时间间隔(秒钟)
-    EditText etDunResumeSecondCount;
-    // 每次恢复防御层数
-    EditText etDunResumeCount;
-    // 是否启用云盾
-    Switch swIsEnableDun;
-
-    private RecyclerView recyclerView;
-    private PhoneConnectRuleAdapter adapter;
-    private List<PhoneConnectRuleModel> ruleList;
+    @Override
+    public APPInfo getAppInfo() {
+        return null;
+    }
 
     @Override
     public AppCompatActivity getActivity() {
@@ -78,6 +49,21 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
         return TAG;
     }
 
+    @Override
+    public Toolbar initToolBar() {
+        return findViewById(R.id.activitymainToolbar1);
+    }
+
+    @Override
+    public boolean isAddWinBollToolBar() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnableDisplayHomeAsUp() {
+        return false;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -86,136 +72,11 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
         // 初始化工具栏
         mToolbar = findViewById(R.id.activitymainToolbar1);
         setSupportActionBar(mToolbar);
-        // 显示后退按钮
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        if (isEnableDisplayHomeAsUp()) {
+            // 显示后退按钮
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        }
         getSupportActionBar().setSubtitle(getTag());
-
-        mswMainService = findViewById(R.id.sw_mainservice);
-        MainServiceBean mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
-        mswMainService.setChecked(mMainServiceBean.isEnable());
-        mswMainService.setOnClickListener(new View.OnClickListener(){
-                @Override
-                public void onClick(View arg0) {
-                    LogUtils.d(TAG, "mswMainService onClick");
-                    // TODO: Implement this method
-                    if (mswMainService.isChecked()) {
-                        //ToastUtils.show("Is Checked");
-                        MainService.startMainServiceAndSaveStatus(SettingsActivity.this);
-                    } else {
-                        //ToastUtils.show("Not Checked");
-                        MainService.stopMainServiceAndSaveStatus(SettingsActivity.this);
-                    }
-                }
-            });
-
-        msbVolume = findViewById(R.id.bellvolume);
-        mtvVolume = findViewById(R.id.tv_volume);
-        final AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-
-        // 设置SeekBar的最大值为系统铃声音量的最大刻度
-        mnStreamMaxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_RING);
-        msbVolume.setMax(mnStreamMaxVolume);
-        // 获取当前铃声音量并设置为SeekBar的初始进度
-        mnStreamVolume = audioManager.getStreamVolume(AudioManager.STREAM_RING);
-        msbVolume.setProgress(mnStreamVolume);
-
-        updateStreamVolumeTextView();
-
-        msbVolume.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-                @Override
-                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                    if (fromUser) {
-                        // 设置铃声音量
-                        audioManager.setStreamVolume(AudioManager.STREAM_RING, progress, 0);
-                        RingTongBean bean = RingTongBean.loadBean(SettingsActivity.this, RingTongBean.class);
-                        if (bean == null) {
-                            bean = new RingTongBean();
-                        }
-                        bean.setStreamVolume(progress);
-                        RingTongBean.saveBean(SettingsActivity.this, bean);
-                        mnStreamVolume = progress;
-                        updateStreamVolumeTextView();
-                        //Toast.makeText(SettingsActivity.this, "音量设置为: " + progress, Toast.LENGTH_SHORT).show();
-                    }
-                }
-
-                @Override
-                public void onStartTrackingTouch(SeekBar seekBar) {
-                    // 当开始拖动SeekBar时的操作
-                }
-
-                @Override
-                public void onStopTrackingTouch(SeekBar seekBar) {
-                    // 当停止拖动SeekBar时的操作
-                }
-            });
-
-
-        recyclerView = findViewById(R.id.recycler_view);
-        recyclerView.setLayoutManager(new LinearLayoutManager(this));
-
-        ruleList = Rules.getInstance(this).getPhoneBlacRuleBeanList();
-
-        adapter = new PhoneConnectRuleAdapter(this, ruleList);
-        recyclerView.setAdapter(adapter);
-
-        // 设置参数云盾
-        _DuInfoTextView = findViewById(R.id.tv_DunInfo);
-        etDunTotalCount = findViewById(R.id.et_DunTotalCount);
-        etDunResumeSecondCount = findViewById(R.id.et_DunResumeSecondCount);
-        etDunResumeCount = findViewById(R.id.et_DunResumeCount);
-        swIsEnableDun = findViewById(R.id.sw_IsEnableDun);
-        SettingsModel settingsModel = Rules.getInstance(this).getSettingsModel();
-
-        etDunTotalCount.setText(Integer.toString(settingsModel.getDunTotalCount()));
-        etDunResumeSecondCount.setText(Integer.toString(settingsModel.getDunResumeSecondCount()));
-        etDunResumeCount.setText(Integer.toString(settingsModel.getDunResumeCount()));
-        swIsEnableDun.setChecked(settingsModel.isEnableDun());
-
-        boolean isEnableDun = settingsModel.isEnableDun();
-        etDunTotalCount.setEnabled(!isEnableDun);
-        etDunResumeSecondCount.setEnabled(!isEnableDun);
-        etDunResumeCount.setEnabled(!isEnableDun);
-
-    }
-
-    public static void notifyDunInfoUpdate() {
-        if (_DuInfoTextView != null) {
-            _DuInfoTextView.notifyInfoUpdate();
-        }
-    }
-
-    public void onSW_IsEnableDun(View view) {
-        LogUtils.d(TAG, "onSW_IsEnableDun");
-        boolean isEnableDun = swIsEnableDun.isChecked();
-        etDunTotalCount.setEnabled(!isEnableDun);
-        etDunResumeSecondCount.setEnabled(!isEnableDun);
-        etDunResumeCount.setEnabled(!isEnableDun);
-
-        SettingsModel settingsModel = Rules.getInstance(this).getSettingsModel();
-        if (isEnableDun) {
-            settingsModel.setDunTotalCount(Integer.parseInt(etDunTotalCount.getText().toString()));
-            settingsModel.setDunResumeSecondCount(Integer.parseInt(etDunResumeSecondCount.getText().toString()));
-            settingsModel.setDunResumeCount(Integer.parseInt(etDunResumeCount.getText().toString()));
-        }
-        settingsModel.setIsEnableDun(isEnableDun);
-        Rules.getInstance(this).saveDun();
-        Rules.getInstance(this).reload();
-    }
-
-    void updateStreamVolumeTextView() {
-        mtvVolume.setText(String.format("%d/%d", mnStreamVolume, mnStreamMaxVolume));
-    }
-
-    public void onUnitTest(View view) {
-        Intent intent = new Intent(this, UnitTestActivity.class);
-        startActivity(intent);
-    }
-
-    public void onAddNewConnectionRule(View view) {
-        Rules.getInstance(this).getPhoneBlacRuleBeanList().add(new PhoneConnectRuleModel());
-        Rules.getInstance(this).saveRules();
-        adapter.notifyDataSetChanged();
     }
 
     public void onDefaultPhone(View view) {
@@ -233,38 +94,6 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
         }
     }
 
-    public void onDownloadBoBullToon(View view) {
-        final TomCat tomCat = TomCat.getInstance(this);
-        new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    if (tomCat.downloadBoBullToon()) {
-                        ToastUtils.show("BoBullToon downlaod OK!");
-                        MainService.restartMainService(SettingsActivity.this);
-                        Rules.getInstance(SettingsActivity.this).reload();
-                    }
-                }
-            }).start();
-    }
-
-
-
-    public void onSearchBoBullToonPhone(View view) {
-        TomCat tomCat = TomCat.getInstance(this);
-        EditText etPhone = findViewById(R.id.activitysettingsEditText1);
-        String phone = etPhone.getText().toString().trim();
-        if (tomCat.loadPhoneBoBullToon()) {
-            if (tomCat.isPhoneBoBullToon(phone)) {
-                ToastUtils.show("It is a BoBullToon Phone!");
-            } else {
-                ToastUtils.show("Not in BoBullToon.");
-            }
-        } else {
-            ToastUtils.show("没有下载 BoBullToon。");
-        }
-
-    }
-
     private void askForDrawOverlay() {
         AlertDialog alertDialog = new AlertDialog.Builder(this)
             .setTitle("允许显示悬浮框")
@@ -311,8 +140,4 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
             }
         }
     }
-    
-    public void onAbout(View view) {
-        App.getWinBollActivityManager().startWinBollActivity(this, AboutActivity.class);
-    }
 }

contacts/src/main/java/cc/winboll/studio/contacts/activities/UnitTestActivity.java

@@ -1,94 +0,0 @@
-package cc.winboll.studio.contacts.activities;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.EditText;
-import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.dun.Rules;
-import cc.winboll.studio.contacts.utils.IntUtils;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/02 16:07:04
- */
-public class UnitTestActivity extends Activity {
-
-    public static final String TAG = "UnitTestActivity";
-
-    LogView logView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_unittest);
-        logView = findViewById(R.id.logview);
-        logView.start();
-    }
-
-    public void onTestPhone(View view) {
-        // 开始测试数据
-        EditText etPhone = findViewById(R.id.phone_et);
-        Rules rules = Rules.getInstance(this);
-        String phone = etPhone.getText().toString().trim();
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-    }
-
-    public void onTestMain(View view) {
-        LogUtils.d(TAG, "IntUtils.unittest_getIntInRange();");
-        IntUtils.unittest_getIntInRange();
-        
-        Rules rules = Rules.getInstance(this);
-
-        // 如果没有规则就添加测试规则
-        if (rules.getPhoneBlacRuleBeanList().size() == 0) {
-            // 手机号码允许
-            // 中国手机号码正则表达式，以1开头，第二位可以是3、4、5、6、7、8、9，后面跟9位数字
-            String regex = "^1[3-9]\\d{9}$";
-            rules.add(regex, true, true);
-
-            // 指定区号号码允许
-            regex = "^0660\\d+$";
-            rules.add(regex, true, true);
-
-            // 指定区号号码允许
-            regex = "^020\\d+$";
-            rules.add(regex, true, true);
-
-            // 添加默认拒接规则
-            regex = ".*";
-            rules.add(regex, false, true);
-
-            // 保存规则到文件
-            rules.saveRules();
-        }
-
-        // 开始测试数据
-        String phone = "16769764848";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "16856582777";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "17519703124";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "0205658955";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "0108965253";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "+8616769764848";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "4005816769764848";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "95566";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-    }
-}

contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java

@@ -1,60 +0,0 @@
-package cc.winboll.studio.contacts.activities;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/31 15:16:45
- * @Describe 应用窗口基类
- */
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.MenuItem;
-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;
-
-public class WinBollActivity extends AppCompatActivity implements IWinBollActivity {
-
-    public static final String TAG = "WinBollActivity";
-
-    protected volatile AESThemeBean.ThemeType mThemeType;
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        mThemeType = getThemeType();
-        setThemeStyle();
-        super.onCreate(savedInstanceState);
-    }
-
-    AESThemeBean.ThemeType getThemeType() {
-        /*SharedPreferences sharedPreferences = getSharedPreferences(
-         SHAREDPREFERENCES_NAME, MODE_PRIVATE);
-         return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))];
-         */
-        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
-    }
-
-    void setThemeStyle() {
-        //setTheme(AESThemeBean.getThemeStyle(getThemeType()));
-        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if(item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-}