<aes>APK 15.6.2 release Publish.

.gitmodules

@@ -1,6 +1,3 @@
-[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@QQ.COM' // 开发者邮箱地址
+def DeveloperEMail='zhangsken@188.com' // 开发者邮箱地址
 def LicenseName='The Apache Software License, Version 2.0'
 def LicenseUrl='http://www.apache.org/licenses/LICENSE-2.0.txt'
 
@@ -27,10 +27,10 @@ afterEvaluate {
                 properties.load(file("${RootProjectDir}/${winbollFilePath}").newDataInputStream())
                 def NexusUserName = properties.getProperty("Nexus.name")
                 def NexusPassword = properties.getProperty("Nexus.password")
-                // WinBoll Release 仓库
+                // WinBoLL Release 仓库
                 maven{
                     //仓库的名字和地址
-                    name = "WinBollRelease"
+                    name = "WinBoLLRelease"
                     url="https://nexus.winboll.cc/repository/maven-releases/"
                     // 仓库用户名密码
                     credentials {
@@ -38,10 +38,10 @@ afterEvaluate {
                         password = NexusPassword
                     }
                 }
-                // WinBoll Snapshot 仓库
+                // WinBoLL Snapshot 仓库
                 maven{
                     //仓库的名字和地址
-                    name = "WinBollSnapshot"
+                    name = "WinBoLLSnapshot"
                     url="https://nexus.winboll.cc/repository/maven-snapshots/"
                     // 仓库用户名密码
                     credentials {
@@ -101,9 +101,9 @@ afterEvaluate {
                 }
             }
             
-            // WinBoll Maven Release 仓库传输任务
+            // WinBoLL Maven Release 仓库传输任务
             //
-            releaseWinBoll(MavenPublication) {
+            releaseWinBoLL(MavenPublication) {
                 // 需要使用的变体，假设有free和pay两个变体，可以选择一个
                 //from components.free
                 
@@ -154,9 +154,9 @@ afterEvaluate {
                 
             } // 创建名为 release 的任务结束
             
-            // WinBoll Maven Snapshot 仓库传输任务
+            // WinBoLL Maven Snapshot 仓库传输任务
             //
-            snapshotWinBoll(MavenPublication) {
+            snapshotWinBoLL(MavenPublication) {
                 // 需要使用的变体，假设有free和pay两个变体，可以选择一个
                 //from components.free
                 

README.md

@@ -1,23 +1,23 @@
-# ☁ ☁ ☁ WinBoll APP ☁ ☁ ☁ ☁ ☁ ☁   ☁ ☁   ☁  ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁ ☁ 
-# ☁    ☁ 这是 WinBoll 系列 APP 汇总项目。☁ ☁   ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁  ☁ ☁ ☁ 
-# ☁ ☁ ☁ WinBoll 网站地址 https://www.winboll.cc/studio/app/ ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
+# ☁ ☁ ☁ WinBoLL APP ☁ ☁ ☁ ☁ ☁ ☁   ☁ ☁   ☁  ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁ ☁ 
+# ☁    ☁ WinBoLL Studio Android 应用开源项目。☁ ☁   ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁  ☁ ☁ ☁ 
+# ☁ ☁ ☁ WinBoLL 网站地址 https://www.winboll.cc/ ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
 
-## WinBoll 提问
+## WinBoLL 提问
 同样是 /sdcard 目录，在开发 Android 应用时，
 能否实现手机编译与电脑编译的源码同步。
-☁因而 WinBoll 项目组诞生了。
+☁因而 WinBoLL 项目组诞生了。
 
-## 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 项目组研发计划
+致力于把 WinBoLL-APP 应用在手机端 Android 项目开发。
+也在探索 https://gitea.winboll.cc/<WinBoLL 项目组>/APP.git 应用于 WinBoLL-APP APK 分发。
+更想进阶 https://github.com/<WinBoLL 项目组>/APP.git 应用于 WinBoLL-APP Beta APK 分发。
 
-## WinBoll-APP 汗下...
+## WinBoLL-APP 汗下...
 #### ☁应用何置如此呢。且观用户云云。
 
 #### ☁ 正当下 ☁ ###
-#### ☁ 且容傻家叙说 ☁ WinBoll-APP 应用场景
-### ☁ WinBoll 设备资源概述
+#### ☁ 且容傻家叙说 ☁ WinBoLL-APP 应用场景
+### ☁ WinBoLL 设备资源概述
 #### ☁ 1. Raid Disk.
 概述：这是一个矩阵存储类设备。
 优点：该设备具有数据容错存储功能，
@@ -40,74 +40,79 @@
      设备位于操作系统内部文件系统。
      数据持久性与操作系统挂钩。
      
-#### ☁ 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 为： 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 主机建立 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 主机建立 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/winboll/winboll.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/studio/app.git中。
+☁ WinBoLL 主机提供 WinBoLL 1Panel Gitea 应用的 WinBoLL 项目源码仓库存取功能。（Gitea 应用已提供）
+☁ WinBoLL 主机提供 WinBoLL Gitea 项目仓库存档功能。（Gitea 应用已提供）
+☁ 提供 WinBoLL 客户端用户登录功能。（Gitea 应用已提供）
 
 ### ☁ 看远方 ☁ ###
-### ☁ 心忧虑 ☁ 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 用户客户端信息设定为：
+### ☁ 心忧虑 ☁ 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 用户客户端信息设定为：
    <用户名, 唯一存储令牌Token>。
 
 ### ☁ 云游四方 ☁ ###
-### ☁ 呔！ ☁ WinBoll-APP 应用需求规划
-☁ WinBoll-APP 提供手机目录 /sdcard/WinBoll 的 WinBoll 项目源码管理功能。 
+### ☁ 呔！ ☁ 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 将会实现 https://winboll.cc/api 访问功能。
-☁ WinBoll-APP 将会实现手机端 Android 应用的开发与管理功能。
 
-## ☁ WinBoll ☁ WinBoll 主机忧虑
-☁ WinBoll 将会提供 gitea.winboll.cc 域名用户注册登录功能。
-☁ WinBoll 将会提供 WinBoll-APP 及其衍生应用的 Gitea 仓库管理服务。
-☁ WinBoll 将会提供 winboll.cc 域名 WinBoll 项目组注册登录功能。
+### ☁ 吁！ ☁ 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 项目组注册登录功能。
 
 # 本项目要实际运用需要注意以下几个步骤：
 # 在项目根目录下：
 ## 1. 项目模块编译环境设置(必须)，settings.gradle-demo 要复制为 settings.gradle，并取消相应项目模块的注释。
 ## 2. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。
-## 3. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoll Maven 库登录用户信息。
+## 3. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoLL Maven 库登录用户信息。
 
 
 # ☆类库型项目编译方法
@@ -116,12 +121,12 @@
 设置属性 libraryProject=<类库项目模块文件夹名称>
 ### 再编译测试项目
 $ bash .winboll/bashPublishAPKAddTag.sh <应用项目模块文件夹名称>
-#### 测试项目编译后，编译器会复制一份 APK 到以下路径："/sdcard/WinBollStudio/APKs/<项目根目录名称>/tag/" 文件夹。
+#### 测试项目编译后，编译器会复制一份 APK 到以下路径："/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/" 文件夹。
 ### 最后编译类库项目
 $ bash .winboll/bashPublishLIBAddTag.sh <类库项目模块文件夹名称>
-#### 类库模块编译命令执行后，编译器会发布到 WinBoll Nexus Maven 库：Maven 库地址可以参阅根项目目录配置 build.gradle 文件。
+#### 类库模块编译命令执行后，编译器会发布到 WinBoLL Nexus Maven 库：Maven 库地址可以参阅根项目目录配置 build.gradle 文件。
              
 # ☆应用型项目编译方法
 ## 直接调用以下命令编译应用型项目
 $ bash .winboll/bashPublishAPKAddTag.sh <应用项目模块文件夹名称>
-#### 应用模块编译命令执行后，编译器会复制一份 APK 到以下路径："/sdcard/WinBollStudio/APKs/<项目根目录名称>/tag/" 文件夹。
+#### 应用模块编译命令执行后，编译器会复制一份 APK 到以下路径："/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/" 文件夹。

aes/build.gradle

@@ -19,7 +19,7 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.aes"
@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "7.6" 
+        versionName "15.6" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,29 +41,9 @@ 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 Jan 19 04:58:59 GMT 2025
+#Mon May 12 18:10:02 HKT 2025
 stageCount=3
 libraryProject=libaes
-baseVersion=7.6
-publishVersion=7.6.2
-buildCount=4
-baseBetaVersion=7.6.3
+baseVersion=15.6
+publishVersion=15.6.2
+buildCount=0
+baseBetaVersion=15.6.3

aes/src/main/AndroidManifest.xml

@@ -8,9 +8,10 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/WinBoll.SupportThemeNoActionBar"
+        android:theme="@style/MyAESTheme"
         android:requestLegacyExternalStorage="true"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
             android:name=".MainActivity"
@@ -30,6 +31,8 @@
             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

@@ -0,0 +1,93 @@
+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,16 +5,27 @@ 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();
-        //setIsDebug(BuildConfig.DEBUG);
+
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
+        // 设置 Toast 布局样式
+        //ToastUtils.setView(R.layout.view_toast);
+        ToastUtils.setStyle(new WhiteToastStyle());
+        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+
     }
-    
+
 }

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

@@ -5,12 +5,193 @@ package cc.winboll.studio.aes;
  * @Date 2024/06/13 19:05:52
  * @Describe 应用主窗口
  */
-import cc.winboll.studio.libaes.unittests.LibraryActivity;
+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;
+
+public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
+
 
-public class MainActivity extends LibraryActivity {
-    
     public static final String TAG = "MainActivity";
+
+    TestAButtonFragment mTestAButtonFragment;
+    TestViewPageFragment mTestViewPageFragment;
     
+    @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/layout/activity_about.xml

@@ -6,16 +6,17 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<androidx.appcompat.widget.Toolbar
+	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/activityassetshtmlToolbar1"/>
+		android:id="@+id/toolbar"/>
 
-	<cc.winboll.studio.libapputils.view.SimpleWebView
+	<LinearLayout
+		android:orientation="vertical"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1.0"
-		android:id="@+id/activityassetshtmlSimpleWebView1"/>
+		android:id="@+id/aboutviewroot_ll"/>
 
 </LinearLayout>
 

aes/src/main/res/menu/toolbar_library.xml

@@ -13,7 +13,7 @@
     <item
         android:id="@+id/item_localfileselectdialog"
         android:title="LocalFileSelectDialog"/>
-    
+
     <item
         android:id="@+id/item_atoolbar"
         android:title="Test AToolbar"/>

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

@@ -0,0 +1,7 @@
+<?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="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="MyAESTheme" parent="AESTheme">
     </style>
 </resources>

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

@@ -0,0 +1,6 @@
+<?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 26
+        minSdkVersion 24
         targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
@@ -46,11 +46,12 @@ 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' // 包含 AppCompatActivity
+    //api 'com.android.support:appcompat-v7:28.0.0'
+    api('com.android.support:appcompat-v7:28.0.0'){
+        //exclude group: "com.android.support", module: "support-vector-drawable"
+        exclude group: "com.android.support:animated-vector-drawable:28.0.0"
+    }
     // https://mvnrepository.com/artifact/com.android.support/support-compat
     api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
     // https://mvnrepository.com/artifact/com.android.support/support-v4
@@ -66,6 +67,6 @@ dependencies {
     // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
     api 'com.android.support:recyclerview-v7:28.0.0'
     
-    api 'cc.winboll.studio:libappbase:15.0.9'
-    api 'cc.winboll.studio:libapputils:15.0.11'
+    api 'cc.winboll.studio:libapputils:15.2.2'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }

androiddemo/build.properties

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

androidxdemo/build.gradle

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

androidxdemo/build.properties

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

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

@@ -14,6 +14,7 @@ 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;
@@ -21,7 +22,9 @@ 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;
@@ -46,6 +49,14 @@ 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,6 +4,7 @@ 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 {
 
@@ -18,6 +19,8 @@ public class MainActivity extends AppCompatActivity {
 		setSupportActionBar(toolbar);
 
         mLogView = findViewById(R.id.logview);
+        
+        ToastUtils.show("onCreate");
     }
 
     @Override

app/build.properties

@@ -1,8 +0,0 @@
-#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/res/values/strings.xml

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

app/src/main/AndroidManifest.xml

@@ -1,48 +0,0 @@
-<?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

@@ -1,24 +0,0 @@
-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

@@ -1,168 +0,0 @@
-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/layout/activity_main.xml

@@ -1,29 +0,0 @@
-<?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

@@ -1,32 +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: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/values/colors.xml

@@ -1,10 +0,0 @@
-<?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 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">WinBoll-APP</string>
-
-</resources>

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

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

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

@@ -1,25 +0,0 @@
-<?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 26
-        targetSdkVersion 29
+        minSdkVersion 24
+        targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.1"
+        versionName "15.7"
         if(true) {
             versionName = genVersionName("${versionName}")
         }

appbase/build.properties

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

appbase/src/main/AndroidManifest.xml

@@ -5,18 +5,18 @@
 
     <application
         android:name=".App"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@drawable/ic_miapp"
         android:label="@string/app_name"
         android:theme="@style/MyAPPBaseTheme"
-        android:resizeableActivity="true">
+        android:resizeableActivity="true"
+        android:process=":App">
 
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
+            android:exported="true"
             android:resizeableActivity="true"
-            android:launchMode="singleInstance"
-            android:taskAffinity="cc.winboll.studio.appbase.task.main"
-            android:exported="true">
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
 
             <intent-filter>
 
@@ -32,7 +32,18 @@
 
         </activity>
 
-        <activity android:name=".GlobalApplication$CrashActivity"/>
+        <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"/>
 
         <service
             android:name=".MyTileService"
@@ -111,9 +122,6 @@
             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,32 +1,29 @@
 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.LogActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
-import android.support.v7.widget.Toolbar;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class MainActivity extends AppCompatActivity implements IWinBollActivity {
+public class MainActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
 
     public static final String TAG = "MainActivity";
 
@@ -50,7 +47,7 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
         setContentView(R.layout.activity_main);
 
         mToolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(mToolbar);
+        setActionBar(mToolbar);
 
         CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
         cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
@@ -65,15 +62,12 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
     @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);
     }
@@ -91,6 +85,13 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
 	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) {
@@ -136,6 +137,8 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
         startService(intent);
 
     }
+    
+    
 
     public void onStopTestDemoService(View view) {
         Intent intent = new Intent(this, TestDemoService.class);
@@ -173,26 +176,8 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
     }
 
     public void onTestOpenNewActivity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
+        GlobalApplication.getWinBoLLActivityManager().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/activities/New2Activity.java

@@ -7,16 +7,20 @@ 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.libappbase.LogView;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import cc.winboll.studio.appbase.WinBoLLActivityBase;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class New2Activity extends Activity implements IWinBollActivity {
+public class New2Activity extends WinBoLLActivityBase implements IWinBoLLActivity {
 
     public static final String TAG = "New2Activity";
 
+    Toolbar mToolbar;
     //LogView mLogView;
 
     @Override
@@ -36,6 +40,9 @@ public class New2Activity extends Activity implements IWinBollActivity {
 
 //        mLogView = findViewById(R.id.logview);
 //        mLogView.start();
+        mToolbar = findViewById(R.id.toolbar);
+        setActionBar(mToolbar);
+        
     }
 
     @Override
@@ -45,14 +52,32 @@ public class New2Activity extends Activity implements IWinBollActivity {
     }
 
     public void onCloseThisActivity(View view) {
-        WinBollActivityManager.getInstance(this).finish(this);
+        GlobalApplication.getWinBoLLActivityManager().finish(this);
     }
 
     public void onCloseAllActivity(View view) {
-        WinBollActivityManager.getInstance(this).finishAll();
+        GlobalApplication.getWinBoLLActivityManager().finishAll();
     }
 
     public void onNewActivity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
+        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);
     }
 }

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

@@ -6,16 +6,20 @@ 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.libappbase.LogView;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import cc.winboll.studio.appbase.WinBoLLActivityBase;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class NewActivity extends Activity implements IWinBollActivity {
+public class NewActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
 
     public static final String TAG = "NewActivity";
 
+    Toolbar mToolbar;
     //LogView mLogView;
 
     @Override
@@ -34,6 +38,9 @@ public class NewActivity extends Activity implements IWinBollActivity {
         setContentView(R.layout.activity_new);
 //        mLogView = findViewById(R.id.logview);
 //        mLogView.start();
+        mToolbar = findViewById(R.id.toolbar);
+        setActionBar(mToolbar);
+        
     }
 
     @Override
@@ -43,14 +50,32 @@ public class NewActivity extends Activity implements IWinBollActivity {
     }
 
     public void onCloseThisActivity(View view) {
-        WinBollActivityManager.getInstance(this).finish(this);
+        GlobalApplication.getWinBoLLActivityManager().finish(this);
     }
 
     public void onCloseAllActivity(View view) {
-        WinBollActivityManager.getInstance(this).finishAll();
+        GlobalApplication.getWinBoLLActivityManager().finishAll();
     }
 
     public void onNew2Activity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, New2Activity.class);
+        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);
     }
 }

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.support.v7.widget.Toolbar
+	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>
@@ -32,35 +32,48 @@
 				<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，但可能需要注意兼容性和配置问题。"/>
 
-				<LinearLayout
-					android:orientation="horizontal"
+				<HorizontalScrollView
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:gravity="right|center_vertical">
+					android:layout_height="wrap_content">
 
-					<CheckBox
-						android:layout_width="wrap_content"
+					<LinearLayout
+						android:orientation="horizontal"
 						android:layout_height="wrap_content"
-						android:text="Debug Mode"
-						android:layout_weight="1.0"
-						android:onClick="onSwitchDebugMode"
-						android:id="@+id/activitymainCheckBox1"/>
+						android:gravity="right|center_vertical"
+						android:layout_width="wrap_content">
 
-					<Button
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:text="Test Application CrashReport"
-						android:textAllCaps="false"
-						android:onClick="onTestApplicationCrashReport"/>
+						<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"/>
 
-				</LinearLayout>
+						<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>
 
 				<ScrollView
 					android:layout_width="match_parent"
@@ -72,26 +85,27 @@
 						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="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="StopCenter"
-                                android:textAllCaps="false"
-                                android:onClick="onStopCenter"/>
-                        </LinearLayout>
-                        
 						<HorizontalScrollView
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content">
@@ -160,7 +174,6 @@
 
 						</HorizontalScrollView>
 
-
 						<Button
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
@@ -181,14 +194,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>
@@ -198,6 +211,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,13 +30,6 @@
 		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,8 +2,5 @@
 <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 "33.0.3"
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.apputils"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "9.2" 
+        versionName "15.3" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,15 +41,9 @@ 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
-#Sat Jan 18 13:03:10 HKT 2025
-stageCount=2
+#Tue Apr 29 15:04:17 HKT 2025
+stageCount=5
 libraryProject=libapputils
-baseVersion=9.2
-publishVersion=9.2.1
+baseVersion=15.3
+publishVersion=15.3.4
 buildCount=0
-baseBetaVersion=9.2.2
+baseBetaVersion=15.3.5

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/WinBoll.SupportThemeNoActionBar"
+        android:theme="@style/MyUtilsTheme"
         android:supportsRtl="true">
 
         <activity
@@ -27,9 +27,13 @@
 
         </activity>
 
-        <activity android:name=".TestWinBollActivity"/>
+        <activity android:name=".TestStringToQRCodeViewActivity"/>
 
-        <activity android:name=".TestStringToQrCodeViewActivity"/>
+        <activity android:name=".TestBBMorseCodeActivity"/>
+
+        <activity android:name=".AssetsHtmlActivity"/>
+
+        <activity android:name=".QRCodeDecodeActivity"/>
 
     </application>
 

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

@@ -5,27 +5,16 @@ package cc.winboll.studio.apputils;
  * @Date 2024/12/08 15:10:51
  * @Describe 全局应用类
  */
-import android.view.Gravity;
-import cc.winboll.studio.libapputils.app.WinBollApplication;
-import com.hjq.toast.ToastUtils;
-import com.hjq.toast.style.WhiteToastStyle;
+import android.app.Application;
+import android.content.Context;
+import cc.winboll.studio.libappbase.GlobalApplication;
 
-public class App extends WinBollApplication {
+public class App extends GlobalApplication {
 
     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/AssetsHtmlActivity.java

@@ -1,59 +1,53 @@
-package cc.winboll.studio.libapputils.activities;
+package cc.winboll.studio.apputils;
 
 /**
  * @Author ZhanGSKen@QQ.COM
  * @Date 2025/01/03 11:02:49
  * @Describe 一个可以浏览随 APP 附带的 Html 文档的窗口
  */
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libapputils.R;
-import cc.winboll.studio.libapputils.app.WinBollActivity;
-import cc.winboll.studio.libapputils.log.LogUtils;
-import cc.winboll.studio.libapputils.view.SimpleWebView;
-import com.hjq.toast.ToastUtils;
+import android.widget.Toolbar;
+import cc.winboll.studio.apputils.R;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libapputils.views.SimpleWebView;
 import java.io.IOException;
 import java.io.InputStream;
-import android.os.PersistableBundle;
 
-public class AssetsHtmlActivity extends WinBollActivity {
+public class AssetsHtmlActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
 
-    public static final String TAG = "AssetsHtmlActivity";
-    
-    public static final String EXTRA_HTMLFILENAME = "EXTRA_HTMLFILENAME";
-    
-    String mszHelpIndexFilePath = "";
-    Uri mszHelpIndexFileUri;
-    Context mContext;
-
-    // Assets 文件夹里的 Html 文件的名称
-    String mszHtmlFileName;
+    @Override
+    public Activity getActivity() {
+        return super.getActivity();
+    }
 
     @Override
     public String getTag() {
         return TAG;
     }
 
-    @Override
-    protected boolean isEnableDisplayHomeAsUp() {
-        return true;
-    }
 
+    public static final String TAG = "AssetsHtmlActivity";
 
-    @Override
-    protected boolean isAddWinBollToolBar() {
-        return false;
-    }
+    public static final String EXTRA_HTMLFILENAME = "EXTRA_HTMLFILENAME";
 
-    @Override
-    protected Toolbar initToolBar() {
-        return findViewById(R.id.activityassetshtmlToolbar1);
-    }
+    String mszHelpIndexFilePath = "";
+    Uri mszHelpIndexFileUri;
+    Context mContext;
+
+    // Assets 文件夹里的 Html 文件的名称
+    String mszHtmlFileName;
+//
+//    @Override
+//    public Activity getActivity() {
+//        return this;
+//    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -63,7 +57,7 @@ public class AssetsHtmlActivity extends WinBollActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
 //        if (item.getItemId() == android.R.id.home) {
-//            WinBollActivityManager.getInstance(this).finish(this);
+//            WinBoLLActivityManager.getInstance(this).finish(this);
 //        }
         return super.onOptionsItemSelected(item);
     }
@@ -73,6 +67,10 @@ public class AssetsHtmlActivity extends WinBollActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_assetshtml);
 
+        // 初始化工具栏
+        Toolbar mToolbar = findViewById(R.id.toolbar);
+        setActionBar(mToolbar);
+
         mszHtmlFileName = "index.html";
 
         Intent intent = getIntent();
@@ -81,7 +79,7 @@ public class AssetsHtmlActivity extends WinBollActivity {
             if (szTemp != null && !szTemp.trim().equals("")) {
                 mszHtmlFileName = szTemp.trim();
             }
-            ToastUtils.show(mszHtmlFileName);
+            //ToastUtils.show(mszHtmlFileName);
         }
 
         // 与其他应用分享 html 帮助
@@ -107,13 +105,6 @@ public class AssetsHtmlActivity extends WinBollActivity {
 //        myWebView.loadUrl(mszHelpIndexFileUri.toString());
     }
 
-    @Override
-    public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
-        super.onPostCreate(savedInstanceState, persistentState);
-        setSubTitle(mszHtmlFileName);
-        //setSubTitle(TAG);
-    }
-
     //
     void initWebViewFromAssets(String szHtmlFileName) {
         try {

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

@@ -1,87 +1,159 @@
 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 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;
+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;
 
-final public class MainActivity extends WinBollActivity {
+final public class MainActivity extends Activity {
 
 	public static final String TAG = "MainActivity";
 
     public static final int REQUEST_QRCODEDECODE_ACTIVITY = 0;
 
-    @Override
-    protected boolean isEnableDisplayHomeAsUp() {
-        return false;
-    }
+    Toolbar mToolbar;
+    LogView mLogView;
+//
+//    @Override
+//    public Activity getActivity() {
+//        return this;
+//    }
 
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        //Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
-        //setActionBar(toolbar);
+        mLogView = findViewById(R.id.logview);
+        mLogView.start();
+
+        // 初始化工具栏
+        mToolbar = findViewById(R.id.toolbar);
+        setActionBar(mToolbar);
+//        if (isEnableDisplayHomeAsUp()) {
+//            // 显示后退按钮
+//            getActionBar().setDisplayHomeAsUpEnabled(true);
+//        }
+//        getActionBar().setSubtitle(getTag());
+
+        checkResolveActivity();
+        archiveInstance();
+
+
 
         // 接收并处理 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 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);
-    }
+    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);
 
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-//        setSubTitle("");
+        //WinBoLLActivityManager.getInstance().printAvtivityListInfo();
+        //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, LogActivity.class);
     }
 
-    @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 数据
     //
@@ -93,7 +165,7 @@ final public class MainActivity extends WinBollActivity {
 
 //        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);
@@ -111,8 +183,8 @@ final public class MainActivity extends WinBollActivity {
 //                }
 //
 //                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());
 //                // 函数处理异常返回失败
@@ -125,58 +197,107 @@ final public class MainActivity extends WinBollActivity {
         return true;
     }
 
-    @Override
-    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) {
+        //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);
+        }
+
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.item_testwinboll) {
-            WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestWinBollActivity.class);
+        if (item.getItemId() == R.id.item_exit) {
+            //exit();
+            return true;
         } else if (item.getItemId() == R.id.item_teststringtoqrcodeview) {
-            WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestStringToQrCodeViewActivity.class);
+            Intent intent = new Intent(this, TestStringToQRCodeViewActivity.class);
+            startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
+            //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);
     }
 
-    public void onTestJavascriptHtmlActivity(View view) {
+//    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) {
         Intent intent = new Intent(this, AssetsHtmlActivity.class);
         intent.putExtra(AssetsHtmlActivity.EXTRA_HTMLFILENAME, "javascript_test.html");
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+        startActivity(intent);
+        //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, intent, AssetsHtmlActivity.class);
     }
 
     @Override
-    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);
-                }
-        }
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
     }
+
+    /*@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/QRCodeDecodeActivity.java

@@ -1,72 +1,59 @@
-package cc.winboll.studio.libapputils.activities;
+package cc.winboll.studio.apputils;
 
 /**
  * @Author ZhanGSKen@QQ.COM
  * @Date 2025/01/18 10:32:21
  * @Describe 二维码扫码解码窗口
  */
+import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.widget.TextView;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import cc.winboll.studio.libapputils.R;
-import cc.winboll.studio.libapputils.app.WinBollActivity;
+import android.widget.Toolbar;
+import cc.winboll.studio.apputils.R;
 import com.google.zxing.ResultPoint;
 import com.journeyapps.barcodescanner.BarcodeCallback;
 import com.journeyapps.barcodescanner.BarcodeResult;
 import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 import java.util.List;
 
-public class QRCodeDecodeActivity extends WinBollActivity {
+public class QRCodeDecodeActivity extends Activity {
 
     public static final String TAG = "QRCodeDecodeActivity";
-    public static final String EXTRA_RESULT = "EXTRA_RESULT";
 
+    public static final String EXTRA_RESULT = "EXTRA_RESULT";
     private static final int REQUEST_CAMERA_PERMISSION = 1;
+
     TextView resultTextView;
     DecoratedBarcodeView barcodeView;
-    
-    @Override
-    public String getTag() {
-        return TAG;
-    }
 
-    @Override
-    protected boolean isEnableDisplayHomeAsUp() {
-        return true;
-    }
-
-
-    @Override
-    protected boolean isAddWinBollToolBar() {
-        return false;
-    }
-
-    @Override
-    protected Toolbar initToolBar() {
-        return findViewById(R.id.activityqrcodedecodeToolbar1);
-    }
+//    @Override
+//    public Activity getActivity() {
+//        return this;
+//    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_qrcodedecode);
-        resultTextView = findViewById(R.id.activityqrcodedecodeTextView1);
+
+        // 初始化工具栏
+//        Toolbar mToolbar = findViewById(R.id.toolbar);
+//        setActionBar(mToolbar);
+
+        //resultTextView = findViewById(R.id.activityqrcodedecodeTextView1);
         barcodeView = findViewById(R.id.activityqrcodedecodeDecoratedBarcodeView1);
         // 请求相机权限
-        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA)
-            != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this,
-                                              new String[]{android.Manifest.permission.CAMERA},
-                                              REQUEST_CAMERA_PERMISSION);
-        } else {
-            startScanning();
-        }
-
-        
+//        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA)
+//            != PackageManager.PERMISSION_GRANTED) {
+//            ActivityCompat.requestPermissions(this,
+//                                              new String[]{android.Manifest.permission.CAMERA},
+//                                              REQUEST_CAMERA_PERMISSION);
+//        } else {
+//            startScanning();
+//        }
+        startScanning();
     }
 
     private void startScanning() {

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

@@ -0,0 +1,20 @@
+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,50 +0,0 @@
-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

@@ -1,52 +0,0 @@
-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

@@ -0,0 +1,21 @@
+<?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">
 
-	<androidx.appcompat.widget.Toolbar
+	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/activitymainToolbar1"/>
+		android:id="@+id/toolbar"/>
 
 	<LinearLayout
 		xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -27,32 +27,39 @@
 				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="LogUtils"
+				android:text="TestLogActivity"
 				android:textAllCaps="false"
-				android:onClick="onLogUtilsClick"/>
+				android:onClick="onTestLogActivity"/>
 
 		</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="Test Javascript Html Activity"
-                android:onClick="onTestJavascriptHtmlActivity"/>
+			<Button
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAllCaps="false"
+				android:text="TestAssetsHtmlActivity"
+				android:onClick="onTestAssetsHtmlActivity"/>
 
-        </LinearLayout>
+		</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>
 

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

@@ -0,0 +1,20 @@
+<?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_testbbmorsecode.xml

@@ -5,11 +5,5 @@
     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="Text"
-        android:id="@+id/page_text"/>
     
-</LinearLayout>
+</LinearLayout>

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

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

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

@@ -1,32 +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: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,16 +1,13 @@
 <?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"
-        app:showAsAction="ifRoom"/>
+        android:title="TestStringToQRCodeViewActivity"/>
     <item
         android:id="@+id/item_testqrcodedecodeactivity"
-        android:title="TestQRCodeDecodeActivity"
-        app:showAsAction="ifRoom"/>
+        android:title="TestQRCodeDecodeActivity"/>
+    <item
+        android:id="@+id/item_testcrashreport"
+        android:title="TestCrashReportActivity"/>
 </menu>

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

@@ -1,10 +1,7 @@
 <?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,3 +1,14 @@
 <?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>

autoinstaller/build.gradle

@@ -19,7 +19,7 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.autoinstaller"
@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "5.0" 
+        versionName "15.2" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,30 +41,33 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }
 
 dependencies {
-	api 'cc.winboll.studio:winboll-shared:1.1.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'
-    
-    api 'androidx.appcompat:appcompat:1.0.0'
-    api 'androidx.fragment:fragment:1.0.0'
-    api 'com.google.android.material:material:1.0.0'
-    
-    api 'androidx.vectordrawable:vectordrawable-animated:1.0.0'
-    api 'androidx.lifecycle:lifecycle-livedata:1.0.0'
-    
-    //api 'cc.winboll.studio:libaes:6.3.2'
-    //api 'cc.winboll.studio:libapputils:8.3.8'
-    
     api fileTree(dir: 'libs', include: ['*.jar'])
+    api 'cc.winboll.studio:libaes:15.6.0'
+    api 'cc.winboll.studio:libapputils:15.3.4'
+    api 'cc.winboll.studio:libappbase:15.7.6'
+    
+    // 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.squareup.okhttp3:okhttp:4.4.1'
+    // AndroidX 类库
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'com.google.android.material:material:1.4.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.fragment:fragment:1.1.0'
+    
 }

autoinstaller/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jan 02 02:39:56 HKT 2025
-stageCount=4
+#Sun May 04 05:32:00 GMT 2025
+stageCount=1
 libraryProject=
-baseVersion=5.0
-publishVersion=5.0.3
-buildCount=0
-baseBetaVersion=5.0.4
+baseVersion=15.2
+publishVersion=15.2.0
+buildCount=74
+baseBetaVersion=15.2.1

autoinstaller/src/main/AndroidManifest.xml

@@ -23,6 +23,8 @@
 
     <!-- MANAGE_EXTERNAL_STORAGE -->
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+        
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
 
     <application
         android:name=".App"
@@ -33,7 +35,7 @@
         android:persistent="true"
         android:supportsRtl="true"
         android:requestLegacyExternalStorage="true"
-        android:theme="@style/Theme.Application">
+        android:theme="@style/MyAppTheme">
 
         <activity
             android:name=".MainActivity"
@@ -54,6 +56,21 @@
 
         <service android:name=".services.AssistantService"/>
 
+        <service
+            android:name=".AppBaseTileService"
+            android:exported="true"
+            android:label="@string/tileservice_name"
+            android:icon="@drawable/ic_launcher"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+
+            <intent-filter>
+
+                <action android:name="android.service.quicksettings.action.QS_TILE"/>
+
+            </intent-filter>
+
+        </service>
+
         <receiver
             android:name=".receivers.MainReceiver"
             android:enabled="true"

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

@@ -6,22 +6,23 @@ package cc.winboll.studio.autoinstaller;
  * @Describe 全局应用类
  */
 import android.view.Gravity;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import com.hjq.toast.ToastUtils;
-import cc.winboll.studio.shared.app.WinBollApplication;
+import com.hjq.toast.style.WhiteToastStyle;
 
-public class App extends WinBollApplication {
+public class App extends GlobalApplication {
     
     public static final String TAG = "App";
 
     @Override
     public void onCreate() {
         super.onCreate();
-        setIsDebug(BuildConfig.DEBUG);
+        
         // 初始化 Toast 框架
         ToastUtils.init(this);
         // 设置 Toast 布局样式
-        ToastUtils.setView(R.layout.toast_custom_view);
-        //ToastUtils.setStyle(new WhiteToastStyle());
+        //ToastUtils.setView(R.layout.view_toast);
+        ToastUtils.setStyle(new WhiteToastStyle());
         ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
     }
 }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/AppBaseTileService.java

@@ -0,0 +1,12 @@
+package cc.winboll.studio.autoinstaller;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/04/15 09:24:46
+ * @Describe 磁贴工具服务类
+ */
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.TileService;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
+
+

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/FileListener.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.autoinstaller;
 
 import android.os.FileObserver;
-import cc.winboll.studio.shared.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class FileListener extends FileObserver {
 	public final static String TAG = "FileListener";

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

@@ -6,21 +6,24 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.RadioButton;
 import android.widget.SimpleAdapter;
 import android.widget.Switch;
 import android.widget.TextClock;
-import android.widget.Toast;
 import androidx.core.content.FileProvider;
-import cc.winboll.studio.shared.log.LogUtils;
-import cc.winboll.studio.shared.log.LogView;
 import cc.winboll.studio.autoinstaller.MainActivity;
-import cc.winboll.studio.autoinstaller.beans.AppConfigs;
+import cc.winboll.studio.autoinstaller.models.APKModel;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.services.MainService;
 import cc.winboll.studio.autoinstaller.utils.NotificationUtil;
+import cc.winboll.studio.autoinstaller.utils.PackageUtil;
 import cc.winboll.studio.autoinstaller.views.ListViewForScrollView;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
 import com.hjq.toast.ToastUtils;
 import java.io.File;
 import java.util.ArrayList;
@@ -30,8 +33,13 @@ import java.util.Map;
 public class MainActivity extends Activity {
     public static final String TAG = "MainActivity";
 
+    public static final int MSG_UPDATE_STATUS = 0;
+
     private static final int INSTALL_PERMISSION_CODE = 1;
 
+    static MainActivity _MainActivity;
+
+    ArrayList<APKModel> _APKModelList = new ArrayList<APKModel>();
     LogView mLogView;
     TextClock mTextClock;
     EditText mEditText;
@@ -60,9 +68,11 @@ public class MainActivity extends Activity {
 
         super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_main);
+        _MainActivity = this;
         initView();
 
-        if (getIntent().getAction().equals(ACTION_NEW_INSTALLTASK)) {
+        String action = getIntent().getAction();
+        if ((action != null) && action.equals(ACTION_NEW_INSTALLTASK)) {
             mszInstalledPackageName = getIntent().getStringExtra(EXTRA_INSTALLED_PACKAGENAME);
             mszInstalledAPKFilePath = getIntent().getStringExtra(EXTRA_INSTALLED_APKFILEPATH);
             installAPK();
@@ -76,11 +86,7 @@ public class MainActivity extends Activity {
         mLogView = findViewById(R.id.logview);
         mLogView.start();
 
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(this);
-        if (appConfigs == null) {
-            appConfigs = new AppConfigs(); 
-            AppConfigs.saveAppConfigs(this, appConfigs);
-        }
+        AppConfigs appConfigs = AppConfigs.getInstance(this).loadAppConfigs(this);
 
         if (appConfigs.getSetupMode() == AppConfigs.SetupMode.WATCHOUTPUTINSTALLER) {
             ((RadioButton)findViewById(R.id.activitymainRadioButton1)).setChecked(true);
@@ -131,23 +137,44 @@ public class MainActivity extends Activity {
 
     }
 
+    String getLastApkPackageName() {
+        APKModel.loadBeanList(this, _APKModelList, APKModel.class);
+        if (_APKModelList.size() > 0) {
+            return _APKModelList.get(_APKModelList.size() - 1).getApkPackageName();
+        }
+        return "";
+    }
+
     public void onOpenAPP(View view) {
-        if (mszInstalledPackageName.trim().equals("")) {
+        String szInstalledPackageName = getLastApkPackageName();
+        LogUtils.d(TAG, "szInstalledPackageName : " + szInstalledPackageName);
+        if (szInstalledPackageName.trim().equals("")) {
             ToastUtils.show("Installed APP package name is null.");
             return;
         }
 
-        Intent intent = getPackageManager().getLaunchIntentForPackage(mszInstalledPackageName);
-        if (intent != null) {
-            startActivity(intent);
-        } else {
-            // 若没能获取到启动意图，可进行相应提示等操作，比如跳转到应用商店让用户下载该应用（示例）
-            Intent marketIntent = new Intent(Intent.ACTION_VIEW);
-            marketIntent.setData(Uri.parse("market://details?id=" + mszInstalledPackageName));
-            startActivity(marketIntent);
-        }
+        PackageUtil.openAPP(this, szInstalledPackageName);
     }
 
+//    public void onOpenAPP(View view) {
+//        String szInstalledPackageName = getLastApkPackageName();
+//        if (szInstalledPackageName.trim().equals("")) {
+//            ToastUtils.show("Installed APP package name is null.");
+//            return;
+//        }
+//
+//        Intent intent = getPackageManager().getLaunchIntentForPackage(mszInstalledPackageName);
+//        if (intent != null) {
+//            //ToastUtils.show("startActivity");
+//            startActivity(intent);
+//        } else {
+//            // 若没能获取到启动意图，可进行相应提示等操作，比如跳转到应用商店让用户下载该应用（示例）
+//            Intent marketIntent = new Intent(Intent.ACTION_VIEW);
+//            marketIntent.setData(Uri.parse("market://details?id=" + mszInstalledPackageName));
+//            startActivity(marketIntent);
+//        }
+//    }
+
     public void onInstallAPK(View view) {
         installAPK();
     }
@@ -185,17 +212,22 @@ public class MainActivity extends Activity {
     }
 
     public void onLockPath(View view) {
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(this);
-
         Switch sw = (Switch)view;
-        if (sw.isChecked()) {
+        setMainServiceStatus(sw.isChecked());
+    }
+
+    public void setMainServiceStatus(boolean isEnable) {
+        AppConfigs appConfigs = AppConfigs.getInstance(this).loadAppConfigs(this);
+
+        Switch sw = (Switch)findViewById(R.id.activitymainSwitch1);
+        if (isEnable) {
             String szFilePath = mEditText.getText().toString();
 
             // 设置空路径时退出
             //
             if (szFilePath.trim().equals("")) {
                 sw.setChecked(false);
-                Toast.makeText(getApplication(), "监控路径为空。", Toast.LENGTH_SHORT).show();
+                ToastUtils.show("监控路径为空。");
                 return;
             }
 
@@ -236,7 +268,7 @@ public class MainActivity extends Activity {
             stopWatchingFile();
 
         }
-        AppConfigs.saveAppConfigs(this, appConfigs);
+        AppConfigs.getInstance(this).saveAppConfigs(this, appConfigs);
     }
 
     void stopWatchingFile() {
@@ -251,8 +283,6 @@ public class MainActivity extends Activity {
         Intent intentService = new Intent(MainActivity.this, MainService.class);
         //intentService.putExtra(MainService.EXTRA_APKFILEPATH, szAPKFilePath);
         startService(intentService);
-
-
     }
 
     /*
@@ -298,7 +328,7 @@ public class MainActivity extends Activity {
      }*/
 
     public void onChangeSetupMode(View view) {
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(this);
+        AppConfigs appConfigs = AppConfigs.getInstance(this).loadAppConfigs(this);
 
         if (view.getId() == R.id.activitymainRadioButton1) {
             appConfigs.setSetupMode(AppConfigs.SetupMode.WATCHOUTPUTINSTALLER);
@@ -307,6 +337,42 @@ public class MainActivity extends Activity {
             appConfigs.setSetupMode(AppConfigs.SetupMode.NEWAPKINFONEWAPKINFO);
             ((RadioButton)findViewById(R.id.activitymainRadioButton1)).setChecked(false);
         }
-        AppConfigs.saveAppConfigs(this, appConfigs);
+        AppConfigs.getInstance(this).saveAppConfigs(this, appConfigs);
+    }
+
+    // 定义Handler
+    static Handler _Handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            if (msg.what == MSG_UPDATE_STATUS) {
+                if (_MainActivity != null) {
+                    boolean isEnableMainService = (boolean)msg.obj;
+                    // 处理消息，这里更新 MainService 的状态
+                    _MainActivity.setMainServiceStatus(isEnableMainService);
+                }
+            }
+        }
+    };
+
+    static void updateMainServiceStatus(boolean isEnable) {
+        if (_Handler != null) {
+            Message msg = new Message();
+            msg.obj = isEnable;
+            msg.what = MSG_UPDATE_STATUS;
+            _Handler.sendMessage(msg);
+        }
+    }
+
+    public static void stopMainService() {
+        if (_MainActivity != null && _Handler != null) {
+            updateMainServiceStatus(false);
+        }
+    }
+
+    public static void startMainService() {
+        if (_MainActivity != null && _Handler != null) {
+            updateMainServiceStatus(true);
+        }
     }
 }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/APKModel.java

@@ -1,53 +1,57 @@
-package cc.winboll.studio.libapputils.log;
+package cc.winboll.studio.autoinstaller.models;
 
 /**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/08/23 15:39:07
- * @Describe LogUtils 数据配置类。
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/04/02 20:50:29
+ * @Describe 监控的 APK 安装文件对应的应用信息数据模型
  */
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.libapputils.bean.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
-public class LogUtilsBean extends BaseBean {
 
-    public static final String TAG = "LogUtilsBean";
+public class APKModel extends BaseBean {
 
-    LogUtils.LOG_LEVEL logLevel;
+    public static final String TAG = "APPModel";
 
-    public LogUtilsBean() {
-        this.logLevel = LogUtils.LOG_LEVEL.Off;
+    // 每次更新的 APK 文件对应的应用包名称
+    String apkPackageName;
+
+    public APKModel() {
+        this.apkPackageName = "";
     }
 
-    public LogUtilsBean(LogUtils.LOG_LEVEL logLevel) {
-        this.logLevel = logLevel;
+    public APKModel(String apkPackageName) {
+        this.apkPackageName = apkPackageName;
     }
 
-    public void setLogLevel(LogUtils.LOG_LEVEL logLevel) {
-        this.logLevel = logLevel;
+    public void setApkPackageName(String apkPackageName) {
+        this.apkPackageName = apkPackageName;
     }
 
-    public LogUtils.LOG_LEVEL getLogLevel() {
-        return logLevel;
+    public String getApkPackageName() {
+        return apkPackageName;
     }
 
+
+
     @Override
     public String getName() {
-        return LogUtilsBean.class.getName();
+        return APKModel.class.getName();
     }
 
     @Override
     public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
         super.writeThisToJsonWriter(jsonWriter);
-        LogUtilsBean bean = this;
-        jsonWriter.name("logLevel").value(bean.getLogLevel().ordinal());
+        jsonWriter.name("appPackageName").value(getApkPackageName());
+
     }
 
     @Override
     public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
         if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
-            if (name.equals("logLevel")) {
-                setLogLevel(LogUtils.LOG_LEVEL.values()[jsonReader.nextInt()]);
+            if (name.equals("appPackageName")) {
+                setApkPackageName(jsonReader.nextString());
             } else {
                 return false;
             }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/AppConfigs.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.autoinstaller.beans;
+package cc.winboll.studio.autoinstaller.models;
 
 /**
  * @Author ZhanGSKen@QQ.COM
@@ -8,13 +8,14 @@ package cc.winboll.studio.autoinstaller.beans;
 import android.content.Context;
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.autoinstaller.beans.AppConfigs;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.utils.FileUtil;
+import cc.winboll.studio.libappbase.LogUtils;
+import com.hjq.toast.ToastUtils;
 import java.io.IOException;
 import java.io.Serializable;
 import java.io.StringReader;
 import java.io.StringWriter;
-import cc.winboll.studio.shared.log.LogUtils;
 
 public class AppConfigs implements Serializable {
 
@@ -26,6 +27,21 @@ public class AppConfigs implements Serializable {
         NEWAPKINFONEWAPKINFO  // 调用[应用信息查看器]打开应用包
         };
 
+    static volatile AppConfigs _AppConfigs;
+    Context mContext;
+
+    AppConfigs(Context context) {
+        mContext = context.getApplicationContext();
+    }
+
+    public static synchronized AppConfigs getInstance(Context context) {
+        if (_AppConfigs == null) {
+            _AppConfigs = new AppConfigs(context);
+            _AppConfigs.loadAppConfigs(_AppConfigs.mContext);
+        }
+        return _AppConfigs;
+    }
+
     // 监控文件路径
     private String watchingFilePath = "";
 
@@ -85,8 +101,8 @@ public class AppConfigs implements Serializable {
         return "";
     }
 
-    public static AppConfigs parseAppConfigs(String szAppConfigs) {
-        AppConfigs appConfigs = new AppConfigs();
+    public AppConfigs parseAppConfigs(String szAppConfigs) {
+        AppConfigs appConfigs = new AppConfigs(mContext);
         // 创建 JsonWriter 对象
         StringReader stringReader = new StringReader(szAppConfigs);
         JsonReader jsonReader = new
@@ -121,20 +137,35 @@ public class AppConfigs implements Serializable {
     static String getDataPath(Context context) {
         return context.getExternalFilesDir(TAG) + "/" + TAG + ".json";
     }
-
-    public static AppConfigs loadAppConfigs(Context context) {
+    
+    public AppConfigs loadAppConfigs() {
         AppConfigs appConfigs = null;
         try {
-            String szJson = FileUtil.readFile(getDataPath(context));
-            appConfigs = AppConfigs.parseAppConfigs(szJson);
+            String szJson = FileUtil.readFile(getDataPath(mContext));
+            appConfigs = AppConfigs.getInstance(mContext).parseAppConfigs(szJson);
         } catch (IOException e) {
             LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
         }
         return appConfigs;
     }
 
-    public static void saveAppConfigs(Context context, AppConfigs appConfigs) {
+    public AppConfigs loadAppConfigs(Context context) {
+        AppConfigs appConfigs = null;
         try {
+            String szJson = FileUtil.readFile(getDataPath(context.getApplicationContext()));
+            appConfigs = AppConfigs.getInstance(mContext).parseAppConfigs(szJson);
+            if(appConfigs != null) {
+                _AppConfigs = appConfigs;
+            }
+        } catch (IOException e) {
+            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
+        }
+        return _AppConfigs;
+    }
+
+    public void saveAppConfigs(Context context, AppConfigs appConfigs) {
+        try {
+            ToastUtils.show(String.format("AppConfigs set enable service to %s", appConfigs.isEnableService()));
             //LogUtils.d(TAG, "appConfigs is : " + appConfigs.toString());
             String szJson = appConfigs.toString();
             FileUtil.writeFile(getDataPath(context), szJson);
@@ -142,4 +173,8 @@ public class AppConfigs implements Serializable {
             LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
         }
     }
+
+    public void saveAppConfigs() {
+        saveAppConfigs(mContext, this);
+    }
 }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/MainServiceBean.java

@@ -1,23 +1,22 @@
-package cc.winboll.studio.libapputils.service;
-import android.content.Context;
+package cc.winboll.studio.autoinstaller.models;
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.libapputils.bean.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
 /**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/12/08 19:44:57
- * @Describe WinBollService 运行参数配置
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/04/15 09:27:39
+ * @Describe MainServiceBean
  */
-public class WinBollClientServiceBean extends BaseBean {
+public class MainServiceBean extends BaseBean {
 
-    public static final String TAG = "WinBollClientServiceBean";
+    public static final String TAG = "MainServiceBean";
 
-    volatile boolean isEnable;
+    boolean isEnable;
 
-    public WinBollClientServiceBean() {
-        isEnable = false;
+    public MainServiceBean() {
+        this.isEnable = false;
     }
 
     public void setIsEnable(boolean isEnable) {
@@ -30,14 +29,14 @@ public class WinBollClientServiceBean extends BaseBean {
 
     @Override
     public String getName() {
-        return WinBollClientServiceBean.class.getName();
+        return MainServiceBean.class.getName();
     }
 
     @Override
     public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
         super.writeThisToJsonWriter(jsonWriter);
-        WinBollClientServiceBean bean = this;
-        jsonWriter.name("isEnable").value(bean.isEnable());
+        jsonWriter.name("isEnable").value(isEnable());
+
     }
 
     @Override
@@ -65,13 +64,4 @@ public class WinBollClientServiceBean extends BaseBean {
         jsonReader.endObject();
         return this;
     }
-
-    public static WinBollClientServiceBean loadWinBollClientServiceBean(Context context) {
-        WinBollClientServiceBean bean = WinBollClientServiceBean.loadBean(context, WinBollClientServiceBean.class);
-        return bean == null ? new WinBollClientServiceBean() : bean;
-    }
-
-    public static boolean saveWinBollServiceBean(WinBollClientService service, WinBollClientServiceBean bean) {
-        return WinBollClientServiceBean.saveBean(service, bean);
-    }
 }

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

@@ -4,9 +4,9 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import cc.winboll.studio.autoinstaller.beans.AppConfigs;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.services.MainService;
-import cc.winboll.studio.shared.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 
 /**
  * @Author ZhanGSKen@QQ.COM
@@ -23,7 +23,7 @@ public class MainReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         String szAction = intent.getAction();
         if (szAction.equals(ACTION_BOOT_COMPLETED)) {
-            AppConfigs appConfigs = AppConfigs.loadAppConfigs(context);
+            AppConfigs appConfigs = AppConfigs.getInstance(context).loadAppConfigs(context);
             if (appConfigs.isEnableService()) {
                 Intent intentService = new Intent(context, MainService.class);
                 //intentService.putExtra(MainService.EXTRA_APKFILEPATH, appConfigs.getWatchingFilePath());

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/AssistantService.java

@@ -6,7 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import cc.winboll.studio.autoinstaller.beans.AppConfigs;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.utils.ServiceUtil;
 
 /**
@@ -46,7 +46,7 @@ public class AssistantService extends Service {
     public int onStartCommand(Intent intent, int flags, int startId) {
         //LogUtils.d(TAG, "call onStartCommand(...)");
         run();
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(AssistantService.this);
+        AppConfigs appConfigs = AppConfigs.getInstance(AssistantService.this).loadAppConfigs(AssistantService.this);
         return appConfigs.isEnableService() ? Service.START_STICKY: super.onStartCommand(intent, flags, startId);
     }
 
@@ -68,7 +68,7 @@ public class AssistantService extends Service {
     //
     void run() {
         //LogUtils.d(TAG, "call run()");
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(AssistantService.this);
+        AppConfigs appConfigs = AppConfigs.getInstance(AssistantService.this).loadAppConfigs(AssistantService.this);
         if (appConfigs.isEnableService()) {
             if (mIsThreadAlive == false) {
                 // 设置运行状态
@@ -101,7 +101,7 @@ public class AssistantService extends Service {
         @Override
         public void onServiceDisconnected(ComponentName name) {
             //LogUtils.d(TAG, "call onServiceDisconnected(...)");
-            AppConfigs appConfigs = AppConfigs.loadAppConfigs(AssistantService.this);
+            AppConfigs appConfigs = AppConfigs.getInstance(AssistantService.this).loadAppConfigs(AssistantService.this);
             if (appConfigs.isEnableService()) {
                 wakeupAndBindMain();
             }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/MainService.java

@@ -10,25 +10,32 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.TileService;
 import android.widget.Toast;
 import androidx.core.content.FileProvider;
-import cc.winboll.studio.shared.log.LogUtils;
 import cc.winboll.studio.autoinstaller.FileListener;
 import cc.winboll.studio.autoinstaller.MainActivity;
-import cc.winboll.studio.autoinstaller.beans.AppConfigs;
+import cc.winboll.studio.autoinstaller.R;
+import cc.winboll.studio.autoinstaller.models.APKModel;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.services.AssistantService;
 import cc.winboll.studio.autoinstaller.services.MainService;
 import cc.winboll.studio.autoinstaller.utils.NotificationUtil;
 import cc.winboll.studio.autoinstaller.utils.PackageUtil;
 import cc.winboll.studio.autoinstaller.utils.ServiceUtil;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 import java.io.File;
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 
 public class MainService extends Service {
 
     public static String TAG = "MainService";
+    
+    Context mContext;
 
+    ArrayList<APKModel> _APKModelList = new ArrayList<APKModel>();
     private static boolean _mIsServiceAlive;
     //String mszAPKFilePath;
     //String mszAPKFileName;
@@ -47,6 +54,7 @@ public class MainService extends Service {
     @Override
     public void onCreate() {
         super.onCreate();
+        mContext = this;
         LogUtils.d(TAG, "onCreate()");
         _mIsServiceAlive = false;
         mHandler = new MyHandler(MainService.this);
@@ -55,11 +63,14 @@ public class MainService extends Service {
         }
 
         run();
+        
+        // 初始化磁贴工具服务
+        MainTileService mainTileService = new MainTileService(this);
     }
 
     private void run() {
 
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(MainService.this);
+        AppConfigs appConfigs = AppConfigs.getInstance(MainService.this).loadAppConfigs(MainService.this);
         if (appConfigs.isEnableService()) {
             if (_mIsServiceAlive == false) {
                 // 设置运行状态
@@ -74,7 +85,8 @@ public class MainService extends Service {
 
                 startWatchingFile(appConfigs.getWatchingFilePath());
 
-                LogUtils.d(TAG, "running...");
+                //LogUtils.d(TAG, "running...");
+                //ToastUtils.show("running...");
 
             } else {
                 LogUtils.d(TAG, "_mIsServiceAlive is " + Boolean.toString(_mIsServiceAlive));
@@ -94,6 +106,7 @@ public class MainService extends Service {
         }
         _mIsServiceAlive = false;
         LogUtils.d(TAG, "onDestroy()");
+        mContext = null;
     }
 
     @Override
@@ -101,7 +114,7 @@ public class MainService extends Service {
         LogUtils.d(TAG, "onStartCommand");
 
         run();
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(MainService.this);
+        AppConfigs appConfigs = AppConfigs.getInstance(MainService.this).loadAppConfigs(MainService.this);
 
         return appConfigs.isEnableService() ? Service.START_STICKY: super.onStartCommand(intent, flags, startId);
     }
@@ -118,7 +131,7 @@ public class MainService extends Service {
         @Override
         public void onServiceDisconnected(ComponentName name) {
             //LogUtils.d(TAG, "call onServiceConnected(...)");
-            AppConfigs appConfigs = AppConfigs.loadAppConfigs(MainService.this);
+            AppConfigs appConfigs = AppConfigs.getInstance(MainService.this).loadAppConfigs(MainService.this);
             if (appConfigs.isEnableService()) {
                 // 唤醒守护进程
                 wakeupAndBindAssistant();
@@ -160,7 +173,7 @@ public class MainService extends Service {
 
                     });
                 mFileListener.startWatching();
-                ToastUtils.show("Start watching.");
+                //ToastUtils.show("Start watching.");
             } else {
                 // 父级文件夹不存在，就提示用户
                 Toast.makeText(getApplication(), fParentDir.toString() + " no exist.", Toast.LENGTH_SHORT).show();
@@ -176,6 +189,9 @@ public class MainService extends Service {
     // 调用[应用信息查看器]打开应用包
     //
     private void installAPK(String szAPKFilePath) {
+        String szAPKPackageName = PackageUtil.getPackageNameFromApk(this, szAPKFilePath);
+        saveAPKInfo(szAPKPackageName);
+
         long nTimeNow = System.currentTimeMillis();
         /*SimpleDateFormat dateFormat = new SimpleDateFormat(
          "yyyy-MM-dd HH:mm:ss", Locale.getDefault());
@@ -210,15 +226,24 @@ public class MainService extends Service {
     //
     void installAPK2(String szAPKFilePath) {
         LogUtils.d(TAG, "installAPK2()");
+        String szAPKPackageName = PackageUtil.getPackageNameFromApk(this, szAPKFilePath);
+        saveAPKInfo(szAPKPackageName);
+
         Intent intent = new Intent(this, MainActivity.class);
         intent.setAction(MainActivity.ACTION_NEW_INSTALLTASK);
-        intent.putExtra(MainActivity.EXTRA_INSTALLED_PACKAGENAME, PackageUtil.getPackageNameFromApk(this, szAPKFilePath));
+        intent.putExtra(MainActivity.EXTRA_INSTALLED_PACKAGENAME, szAPKPackageName);
         intent.putExtra(MainActivity.EXTRA_INSTALLED_APKFILEPATH, szAPKFilePath);
         // Intent.ACTION_VIEW);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         this.startActivity(intent);
     }
 
+    void saveAPKInfo(String szApkPackageName) {
+        APKModel.loadBeanList(this, _APKModelList, APKModel.class);
+        _APKModelList.add(new APKModel(szApkPackageName));
+        APKModel.saveBeanList(this, _APKModelList, APKModel.class);
+    }
+
     // 
     //
     static class MyHandler extends Handler {
@@ -231,7 +256,7 @@ public class MainService extends Service {
             switch (message.what) {
                 case MSG_INSTALL_APK:
                     {
-                        AppConfigs appConfigs = AppConfigs.loadAppConfigs(theActivity);
+                        AppConfigs appConfigs = AppConfigs.getInstance(theActivity).loadAppConfigs(theActivity);
                         if (appConfigs.getSetupMode() == AppConfigs.SetupMode.WATCHOUTPUTINSTALLER) {
                             theActivity.installAPK2((String)message.obj);
                         } else if (appConfigs.getSetupMode() == AppConfigs.SetupMode.NEWAPKINFONEWAPKINFO) {
@@ -245,4 +270,21 @@ public class MainService extends Service {
             super.handleMessage(message);
         }
 	}
+
+    static class MainTileService extends TileService {
+        Context mContext;
+        MainTileService(Context context) {
+            mContext = context;
+        }
+
+        @Override
+        public void onStartListening() {
+            super.onStartListening();
+            Tile tile = getQsTile();
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(this, R.drawable.ic_android));
+            // 更新磁贴状态
+            tile.setState((mContext == null || mContext.getApplicationContext() == null )?Tile.STATE_INACTIVE: Tile.STATE_ACTIVE);
+            tile.updateTile();
+        }
+    }
 }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/NotificationUtil.java

@@ -55,8 +55,9 @@ public class NotificationUtil {
 
         Notification mForegroundNotification = new Notification.Builder(service, szServiceChannelID)
             .setAutoCancel(true)
-            .setContentTitle(service.getString(R.string.app_name))
-            .setContentText(service.TAG + " is started.")
+            //.setContentTitle(service.getString(R.string.app_name))
+            .setContentTitle(service.TAG + " is started.")
+            //.setContentText(service.TAG + " is started.")
             .setWhen(System.currentTimeMillis())
             .setSmallIcon(R.drawable.ic_launcher)
             //设置红色

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/PackageUtil.java

@@ -6,9 +6,11 @@ package cc.winboll.studio.autoinstaller.utils;
  * @Describe 一个获取安卓APK安装文件的应用包名的函数
  */
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import cc.winboll.studio.shared.log.LogUtils;
+import android.content.pm.ResolveInfo;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class PackageUtil {
 
@@ -27,4 +29,20 @@ public class PackageUtil {
         }
         return "";
     }
+
+    public static void openAPP(Context context, String packageName) {
+        // 这里假设要打开微信，微信的包名是com.tencent.mm
+        //String packageName = "com.tencent.mm"; 
+        LogUtils.d(TAG, "packageName : " + packageName);
+        PackageManager packageManager = context.getPackageManager();
+        Intent intent = packageManager.getLaunchIntentForPackage(packageName);
+        if (intent != null) {
+            ResolveInfo resolveInfo = packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
+            if (resolveInfo != null) {
+                LogUtils.d(TAG, "startActivity...");
+                context.startActivity(intent);
+            }
+        }
+
+    }
 }

autoinstaller/src/main/res/drawable/ic_android.xml

@@ -5,6 +5,7 @@
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="#FF000000"
         android:pathData="M16.61,15.15C16.15,15.15 15.77,14.78 15.77,14.32S16.15,13.5 16.61,13.5H16.61C17.07,13.5 17.45,13.86 17.45,14.32C17.45,14.78 17.07,15.15 16.61,15.15M7.41,15.15C6.95,15.15 6.57,14.78 6.57,14.32C6.57,13.86 6.95,13.5 7.41,13.5H7.41C7.87,13.5 8.24,13.86 8.24,14.32C8.24,14.78 7.87,15.15 7.41,15.15M16.91,10.14L18.58,7.26C18.67,7.09 18.61,6.88 18.45,6.79C18.28,6.69 18.07,6.75 18,6.92L16.29,9.83C14.95,9.22 13.5,8.9 12,8.91C10.47,8.91 9,9.24 7.73,9.82L6.04,6.91C5.95,6.74 5.74,6.68 5.57,6.78C5.4,6.87 5.35,7.08 5.44,7.25L7.1,10.13C4.25,11.69 2.29,14.58 2,18H22C21.72,14.59 19.77,11.7 16.91,10.14H16.91Z"/>
+
 </vector>

autoinstaller/src/main/res/drawable/ic_cloud.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M6.5,20Q4.22,20 2.61,18.43 1,16.85 1,14.58 1,12.63 2.17,11.1 3.35,9.57 5.25,9.15 5.88,6.85 7.75,5.43 9.63,4 12,4 14.93,4 16.96,6.04 19,8.07 19,11 20.73,11.2 21.86,12.5 23,13.78 23,15.5 23,17.38 21.69,18.69 20.38,20 18.5,20Z"/>
+
+</vector>

autoinstaller/src/main/res/drawable/ic_cloud_outline.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M6.5,20Q4.22,20 2.61,18.43 1,16.85 1,14.58 1,12.63 2.17,11.1 3.35,9.57 5.25,9.15 5.88,6.85 7.75,5.43 9.63,4 12,4 14.93,4 16.96,6.04 19,8.07 19,11 20.73,11.2 21.86,12.5 23,13.78 23,15.5 23,17.38 21.69,18.69 20.38,20 18.5,20M6.5,18H18.5Q19.55,18 20.27,17.27 21,16.55 21,15.5 21,14.45 20.27,13.73 19.55,13 18.5,13H17V11Q17,8.93 15.54,7.46 14.08,6 12,6 9.93,6 8.46,7.46 7,8.93 7,11H6.5Q5.05,11 4.03,12.03 3,13.05 3,14.5 3,15.95 4.03,17 5.05,18 6.5,18M12,12Z"/>
+
+</vector>

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

@@ -132,7 +132,7 @@
 
 	</LinearLayout>
 
-	<cc.winboll.studio.shared.log.LogView
+	<cc.winboll.studio.libappbase.LogView
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
 		android:layout_height="200dp"

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

@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">AutoInstaller</string>
+    <string name="tileservice_name">AutoInstaller</string>
 </resources>

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

@@ -0,0 +1,13 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="MyAppTheme" parent="APPBaseTheme">
+        <item name="attrColorPrimary">@color/colorPrimary</item>
+        <item name="themeGlobalCrashActivity">@style/MyGlobalCrashActivityTheme</item>
+    </style>
+
+    <style name="MyGlobalCrashActivityTheme" parent="GlobalCrashActivityTheme">
+        <item name="colorTittle">#FFFFFFFF</item>
+        <item name="colorTittleBackgound">#FF00A4B3</item>
+        <item name="colorText">#FFFFFFFF</item>
+        <item name="colorTextBackgound">#FF000000</item>
+	</style>
+</resources>