移除WinBoLL应用模块

.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
                 

LICENSE

@@ -1,73 +1,201 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-1. Definitions.
+   1. Definitions.
 
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
 
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
 
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
 
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
 
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
 
-     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
 
-     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
 
-     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
 
-     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
 
-     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
 
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
 
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
 
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
 
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
 
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
 
-END OF TERMS AND CONDITIONS
+   END OF TERMS AND CONDITIONS
 
-APPENDIX: How to apply the Apache License to your work.
+   APPENDIX: How to apply the Apache License to your work.
 
-To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
 
-Copyright 2024 ZhanGSKen
+   Copyright [yyyy] [name of copyright owner]
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,23 +1,27 @@
-# ☁ ☁ ☁ WinBoll APP ☁ ☁ ☁ ☁ ☁ ☁   ☁ ☁   ☁  ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁ ☁ 
-# ☁    ☁ 这是 WinBoll 系列 APP 汇总项目。☁ ☁   ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁  ☁ ☁ ☁ 
-# ☁ ☁ ☁ WinBoll 网站地址 https://www.winboll.cc/studio/app/ ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
+# OriginMaster
+【OriginMaster】WinBoLL 源生态计划。正如话，我需要一个 Point, 去撬动成个地球。
 
-## WinBoll 提问
+########
+## ☁ ☁ ☁ WinBoLL APP ☁ ☁ ☁ ☁ ☁ ☁   ☁ ☁   ☁  ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁ ☁ 
+# ☁    ☁ WinBoLL Studio Android 应用开源项目。☁ ☁   ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁ ☁  ☁ ☁ ☁ 
+# ☁ ☁ ☁ WinBoLL 网站地址 https://www.winboll.cc/ ☁ ☁ ☁ ☁  ☁ ☁ ☁ ☁
+
+## WinBoLL 提问
 同样是 /sdcard 目录，在开发 Android 应用时，
 能否实现手机编译与电脑编译的源码同步。
-☁因而 WinBoll 项目组诞生了。
+☁因而 WinBoLL 项目组诞生了。
 
-## WinBoll 项目组研发计划
-致力于把 WinBoll-APP 应用在手机端 Android 项目开发。
-也在探索 https://gitea.winboll.cc/<WinBoll 项目组>/APP.git 应用于 WinBoll-APP APK 分发。
-更想进阶 https://github.com/<WinBoll 项目组>/APP.git 应用于 WinBoll-APP Beta APK 分发。
+## WinBoLL 项目组研发计划
+致力于把 WinBoLL-APP 应用在手机端 Android 项目开发。
+也在探索 https://gitea.winboll.cc/<WinBoLL 项目组>/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 +44,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 为： J。
-☁ WinBoll 用户组 Group ID 为： Studio。
-☁ WinBoll 主机 WinBoll 1Panel Gitea 建立 WinBoll 工作组。
-☁ WinBoll 主机 WinBoll 1Panel Gitea 用户项目 APK 编译输出目录为 /sdcard/WinBollStudio/<用户名>/APKs/
-☁ WinBoll 项目配置文件示例为 "<WinBoll 项目根目录>/.winboll/winboll.properties-demo"(WinBoll 项目已设置)
-☁ WinBoll 项目配置文件为 "<WinBoll 项目根目录>/.winboll/winboll.properties"
-☁ WinBoll 项目配置文件设定为源码提交时忽略。(WinBoll 项目已设置)
-☁ Gradle 项目配置文件示例为 "<WinBoll 项目根目录>/.winboll/local.properties-demo"(WinBoll 项目已设置)
-☁ Gradle 项目配置文件为 "<WinBoll 项目根目录>/local.properties"(WinBoll 项目已设置)
-☁ Gradle 项目配置文件设定为源码提交时忽略。(WinBoll 项目已设置)
+### ☁ 急急停 ☁ WinBoLL 应用前置条件
+☁ WinBoLL 主机建立 1Panel MySQL 应用。
+☁ WinBoLL 主机建立 1Panel Gitea 应用。
+☁ WinBoLL 主机设置 WinBoLL 应用为非登录状态。
+☁ WinBoLL 主机建立 WinBoLL 账户与 WinBoLL 用户组。
+☁ WinBoLL 账户 User ID 为： 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/studio/app.git中。
-☁ WinBoll 主机提供 WinBoll 1Panel Gitea 应用的 WinBoll 项目源码仓库存取功能。（Gitea 应用已提供）
-☁ WinBoll 主机提供 WinBoll Gitea 项目仓库存档功能。（Gitea 应用已提供）
-☁ 提供 WinBoll 客户端用户登录功能。（Gitea 应用已提供）
+☁ WinBoLL 项目源码仓库托管在 WinBoLL 1Panel Gitea 目录 /opt/1panel/apps/gitea/gitea/data/git/repositories/studio/app.git中。
+☁ WinBoLL 主机提供 WinBoLL 1Panel Gitea 应用的 WinBoLL 项目源码仓库存取功能。（Gitea 应用已提供）
+☁ WinBoLL 主机提供 WinBoLL Gitea 项目仓库存档功能。（Gitea 应用已提供）
+☁ 提供 WinBoLL 客户端用户登录功能。（Gitea 应用已提供）
 
 ### ☁ 看远方 ☁ ###
-### ☁ 心忧虑 ☁ WinBoll-APP 应用前置需求
-☁ WinBoll-APP WinBoll 项目根目录设定为手机的 /sdcard/WinBollStudio/Sources 目录。（需要用户手动建立文件夹）
-☁ WinBoll-APP 具有手机 /sdcard/WinBoll 目录的存储权限。（需要手机操作系统授权）
-☁ WinBoll-APP WinBoll 项目仓库源码存储路径为 /sdcard/WinBollStudio/Sources/APP.git（需要用户手动建立文件夹）
-☁ WinBoll-APP 项目 APK 编译输出目录为 /sdcard/WinBollStudio/APKs/
-☁ WinBoll-APP 应用签名验证可定制化。（WinBoll 项目已提供）
-☁ WinBoll-APP 与系列衍生 APP 应用共享 cc.winboll.studio 命名空间资源。（WinBoll 项目已提供）
-☁ WinBoll-APP 用户客户端信息存储在命名空间为 WinBoll APP MySQLLite 应用的 winbollappclient 数据库中。
-☁ WinBoll-APP MySQLLite 应用的 winbollappclient 数据库中， 
-   WinBoll 用户客户端信息设定为：
+### ☁ 心忧虑 ☁ WinBoLL-APP 应用前置需求
+☁ WinBoLL-APP WinBoLL 项目根目录设定为手机的 /sdcard/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/WinBollStudio/Sources 的 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 +125,12 @@
 设置属性 libraryProject=<类库项目模块文件夹名称>
 ### 再编译测试项目
 $ bash .winboll/bashPublishAPKAddTag.sh <应用项目模块文件夹名称>
-#### 测试项目编译后，编译器会复制一份 APK 到以下路径："/sdcard/WinBollStudio/APKs/<项目根目录名称>/tag/" 文件夹。
+#### 测试项目编译后，编译器会复制一份 APK 到以下路径："/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/" 文件夹。
 ### 最后编译类库项目
 $ bash .winboll/bashPublishLIBAddTag.sh <类库项目模块文件夹名称>
-#### 类库模块编译命令执行后，编译器会发布到 WinBoll Nexus Maven 库：Maven 库地址可以参阅根项目目录配置 build.gradle 文件。
+#### 类库模块编译命令执行后，编译器会发布到 WinBoLL Nexus Maven 库：Maven 库地址可以参阅根项目目录配置 build.gradle 文件。
              
 # ☆应用型项目编译方法
 ## 直接调用以下命令编译应用型项目
 $ bash .winboll/bashPublishAPKAddTag.sh <应用项目模块文件夹名称>
-#### 应用模块编译命令执行后，编译器会复制一份 APK 到以下路径："/sdcard/WinBollStudio/APKs/<项目根目录名称>/tag/" 文件夹。
+#### 应用模块编译命令执行后，编译器会复制一份 APK 到以下路径："/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/" 文件夹。

aes/build.gradle

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

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 11:14:05 HKT 2025
-stageCount=7
+#Tue May 13 11:22:39 HKT 2025
+stageCount=1
 libraryProject=libaes
-baseVersion=15.2
-publishVersion=15.2.6
+baseVersion=15.8
+publishVersion=15.8.0
 buildCount=0
-baseBetaVersion=15.2.7
+baseBetaVersion=15.8.1

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.aes;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/24 23:52:29
  * @Describe AES应用介绍窗口
  */
@@ -15,9 +15,9 @@ import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libaes.winboll.AboutView;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class AboutActivity extends WinBollActivity implements IWinBollActivity {
+public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity {
 
     public static final String TAG = "AboutActivity";
 
@@ -64,13 +64,13 @@ public class AboutActivity extends WinBollActivity implements IWinBollActivity {
         );
         layout.addView(aboutView, params);
 
-        GlobalApplication.getWinBollActivityManager().add(this);
+        GlobalApplication.getWinBoLLActivityManager().add(this);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        GlobalApplication.getWinBollActivityManager().registeRemove(this);
+        GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
     }
 
     public AboutView CreateAboutView() {

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

@@ -1,13 +1,14 @@
 package cc.winboll.studio.aes;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @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 {
@@ -21,8 +22,8 @@ public class App extends GlobalApplication {
         // 初始化 Toast 框架
         ToastUtils.init(this);
         // 设置 Toast 布局样式
-        ToastUtils.setView(R.layout.view_toast);
-        //ToastUtils.setStyle(new WhiteToastStyle());
+        //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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.aes;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2024/06/13 19:05:52
  * @Describe 应用主窗口
  */
@@ -25,12 +25,12 @@ import cc.winboll.studio.libaes.unittests.TestAToolbarActivity;
 import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity;
 import cc.winboll.studio.libaes.unittests.TestViewPageFragment;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import com.a4455jkjh.colorpicker.ColorPickerDialog;
 import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
 
-public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity {
+public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity {
 
 
     public static final String TAG = "MainActivity";
@@ -123,7 +123,7 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBollActi
     public boolean onOptionsItemSelected(MenuItem item) {
         int nItemId = item.getItemId();
 //        if (item.getItemId() == R.id.item_log) {
-//            WinBollActivityManager.getInstance(this).startWinBollActivity(getApplicationContext(), LogActivity.class);
+//            WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(getApplicationContext(), LogActivity.class);
 //        } else 
         if (nItemId == R.id.item_atoast) {
             Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();

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

@@ -1,60 +0,0 @@
-package cc.winboll.studio.aes;
-
-import android.app.Activity;
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import cc.winboll.studio.libaes.beans.AESThemeBean;
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import android.view.MenuItem;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/30 00:34:02
- * @Describe WinBoll 活动窗口通用基类
- */
-public class WinBollActivity extends AppCompatActivity implements IWinBollActivity {
-
-    public static final String TAG = "WinBollActivity";
-
-    protected volatile AESThemeBean.ThemeType mThemeType;
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        mThemeType = getThemeType();
-        setThemeStyle();
-        super.onCreate(savedInstanceState);
-    }
-
-    AESThemeBean.ThemeType getThemeType() {
-        /*SharedPreferences sharedPreferences = getSharedPreferences(
-         SHAREDPREFERENCES_NAME, MODE_PRIVATE);
-         return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))];
-         */
-        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
-    }
-
-    void setThemeStyle() {
-        //setTheme(AESThemeBean.getThemeStyle(getThemeType()));
-        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if(item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-}

androiddemo/build.gradle

@@ -24,7 +24,7 @@ android {
     defaultConfig {
         applicationId "cc.winboll.studio.androiddemo"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
@@ -67,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:libapputils:15.2.2'
-    api 'cc.winboll.studio:libappbase:15.2.2'
+    api 'cc.winboll.studio:libapputils:15.8.1'
+    api 'cc.winboll.studio:libappbase:15.8.0'
 }

androiddemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 03:17:18 GMT 2025
+#Tue May 13 03:42:51 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=21
+buildCount=24
 baseBetaVersion=15.0.1

androidxdemo/build.gradle

@@ -24,7 +24,7 @@ android {
     defaultConfig {
         applicationId "cc.winboll.studio.androidxdemo"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
@@ -67,7 +67,7 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
     
-    api 'cc.winboll.studio:libaes:15.2.6'
-    api 'cc.winboll.studio:libapputils:15.2.2'
-    api 'cc.winboll.studio:libappbase:15.2.2'
+    api 'cc.winboll.studio:libaes:15.8.0'
+    api 'cc.winboll.studio:libapputils:15.8.1'
+    api 'cc.winboll.studio:libappbase:15.8.0'
 }

androidxdemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Apr 03 03:15:55 GMT 2025
+#Tue May 13 03:44:11 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=18
+buildCount=20
 baseBetaVersion=15.0.1

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

@@ -22,9 +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 com.hjq.toast.style.WhiteToastStyle;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -53,8 +53,8 @@ public class App extends GlobalApplication {
         // 初始化 Toast 框架
         ToastUtils.init(this);
         // 设置 Toast 布局样式
-        ToastUtils.setView(R.layout.view_toast);
-        //ToastUtils.setStyle(new WhiteToastStyle());
+        //ToastUtils.setView(R.layout.view_toast);
+        ToastUtils.setStyle(new WhiteToastStyle());
         ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
         
         //CrashHandler.getInstance().registerGlobal(this);

appbase/build.gradle

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

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Apr 27 11:03:35 HKT 2025
-stageCount=9
+#Tue May 13 11:05:12 HKT 2025
+stageCount=1
 libraryProject=libappbase
-baseVersion=15.4
-publishVersion=15.4.8
+baseVersion=15.8
+publishVersion=15.8.0
 buildCount=0
-baseBetaVersion=15.4.9
+baseBetaVersion=15.8.1

appbase/src/main/AndroidManifest.xml

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

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/01/05 09:54:42
  * @Describe APPbase 应用类
  */

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

@@ -11,6 +11,7 @@ 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.activities.WinBoLLActivity;
 import cc.winboll.studio.appbase.services.MainService;
 import cc.winboll.studio.appbase.services.TestDemoBindService;
 import cc.winboll.studio.appbase.services.TestDemoService;
@@ -18,12 +19,13 @@ 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.LogView;
 import cc.winboll.studio.libappbase.sos.SOS;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.widgets.StatusWidget;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class MainActivity extends WinBollActivityBase implements IWinBollActivity {
+public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
 
     public static final String TAG = "MainActivity";
 
@@ -38,7 +40,7 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit
     }
 
     Toolbar mToolbar;
-    //LogView mLogView;
+    LogView mLogView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -51,12 +53,8 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit
 
         CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
         cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
-        //mLogView = findViewById(R.id.activitymainLogView1);
-
-//        if (GlobalApplication.isDebuging()) {
-//            mLogView.start(); 
-//            ToastUtils.show("LogView start.");
-//        }
+        mLogView = findViewById(R.id.logview);
+        mLogView.start(); 
     }
 
     @Override
@@ -72,8 +70,6 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit
         return super.onOptionsItemSelected(item);
     }
 
-
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -87,7 +83,7 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit
         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...");
@@ -137,8 +133,6 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit
         startService(intent);
 
     }
-    
-    
 
     public void onStopTestDemoService(View view) {
         Intent intent = new Intent(this, TestDemoService.class);
@@ -176,8 +170,14 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit
     }
 
     public void onTestOpenNewActivity(View view) {
-        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, NewActivity.class);
+        GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, NewActivity.class);
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+    
     
 }

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/13 19:30:10
  */
 import android.content.Context;

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

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

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.activities;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/25 11:46:40
  * @Describe 测试窗口2
  */
@@ -12,11 +12,10 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.appbase.WinBollActivityBase;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class New2Activity extends WinBollActivityBase implements IWinBollActivity {
+public class New2Activity extends WinBoLLActivity implements IWinBoLLActivity {
 
     public static final String TAG = "New2Activity";
 
@@ -52,15 +51,15 @@ public class New2Activity extends WinBollActivityBase implements IWinBollActivit
     }
 
     public void onCloseThisActivity(View view) {
-        GlobalApplication.getWinBollActivityManager().finish(this);
+        GlobalApplication.getWinBoLLActivityManager().finish(this);
     }
 
     public void onCloseAllActivity(View view) {
-        GlobalApplication.getWinBollActivityManager().finishAll();
+        GlobalApplication.getWinBoLLActivityManager().finishAll();
     }
 
     public void onNewActivity(View view) {
-        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, NewActivity.class);
+        GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, NewActivity.class);
     }
     
 
@@ -74,7 +73,7 @@ public class New2Activity extends WinBollActivityBase implements IWinBollActivit
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
+            //GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
             return true;
         }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.activities;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/25 05:04:22
  */
 import android.app.Activity;
@@ -11,11 +11,10 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.appbase.WinBollActivityBase;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class NewActivity extends WinBollActivityBase implements IWinBollActivity {
+public class NewActivity extends WinBoLLActivity implements IWinBoLLActivity {
 
     public static final String TAG = "NewActivity";
 
@@ -50,15 +49,15 @@ public class NewActivity extends WinBollActivityBase implements IWinBollActivity
     }
 
     public void onCloseThisActivity(View view) {
-        GlobalApplication.getWinBollActivityManager().finish(this);
+        GlobalApplication.getWinBoLLActivityManager().finish(this);
     }
 
     public void onCloseAllActivity(View view) {
-        GlobalApplication.getWinBollActivityManager().finishAll();
+        GlobalApplication.getWinBoLLActivityManager().finishAll();
     }
 
     public void onNew2Activity(View view) {
-        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, New2Activity.class);
+        GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, New2Activity.class);
     }
     
 
@@ -72,7 +71,7 @@ public class NewActivity extends WinBollActivityBase implements IWinBollActivity
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
+            //GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
             return true;
         }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。

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

@@ -0,0 +1,24 @@
+package cc.winboll.studio.appbase.activities;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/05/10 09:48
+ * @Describe WinBoLL 窗口基础类
+ */
+import android.app.Activity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+
+public class WinBoLLActivity extends Activity implements IWinBoLLActivity {
+
+    public static final String TAG = "WinBoLLActivity";
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+}

appbase/src/main/java/cc/winboll/studio/appbase/handlers/MainServiceHandler.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.handlers;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/14 03:51:40
  */
 import android.os.Handler;

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.models;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/13 07:06:13
  */
 import android.util.JsonReader;

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.models;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/07 12:47:22
  * @Describe TestServiceBean
  */

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.models;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/07 12:49:21
  * @Describe TestDemoServiceBean
  */

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.receivers;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/24 07:11:44
  */
 import android.content.BroadcastReceiver;

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.receivers;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/13 06:58:04
  * @Describe 主要广播接收器
  */
@@ -10,16 +10,18 @@ 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.services.MainService;
 import cc.winboll.studio.appbase.widgets.APPNewsWidget;
 import cc.winboll.studio.libappbase.AppUtils;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.sos.APPModel;
+import cc.winboll.studio.libappbase.models.APPModel;
+import cc.winboll.studio.libappbase.models.WinBoLLModel;
+import cc.winboll.studio.libappbase.models.WinBoLLNewsBean;
 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.utils.ToastUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.winboll.WinBoLL;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.text.SimpleDateFormat;
@@ -42,21 +44,21 @@ 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(IWinBoLLActivity.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);
-            LogUtils.d(TAG, String.format("szAPPModel %s", szAPPModel));
-            if (szAPPModel != null && !szAPPModel.equals("")) {
+            String szWinBoLLModel = intent.getStringExtra(WinBoLL.EXTRA_WINBOLLMODEL);
+            LogUtils.d(TAG, String.format("szAPPModel %s", szWinBoLLModel));
+            if (szWinBoLLModel != null && !szWinBoLLModel.equals("")) {
                 try {
-                    APPModel bean = APPModel.parseStringToBean(szAPPModel, APPModel.class);
+                    WinBoLLModel bean = WinBoLLModel.parseStringToBean(szWinBoLLModel, WinBoLLModel.class);
                     if (bean != null) {
                         String szAppPackageName = bean.getAppPackageName();
                         LogUtils.d(TAG, String.format("szAppPackageName %s", szAppPackageName));
                         String szAppMainServiveName = bean.getAppMainServiveName();
                         LogUtils.d(TAG, String.format("szAppMainServiveName %s", szAppMainServiveName));
-                        mwrService.get().bindAPPModelConnection(bean);
+                        mwrService.get().bindWinBoLLModelConnection(bean);
                     }
                 } catch (IOException e) {
                     LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
@@ -80,7 +82,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 +90,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 +112,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/AssistantService.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.services;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/14 03:38:31
  * @Describe 守护进程服务
  */

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.services;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/13 06:56:41
  * @Describe 拨号主服务
  * 参考:
@@ -18,15 +18,16 @@ import android.content.ServiceConnection;
 import android.os.Binder;
 import android.os.IBinder;
 import cc.winboll.studio.appbase.MyTileService;
-import cc.winboll.studio.appbase.models.MainServiceBean;
 import cc.winboll.studio.appbase.handlers.MainServiceHandler;
+import cc.winboll.studio.appbase.models.MainServiceBean;
 import cc.winboll.studio.appbase.receivers.MainReceiver;
 import cc.winboll.studio.appbase.services.AssistantService;
 import cc.winboll.studio.appbase.threads.MainServiceThread;
 import cc.winboll.studio.appbase.widgets.APPNewsWidget;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.models.APPModel;
+import cc.winboll.studio.libappbase.models.WinBoLLModel;
 import java.util.ArrayList;
-import cc.winboll.studio.libappbase.sos.APPModel;
 
 public class MainService extends Service {
 
@@ -182,7 +183,7 @@ public class MainService extends Service {
         }
     }
 
-    public void bindAPPModelConnection(APPModel bean) {
+    public void bindWinBoLLModelConnection(WinBoLLModel bean) {
         LogUtils.d(TAG, "bindAPPModelConnection(...)");
         // 清理旧的绑定链接
         for (int i = mAPPModelConnectionList.size() - 1; i > -1; i--) {
@@ -203,7 +204,7 @@ public class MainService extends Service {
         
         Intent intentWidget = new Intent(this, APPNewsWidget.class);
         intentWidget.setAction(APPNewsWidget.ACTION_WAKEUP_SERVICE);
-        APPModel appSOSBean = new APPModel(bean.getAppPackageName(), bean.getAppMainServiveName());
+        WinBoLLModel appSOSBean = new WinBoLLModel(bean.getAppPackageName(), bean.getAppMainServiveName());
         intentWidget.putExtra("APPSOSBean", appSOSBean.toString());
         sendBroadcast(intentWidget);
     }
@@ -212,7 +213,7 @@ public class MainService extends Service {
 
         ComponentName mComponentName;
 
-        boolean isBindToAPP(APPModel bean) {
+        boolean isBindToAPP(WinBoLLModel bean) {
             return mComponentName != null
                 && mComponentName.getClassName().equals(bean.getAppMainServiveName())
                 && mComponentName.getPackageName().equals(bean.getAppPackageName());

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.services;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/07 12:45:49
  * @Describe 启动时申请绑定到APPBase主服务的服务示例
  */
@@ -10,11 +10,12 @@ import android.content.Context;
 import android.content.Intent;
 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.appbase.App;
+import cc.winboll.studio.appbase.models.TestDemoBindServiceBean;
+import cc.winboll.studio.appbase.services.TestDemoBindService;
+import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.sos.SOS;
+import cc.winboll.studio.libappbase.winboll.WinBoLL;
 
 public class TestDemoBindService extends Service {
 
@@ -156,9 +157,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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.services;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/07 12:39:24
  * @Describe 普通服务示例
  */
@@ -12,7 +12,6 @@ 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;
 
 public class TestDemoService extends Service {
 

appbase/src/main/java/cc/winboll/studio/appbase/threads/MainServiceThread.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.threads;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/14 03:46:44
  */
 import android.content.Context;

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

@@ -1,6 +1,6 @@
 package cc.winboll.studio.appbase.widgets;
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/15 14:41:25
  * @Describe TimeWidget
  */
@@ -12,16 +12,17 @@ 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.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.models.APPModel;
+import cc.winboll.studio.libappbase.models.WinBoLLNewsBean;
+import cc.winboll.studio.libappbase.winboll.WinBoLL;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import cc.winboll.studio.libappbase.models.WinBoLLModel;
 
 public class APPNewsWidget extends AppWidgetProvider {
 
@@ -31,14 +32,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 +48,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,11 +58,11 @@ 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);
-            LogUtils.d(TAG, String.format("szAPPModel %s", szAPPModel));
-            if (szAPPModel != null && !szAPPModel.equals("")) {
+            String szWinBoLLModel = intent.getStringExtra(WinBoLL.EXTRA_WINBOLLMODEL);
+            LogUtils.d(TAG, String.format("szWinBoLLModel %s", szWinBoLLModel));
+            if (szWinBoLLModel != null && !szWinBoLLModel.equals("")) {
                 try {
-                    APPModel bean = APPModel.parseStringToBean(szAPPModel, APPModel.class);
+                    WinBoLLModel bean = WinBoLLModel.parseStringToBean(szWinBoLLModel, WinBoLLModel.class);
                     if (bean != null) {
                         String szAppPackageName = bean.getAppPackageName();
                         LogUtils.d(TAG, String.format("szAppPackageName %s", szAppPackageName));
@@ -71,7 +72,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 +82,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 +100,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 +142,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 +155,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 +166,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 +177,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

@@ -32,7 +32,7 @@
 				<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="Hello, WinBoll!"/>
+					android:text="Hello, WinBoLL!"/>
 
 				<TextView
 					android:layout_width="wrap_content"
@@ -212,5 +212,10 @@
 
 	</ScrollView>
 
+	<cc.winboll.studio.libappbase.LogView
+		android:layout_width="match_parent"
+		android:layout_height="300dp"
+		android:id="@+id/logview"/>
+
 </LinearLayout>
 

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

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

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

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

apputils/build.gradle

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

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Mar 29 12:14:55 HKT 2025
+#Tue May 13 11:18:09 HKT 2025
 stageCount=2
 libraryProject=libapputils
-baseVersion=15.2
-publishVersion=15.2.1
+baseVersion=15.8
+publishVersion=15.8.1
 buildCount=0
-baseBetaVersion=15.2.2
+baseBetaVersion=15.8.2

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.apputils;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2024/12/08 15:10:51
  * @Describe 全局应用类
  */

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.apputils;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/01/03 11:02:49
  * @Describe 一个可以浏览随 APP 附带的 Html 文档的窗口
  */
@@ -15,23 +15,12 @@ import android.view.MenuItem;
 import android.widget.Toolbar;
 import cc.winboll.studio.apputils.R;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import cc.winboll.studio.libapputils.views.SimpleWebView;
 import java.io.IOException;
 import java.io.InputStream;
 
-public class AssetsHtmlActivity extends WinBollActivityBase implements IWinBollActivity {
-
-    @Override
-    public Activity getActivity() {
-        return super.getActivity();
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
+public class AssetsHtmlActivity extends WinBoLLActivity implements IWinBoLLActivity {
 
     public static final String TAG = "AssetsHtmlActivity";
 
@@ -43,12 +32,17 @@ public class AssetsHtmlActivity extends WinBollActivityBase implements IWinBollA
 
     // Assets 文件夹里的 Html 文件的名称
     String mszHtmlFileName;
-//
-//    @Override
-//    public Activity getActivity() {
-//        return this;
-//    }
 
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+    
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         return super.onCreateOptionsMenu(menu);
@@ -57,7 +51,7 @@ public class AssetsHtmlActivity extends WinBollActivityBase implements IWinBollA
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
 //        if (item.getItemId() == android.R.id.home) {
-//            WinBollActivityManager.getInstance(this).finish(this);
+//            WinBoLLActivityManager.getInstance(this).finish(this);
 //        }
         return super.onOptionsItemSelected(item);
     }

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

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

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.apputils;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/01/18 10:32:21
  * @Describe 二维码扫码解码窗口
  */

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.apputils;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/23 16:14:45
  */
 import android.app.Activity;

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

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

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

@@ -0,0 +1,24 @@
+package cc.winboll.studio.apputils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/05/13 11:15
+ * @Describe WinBoLLActivity
+ */
+import android.app.Activity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+
+public class WinBoLLActivity extends Activity implements IWinBoLLActivity {
+
+    public static final String TAG = "WinBoLLActivity";
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+}

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

@@ -1,52 +0,0 @@
-package cc.winboll.studio.apputils;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/28 17:11:37
- * @Describe 应用活动窗口基类
- */
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.PersistableBundle;
-import android.support.v7.app.AppCompatActivity;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
-
-public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity {
-
-    public static final String TAG = "WinBollActivityBase";
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    WinBollActivityManager getWinBollActivityManager() {
-        return WinBollActivityManager.getInstance(GlobalApplication.getInstance());
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        getWinBollActivityManager().add(this);
-    }
-
-    @Override
-    public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
-        super.onPostCreate(savedInstanceState, persistentState);
-    }
-
-
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        getWinBollActivityManager().registeRemove(this);
-    }
-}

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

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

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

@@ -1,27 +1,28 @@
 package cc.winboll.studio.autoinstaller;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2024/04/28 02:39:58
  * @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<zhangsken@188.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

@@ -0,0 +1,75 @@
+package cc.winboll.studio.autoinstaller.models;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/04/02 20:50:29
+ * @Describe 监控的 APK 安装文件对应的应用信息数据模型
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class APKModel extends BaseBean {
+
+    public static final String TAG = "APPModel";
+
+    // 每次更新的 APK 文件对应的应用包名称
+    String apkPackageName;
+
+    public APKModel() {
+        this.apkPackageName = "";
+    }
+
+    public APKModel(String apkPackageName) {
+        this.apkPackageName = apkPackageName;
+    }
+
+    public void setApkPackageName(String apkPackageName) {
+        this.apkPackageName = apkPackageName;
+    }
+
+    public String getApkPackageName() {
+        return apkPackageName;
+    }
+
+
+
+    @Override
+    public String getName() {
+        return APKModel.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        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("appPackageName")) {
+                setApkPackageName(jsonReader.nextString());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}

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

@@ -1,20 +1,21 @@
-package cc.winboll.studio.autoinstaller.beans;
+package cc.winboll.studio.autoinstaller.models;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2024/05/27 17:36:01
  * @Describe 应用配置数据类
  */
 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,24 +1,22 @@
-package cc.winboll.studio.libaes.winboll;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/28 19:05:15
- * @Describe WinBollService 运行参数配置
- */
-import android.content.Context;
+package cc.winboll.studio.autoinstaller.models;
 import android.util.JsonReader;
 import android.util.JsonWriter;
 import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
-public class WinBollClientServiceBean extends BaseBean {
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/04/15 09:27:39
+ * @Describe MainServiceBean
+ */
+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) {
@@ -31,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
@@ -66,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,12 +4,12 @@ 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
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2024/06/06 13:19:38
  * @Describe 应用消息接收类
  */
@@ -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,11 +6,11 @@ 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;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2024/05/27 20:16:00
  * @Describe MainService 守护进程服务
  */
@@ -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/FileUtil.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.autoinstaller.utils;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2024/05/27 17:56:31
  * @Describe 文件管理类
  */

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

@@ -1,14 +1,16 @@
 package cc.winboll.studio.autoinstaller.utils;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2024/12/11 06:28:50
  * @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/java/cc/winboll/studio/autoinstaller/utils/ServiceUtil.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.autoinstaller.utils;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2024/05/27 20:20:03
  * @Describe 服务类工具
  */

autoinstaller/src/main/res/drawable/ic_android.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="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>

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

@@ -1,14 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Application" parent="android:Theme.Material.Light.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="android:colorPrimary">@color/purple_500</item>
-        
-        <!-- Secondary brand color. -->
-        <item name="android:colorSecondary">@color/teal_200</item>
-        
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">@color/purple_700</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>

build.gradle

@@ -1,15 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        // 本地 Maven 仓库（默认路径为 ~/.m2/repository）
-        mavenLocal()
-        // 或自定义本地仓库路径
-        maven { url "file:///sdcard/.m2/repository" }
-        
+        mavenLocal {
+            // 设置本地Maven仓库路径
+            url 'file:///sdcard/.m2/repository/'
+        }
         // Nexus Maven 库地址
-        // "WinBoll Release"
+        // "WinBoLL Release"
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }
-        // "WinBoll Snapshot"
+        // "WinBoLL Snapshot"
         maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
         
         maven { url 'https://maven.aliyun.com/repository/public/' } 
@@ -20,7 +19,13 @@ buildscript {
         maven { url "https://jitpack.io" }
         mavenCentral()
         google()
+        //println "mavenLocal : ==========="
+        //println mavenLocal().url
+        //println "mavenLocal : ==========="
         //mavenLocal()
+        
+        // WinBoLL.CC 紧急备用 Maven 仓库
+        maven { url 'https://spare-maven.winboll.cc/repository/' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.2.1' // 对应 compileSdkVersion 32
@@ -31,10 +36,15 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenLocal {
+            // 设置本地Maven仓库路径
+            url 'file:///sdcard/.m2/repository/'
+        }
+        
         // Nexus Maven 库地址
-        // "WinBoll Release"
+        // "WinBoLL Release"
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }
-        // "WinBoll Snapshot"
+        // "WinBoLL Snapshot"
         maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
         
         maven { url 'https://maven.aliyun.com/repository/public/' } 
@@ -45,7 +55,13 @@ allprojects {
         maven { url "https://jitpack.io" }
         mavenCentral()
         google()
-        mavenLocal()
+        //println "mavenLocal : ==========="
+        //println mavenLocal().url
+        //println "mavenLocal : ==========="
+        //mavenLocal()
+        
+        // WinBoLL.CC 紧急备用 Maven 仓库
+        maven { url 'https://spare-maven.winboll.cc/repository/' }
     }
     ext {
         // 定义全局变量，常用于版本管理

contacts/README.md

@@ -24,7 +24,7 @@ https://github.com/aJIEw/PhoneCallApp.git
 
 1.  Fork 本仓库
 2.  新建 Feat_xxx 分支
-3.  提交代码 : ZhanGSKen(ZhanGSKen@AliYun.Com)
+3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
 4.  新建 Pull Request
 
 

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts;
 
 /**
- * @Author ZhanGSKen@QQ.COM
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2024/12/08 15:10:51
  * @Describe 全局应用类
  */

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.activities;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/31 15:15:54
  * @Describe 应用介绍窗口
  */

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.activities;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/20 17:15:46
  * @Describe 拨号窗口
  */

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.activities;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/20 20:18:26
  */
 import android.content.Intent;

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.activities;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/21 05:37:42
  */
 import android.content.Context;

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

@@ -11,7 +11,7 @@ import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/02 16:07:04
  */
 public class UnitTestActivity extends Activity {

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

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.activities;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/31 15:16:45
  * @Describe 应用窗口基类
  */

contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.adapters;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/26 13:09:32
  * @Describe CallLogAdapter
  */

contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.adapters;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/26 13:35:44
  * @Describe ContactAdapter
  */

contacts/src/main/java/cc/winboll/studio/contacts/adapters/ImagePagerAdapter.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.adapters;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/20 14:20:38
  * @Describe ImagePagerAdapter
  */

contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.adapters;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/02 17:27:41
  * @Describe PhoneConnectRuleAdapter
  */

contacts/src/main/java/cc/winboll/studio/contacts/beans/CallLogModel.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.beans;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/26 13:10:57
  * @Describe CallLogModel
  */

contacts/src/main/java/cc/winboll/studio/contacts/beans/ContactModel.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.beans;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/26 13:37:00
  * @Describe ContactModel
  */

contacts/src/main/java/cc/winboll/studio/contacts/beans/MainServiceBean.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.beans;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/13 07:06:13
  */
 import android.util.JsonReader;

contacts/src/main/java/cc/winboll/studio/contacts/beans/PhoneConnectRuleModel.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.beans;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/21 09:52:10
  * @Describe 电话黑名单规则
  */

contacts/src/main/java/cc/winboll/studio/contacts/beans/RingTongBean.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.beans;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/02/24 18:47:11
  * @Describe 手机铃声设置参数类
  */

contacts/src/main/java/cc/winboll/studio/contacts/beans/SettingsModel.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.beans;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
+ * @Author ZhanGSKen<zhangsken@188.com>
  * @Date 2025/03/02 19:51:40
  * @Describe SettingsModel
  */