<winboll>APK 15.0.2 release Publish.

添加自定义Toolbar
<winboll>APK 15.0.1 release Publish.
2025-05-22 13:37:34 +08:00 · 2025-05-22 13:35:52 +08:00 · 2025-05-22 02:06:59 +08:00 · 2025-05-22 02:04:09 +08:00 · 2025-05-22 01:57:02 +08:00 · 2025-05-22 01:50:39 +08:00
630 changed files with 6125 additions and 14962 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -87,15 +87,19 @@ lint/tmp/
 # Android Profiling
 *.hprof

-# 忽略 Lint 输出文件
+# Custom
+.androidide
 lint-results.xml
 lint-results.html
-
-## 忽略 AndroidIDE 临时文件夹
-.androidide
+winboll.properties
+local.properties

 ## 忽略模块应用编译配置
 /settings.gradle
 /gradle.properties
-/winboll.properties
-/local.properties
+
+## 忽略 srv 纠结问题
+/srv/
+
+## 忽略 winboll-x 文件夹
+/winboll-x/
--- a/.winboll/bashChangeToBetaKeyStore.sh
+++ b/.winboll/bashChangeToBetaKeyStore.sh
@@ -0,0 +1,3 @@
+#!/bin/usr/bash
+## Change Back To Beta KeyStore in keystore module.
+cd keystore;git reset --hard f5bc75ff45fcb8894b5bd3f49b91bdd8fe3c317e;cd ..
--- a/.winboll/bashChangeToStageMGKeyStore.sh
+++ b/.winboll/bashChangeToStageMGKeyStore.sh
@@ -0,0 +1,3 @@
+#!/bin/usr/bash
+## Change Back To StageMG KeyStore in keystore module.
+cd keystore;git reset --hard d22519b11253f85f495400b01b6373e9657defb4;cd ..
--- a/.winboll/bashPublishAPKAddTag.sh
+++ b/.winboll/bashPublishAPKAddTag.sh
@@ -113,10 +113,10 @@ if [[ $? -eq 0 ]]; then
    # 如果Git已经提交了所有代码就执行标签和应用发布操作

    # 预先询问是否添加工作流标签
-    #echo "Add Github Workflows Tag? (yes/No)"
-	#result=$(askAddWorkflowsTag)
-	#nAskAddWorkflowsTag=$?
-	#echo $result
+    echo "Add Github Workflows Tag? (yes/No)"
+	result=$(askAddWorkflowsTag)
+	nAskAddWorkflowsTag=$?
+	echo $result

    # 发布应用
 	echo "Publishing WinBoLL APK ..."
@@ -138,17 +138,17 @@ if [[ $? -eq 0 ]]; then
 	fi
    
    # 添加 GitHub 工作流标签
-	#if [[ $nAskAddWorkflowsTag -eq 1 ]]; then
+	if [[ $nAskAddWorkflowsTag -eq 1 ]]; then
 	    # 如果用户选择添加工作流标签
-    	#result=$(addWorkflowsTag $1)
-		#if [[ $? -eq 0 ]]; then
-		#    echo $result
+    	result=$(addWorkflowsTag $1)
+		if [[ $? -eq 0 ]]; then
+		    echo $result
 		    # 工作流标签添加成功
-		#else
-			#echo -e "${0}: addWorkflowsTag $1\n${result}\nAdd workflows tag cancel."
-			#exit 1 # addWorkflowsTag 异常
-		#fi
-	#fi
+		else
+			echo -e "${0}: addWorkflowsTag $1\n${result}\nAdd workflows tag cancel."
+			exit 1 # addWorkflowsTag 异常
+		fi
+	fi
 	
 	## 清理更新描述文件内容
 	echo "" > $1/app_update_description.txt
--- a/.winboll/winboll_app_build.gradle
+++ b/.winboll/winboll_app_build.gradle
@@ -2,11 +2,6 @@
 //

 android {
-	def winbollProps = new Properties()
-    def winbollPropsFile = rootProject.file("${winbollFilePath}")
-    assert(winbollPropsFile.exists())
-    winbollProps.load(new FileInputStream(winbollPropsFile))
-    
    // 读取秘钥配置文件
    //
    def keyProps = new Properties()
@@ -127,7 +122,6 @@ android {
                                    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
                                    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
                                    fos.close();
-									println "\n\n>>> Project build.properties saved.\n\n";
                                    
                                    if(winbollBuildProps['libraryProject'] != "") {
                                        // 如果应用 build.properties 文件设置了类库模块项目文件名
@@ -139,15 +133,14 @@ android {
                                        java.nio.file.Path targetFilePath = libraryProjectBuildPropsFile.toPath();
                                        // 使用copyTo()方法复制文件，如果目标文件存在会被覆盖，可选参数可以选择不覆盖
 	                                    java.nio.file.Files.copy(sourceFilePath, targetFilePath, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
-										
-										println "\n\n>>> Library Project build.properties saved.\n\n";
                                    }
                                }
                            }
                            
-                            // 如果正在发布，就拷贝到 WinBoLL 标签管理文件夹，和处理 Git 仓库管理任务。
+                            // 如果正在发布，就拷贝到 WinBoLL 标签管理文件夹
                            //
-                            if(variant.flavorName == "stage"&&variant.buildType.name == "release"){
+                            if((variant.flavorName == "stage"&&variant.buildType.name == "debug")
+                                || (variant.flavorName == "stage"&&variant.buildType.name == "release")){
                                // 发布 APK 文件
                                //
                                // 截取版本号的版本字段为短版本名
@@ -228,7 +221,6 @@ android {
                                    }
                                    
                                    // 提交新的编译标志配置
-									println 'exec bashCommitAppPublishBuildFlagInfoFilePath ...'
                                    def resultCommitBuildFlag = exec {
                                        commandLine 'bash', '--', "${RootProjectDir}/${bashCommitAppPublishBuildFlagInfoFilePath}", "${RootProjectDir}", "${versionName}", variant.buildType.name , rootProject.name
                                    }
@@ -236,78 +228,22 @@ android {
                                    assert(resultCommitBuildFlag.getExitValue() == 0)
                                }
                            } //  if(variant.buildType.name == "release"){
-							
-							// 如果正在调试发布版，就只生成和输出APK文件，不处理 Git 仓库提交与更新问题。
-							//
-					        if(variant.flavorName == "stage"&&variant.buildType.name == "debug"){
-                                // 发布 APK 文件
-                                //
-                                // 截取版本号的版本字段为短版本名
-                                String szVersionName = "${versionName}"
-                                String[] szlistTemp = szVersionName.split("-")
-                                String szShortVersionName = szlistTemp[0]
-                                //String szCommonTagAPKName = "${rootProject.name}_" + szShortVersionName + ".apk"
-                                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 + "/${variant.buildType.name}/")
-                                // 创建目标路径目录
-                                if(!outTagDir.exists()) {
-                                    outTagDir.mkdirs();
-                                    println "Output Folder Created.(Tags) : " + outTagDir.getAbsolutePath()
-                                }
-                                
-                                if(outTagDir.exists()) {
-                                    File targetAPK = new File(outTagDir, "${szCommonTagAPKName}")
-                                    if(targetAPK.exists()) {
-                                        // 标签版本APK文件已经存在，构建拷贝任务停止
-										println '如果是在调试 Stage 版应用包构建，请删除(注：在debug目录)现有的 Stage 应用包('+targetAPK.getAbsolutePath()+')。再编译一次。'
-                                        assert (!targetAPK.exists())
-                                        // 可选择删除并继续输出APK文件
-                                        //delete targetAPK
+                            
+                            // 如果公共目录存在就拷贝到公共目录并重命名为app.apk
+                            //
+                            File outCommonDir = new File("/sdcard/AppProjects")
+                            String commandAPKName = "app.apk"
+                            if(outCommonDir.exists()) {
+                                copy{
+                                    from file.outputFile
+                                    into outCommonDir
+                                    rename {
+                                        String fileName -> "${commandAPKName}"
                                    }
-                                    // 复制一个备份
-                                    copy{
-                                        from file.outputFile
-                                        into outTagDir
-                                        rename {
-                                            String fileName -> "${outputFileName}"
-                                        }
-                                        println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${outputFileName}"
-                                    }
-                                    // 复制一个并重命名为短版本名
-                                    copy{
-                                        from file.outputFile
-                                        into outTagDir
-                                        rename {
-                                            String fileName -> "${szCommonTagAPKName}"
-                                        }
-                                        println "Output APK (Tags): "+ outTagDir.getAbsolutePath() + "/${szCommonTagAPKName}"
-                                    }
-                                    
-                                    //不保存编译标志配置
+                                    println "Output APK (Common): " + outCommonDir.getAbsolutePath() + "/${commandAPKName}"
                                }
                            }
                            
-                            // 如果配置了APK额外输出路径，就复制一份拷贝到额外路径。
-                            //
-							if(winbollProps['ExtraAPKOutputPath'] != null ) {
-                                File apkFile = new File(winbollProps['ExtraAPKOutputPath'])
-								File outCommonDir = apkFile.getParentFile();
-                                String commandAPKName = apkFile.getName();
-                                if(outCommonDir.exists()) {
-                                    copy{
-                                        from file.outputFile
-                                        into outCommonDir
-                                        rename {
-                                            String fileName -> "${commandAPKName}"
-                                        }
-                                        println "Output APK (Common): " + outCommonDir.getAbsolutePath() + "/${commandAPKName}"
-                                    }
-                                }
-						    }
-                            
                        
                    }
 	            }// End of (variant.getAssembleProvider().get().doLast {)
--- a/GenKeyStore/gen_debug_keystore.sh
+++ b/GenKeyStore/gen_debug_keystore.sh
@@ -1,49 +0,0 @@
-#!/bin/bash
-# 应用秘钥创建脚本
-# Linux 命令行创建JKS秘钥，alias和keyAlias可配置，文件名含时间戳
-
-# 可配置参数（按需修改）
-ALIAS="WinBoLL.CC_Debug"  # 别名（与keyAlias一致）
-STORE_PASS="androiddebugkey"
-KEY_PASS="androiddebugkey"
-COUNTRY="CN"        # 国家代码
-
-# 获取当前时间戳
-TIMESTAMP=$(date +%Y%m%d%H%M%S)
-FILENAME="${ALIAS}_${TIMESTAMP}.jks"
-STORENAME="${ALIAS}_${TIMESTAMP}.keystore"
-
-# 生成JKS文件（alias与keyAlias同步）
-keytool -genkeypair \
-  -alias "${ALIAS}" \
-  -keyalg RSA \
-  -keysize 2048 \
-  -validity 1 \
-  -keystore "${FILENAME}" \
-  -dname "CN=WBFans, OU=Studio, O=WinBoLL, L=Shanwei, ST=Guangdong, C=${COUNTRY}" \
-  -storepass "${STORE_PASS}" \
-  -keypass "${KEY_PASS}"
-
-# 写入配置文件
-cat <<EOF > ${STORENAME}
-keyAlias=${ALIAS}
-keyPassword=${KEY_PASS}
-storeFile=../appkey.jks
-storePassword=${STORE_PASS}
-EOF
-
-echo "已生成秘钥：${FILENAME}"
-echo "配置已写入 ${STORENAME}（keyAlias=${ALIAS}）"
-
-# 询问是否复制文件
-read -p "是否需要将文件复制为 appkey.jks 和 appkey.keystore？(y/n): " CONFIRM
-
-if [[ $CONFIRM =~ ^[Yy]$ ]]; then
-  # 复制 jks 文件为 appkey.jks
-  cp -v ${FILENAME} ../appkey.jks
-  # 复制 keystore 文件为 appkey.keystore
-  cp -v ${STORENAME} ../appkey.keystore
-  echo "文件复制完成"
-else
-  echo "已取消文件复制"
-fi
--- a/README.md
+++ b/README.md
@@ -114,12 +114,9 @@

 # 本项目要实际运用需要注意以下几个步骤：
 # 在项目根目录下：
-## ★. 项目模块编译环境设置(必须)，settings.gradle-demo 要复制为 settings.gradle，并取消相应项目模块的注释。
-## ★. 项目模块编译环境设置(必须) 在根目录拷贝 gradle.properties-androidx-demo 或者 gradle.properties-android-demo 文件为 gradle.properties。
-## ★. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。
-## ★. 应用签名密钥 keystore 设置问题。一般调试编译只需用【Termux】cd 进 GenKeyStore 目录执行 $ bash gen_debug_keystore.sh 命令即可完成设置。
-## ☆. 应用 WiBoLL 签名密钥配置问题<非必须考虑>。设置时需要 clone 【keystore】模块源码并拷贝模块目录的 appkey.jks 与 appkey.keystore 到项目根目录即可。
-## ☆. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoLL Maven 库登录用户信息， 和 APK 文件额外输出路径。
+## 1. 项目模块编译环境设置(必须)，settings.gradle-demo 要复制为 settings.gradle，并取消相应项目模块的注释。
+## 2. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。
+## 3. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoLL Maven 库登录用户信息。


 # ☆类库型项目编译方法
@@ -128,8 +125,7 @@
 设置属性 libraryProject=<类库项目模块文件夹名称>
 ### 再编译测试项目
 $ bash .winboll/bashPublishAPKAddTag.sh <应用项目模块文件夹名称>
-#### 测试项目编译后，编译器会复制一份 APK 到 路径："/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/" 文件夹。
-#### 若是 winboll.properties 文件的 [ExtraAPKOutputPath] 属性设置了路径。编译器也会复制一份 APK 到这个路径。
+#### 测试项目编译后，编译器会复制一份 APK 到以下路径："/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/" 文件夹。
 ### 最后编译类库项目
 $ bash .winboll/bashPublishLIBAddTag.sh <类库项目模块文件夹名称>
 #### 类库模块编译命令执行后，编译器会发布到 WinBoLL Nexus Maven 库：Maven 库地址可以参阅根项目目录配置 build.gradle 文件。
@@ -137,17 +133,4 @@ $ bash .winboll/bashPublishLIBAddTag.sh <类库项目模块文件夹名称>
 # ☆应用型项目编译方法
 ## 直接调用以下命令编译应用型项目
 $ bash .winboll/bashPublishAPKAddTag.sh <应用项目模块文件夹名称>
-#### 应用模块编译命令执行后，编译器会复制一份 APK 到
-#### 测试项目编译后，编译器会复制一份 APK 到 路径："/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/" 文件夹。
-#### 若是 winboll.properties 文件的 [ExtraAPKOutputPath] 属性设置了路径。编译器也会复制一份 APK 到这个路径。
-
-## ☆应用调试编译方法
-使用以下命令编译调试：
-
-### Beta调试使用：
-$ bash gradlew assembleBetaDebug
-
-### Stage调试使用：
-$ bash gradlew assembleStageDebug
-
-### 若是 winboll.properties 文件的 [ExtraAPKOutputPath] 属性设置了路径。编译器也会复制一份 APK 到这个路径。
+#### 应用模块编译命令执行后，编译器会复制一份 APK 到以下路径："/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/" 文件夹。
--- a/aes/README.md
+++ b/aes/README.md
@@ -1,35 +0,0 @@
-# AES
-
-#### 介绍
-安卓视图元素类库
-
-#### 软件架构
-适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
-也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
-
-
-#### Gradle 编译说明
-调试版编译命令 ：gradle assembleBetaDebug
-阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh aes
-阶段版类库发布命令 ：git pull &&bash .winboll/bashPublishLIBAddTag.sh libaes
-
-#### 使用说明
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
-4.  新建 Pull Request
-
-
-#### 特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
-5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
-
-#### 参考文档
--- a/aes/build.gradle
+++ b/aes/build.gradle
@@ -29,7 +29,7 @@ android {
        // versionName 更新后需要手动设置 
        // 项目模块目录的 build.gradle 文件的 stageCount=0
        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.10" 
+        versionName "15.6" 
        if(true) {
            versionName = genVersionName("${versionName}")
        }
--- a/aes/build.properties
+++ b/aes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Sep 29 13:04:18 HKT 2025
-stageCount=3
+#Mon May 12 18:10:35 HKT 2025
+stageCount=4
 libraryProject=libaes
-baseVersion=15.10
-publishVersion=15.10.2
+baseVersion=15.6
+publishVersion=15.6.3
 buildCount=0
-baseBetaVersion=15.10.3
+baseBetaVersion=15.6.4
--- a/aes/src/main/AndroidManifest.xml
+++ b/aes/src/main/AndroidManifest.xml
@@ -33,8 +33,6 @@

        <activity android:name=".AboutActivity"/>

-        <activity android:name=".TestActivityManagerActivity"/>
-
    </application>

-</manifest>
+</manifest>
--- a/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java
+++ b/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.aes;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/24 23:52:29
 * @Describe AES应用介绍窗口
 */
@@ -12,18 +12,18 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libaes.models.APPInfo;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
-import cc.winboll.studio.libaes.views.AboutView;
+import cc.winboll.studio.libaes.winboll.APPInfo;
+import cc.winboll.studio.libaes.winboll.AboutView;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;

-public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
+public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity {

    public static final String TAG = "AboutActivity";

    Context mContext;
    Toolbar mToolbar;
-
+    
    @Override
    public Activity getActivity() {
        return this;
@@ -33,7 +33,7 @@ public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
    public String getTag() {
        return TAG;
    }
-	
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -64,13 +64,13 @@ public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
        );
        layout.addView(aboutView, params);

-        WinBoLLActivityManager.getInstance().add(this);
+        GlobalApplication.getWinBoLLActivityManager().add(this);
    }

    @Override
    protected void onDestroy() {
        super.onDestroy();
-        WinBoLLActivityManager.getInstance().registeRemove(this);
+        GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
    }

    public AboutView CreateAboutView() {
@@ -79,11 +79,11 @@ public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
        appInfo.setAppName("AES");
        appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
        appInfo.setAppDescription("AES Description");
-        appInfo.setAppGitName("APPBase");
+        appInfo.setAppGitName("APP");
        appInfo.setAppGitOwner("Studio");
        appInfo.setAppGitAPPBranch(szBranchName);
        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=3&extra=page%3D1");
+        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=AES");
        appInfo.setAppAPKName("AES");
        appInfo.setAppAPKFolderName("AES");
        //appInfo.setIsAddDebugTools(false);
--- a/aes/src/main/java/cc/winboll/studio/aes/App.java
+++ b/aes/src/main/java/cc/winboll/studio/aes/App.java
@@ -1,12 +1,11 @@
 package cc.winboll.studio.aes;

 /**
- * @Author ZhanGSKen<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.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import com.hjq.toast.ToastUtils;
 import com.hjq.toast.style.WhiteToastStyle;
@@ -19,7 +18,6 @@ public class App extends GlobalApplication {
    @Override
    public void onCreate() {
        super.onCreate();
-		WinBoLLActivityManager.init(this);

        // 初始化 Toast 框架
        ToastUtils.init(this);
--- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java
+++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.aes;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2024/06/13 19:05:52
 * @Describe 应用主窗口
 */
@@ -15,10 +15,9 @@ import android.widget.AdapterView;
 import android.widget.Toast;
 import cc.winboll.studio.aes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
+import cc.winboll.studio.libaes.beans.DrawerMenuBean;
 import cc.winboll.studio.libaes.dialogs.LocalFileSelectDialog;
 import cc.winboll.studio.libaes.dialogs.StoragePathDialog;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libaes.models.DrawerMenuBean;
 import cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity;
 import cc.winboll.studio.libaes.unittests.TestAButtonFragment;
 import cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity;
@@ -26,10 +25,10 @@ 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.ToastUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import com.a4455jkjh.colorpicker.ColorPickerDialog;
+import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;

 public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity {

@@ -123,10 +122,9 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        int nItemId = item.getItemId();
-        if (item.getItemId() == R.id.item_testactivitymanager) {
-            WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, TestActivityManagerActivity.class);
-			//ToastUtils.show("item_testactivitymanager");
-        } else 
+//        if (item.getItemId() == R.id.item_log) {
+//            WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(getApplicationContext(), LogActivity.class);
+//        } else 
        if (nItemId == R.id.item_atoast) {
            Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();
        } else if (nItemId == R.id.item_atoolbar) {
--- a/aes/src/main/java/cc/winboll/studio/aes/TestActivityManagerActivity.java
+++ b/aes/src/main/java/cc/winboll/studio/aes/TestActivityManagerActivity.java
@@ -1,33 +0,0 @@
-package cc.winboll.studio.aes;
-
-import android.app.Activity;
-import android.os.Bundle;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/09/28 21:07
- * @Describe 窗口管理类测试窗口
- */
-public class TestActivityManagerActivity extends WinBoLLActivity implements IWinBoLLActivity {
-    
-    public static final String TAG = "TestActivityManagerActivity";
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-	
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_testactivitymanager);
-        
-    }
-    
-}
--- a/aes/src/main/java/cc/winboll/studio/aes/WinBoLLActivity.java
+++ b/aes/src/main/java/cc/winboll/studio/aes/WinBoLLActivity.java
@@ -1,60 +0,0 @@
-package cc.winboll.studio.aes;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/09/29 00:11
- * @Describe WinBoLL 窗口基础类
- */
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.MenuItem;
-import androidx.appcompat.app.AppCompatActivity;
-import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
-import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
-import cc.winboll.studio.libappbase.LogUtils;
-
-public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
-
-    public static final String TAG = "WinBoLLActivity";
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        LogUtils.d(TAG, String.format("onResume %s", getTag()));
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        /*if (item.getItemId() == R.id.item_log) {
-            WinBoLLActivityManager.getInstance().startLogActivity(this);
-            return true;
-        } else if (item.getItemId() == R.id.item_home) {
-			startActivity(new Intent(this, MainActivity.class));
-            return true;
-        }*/
-        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        WinBoLLActivityManager.getInstance().add(this);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        WinBoLLActivityManager.getInstance().registeRemove(this);
-    }
-}
--- a/aes/src/main/res/menu/toolbar_library.xml
+++ b/aes/src/main/res/menu/toolbar_library.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:id="@+id/item_testactivitymanager"
-		android:title="TestActivityManager"/>
    <item
        android:id="@+id/item_log"
        android:title="LogActivity"/>
--- a/androiddemo/app_update_description.txt
+++ b/androiddemo/app_update_description.txt
@@ -1 +0,0 @@
-
--- a/androiddemo/build.gradle
+++ b/androiddemo/build.gradle
@@ -24,7 +24,7 @@ android {
    defaultConfig {
        applicationId "cc.winboll.studio.androiddemo"
        minSdkVersion 24
-        targetSdkVersion 30
+        targetSdkVersion 29
        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.8.5'
-    api 'cc.winboll.studio:libappbase:15.9.5'
+    api 'cc.winboll.studio:libapputils:15.2.2'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }
--- a/androiddemo/build.properties
+++ b/androiddemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Aug 31 05:11:26 CST 2025
-stageCount=1
+#Thu Apr 03 03:17:18 GMT 2025
+stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=0
+buildCount=21
 baseBetaVersion=15.0.1
--- a/androidxdemo/app_update_description.txt
+++ b/androidxdemo/app_update_description.txt
@@ -1 +0,0 @@
-
--- a/androidxdemo/build.gradle
+++ b/androidxdemo/build.gradle
@@ -24,12 +24,12 @@ android {
    defaultConfig {
        applicationId "cc.winboll.studio.androidxdemo"
        minSdkVersion 24
-        targetSdkVersion 30
+        targetSdkVersion 29
        versionCode 1
        // versionName 更新后需要手动设置 
        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.1"
+        versionName "15.0"
        if(true) {
            versionName = genVersionName("${versionName}")
        }
@@ -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.9.3'
-    api 'cc.winboll.studio:libapputils:15.8.5'
-    api 'cc.winboll.studio:libappbase:15.9.5'
+    api 'cc.winboll.studio:libaes:15.2.6'
+    api 'cc.winboll.studio:libapputils:15.2.2'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }
--- a/androidxdemo/build.properties
+++ b/androidxdemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Aug 31 05:42:50 CST 2025
-stageCount=2
+#Thu Apr 03 03:15:55 GMT 2025
+stageCount=0
 libraryProject=
-baseVersion=15.1
-publishVersion=15.1.1
-buildCount=0
-baseBetaVersion=15.1.2
+baseVersion=15.0
+publishVersion=15.0.0
+buildCount=18
+baseBetaVersion=15.0.1
--- a/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/App.java
+++ b/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);
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -30,7 +30,7 @@ android {
        // versionName 更新后需要手动设置 
        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.10"
+        versionName "15.7"
        if(true) {
            versionName = genVersionName("${versionName}")
        }
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Sep 26 05:36:14 HKT 2025
-stageCount=9
+#Sun May 11 19:36:35 GMT 2025
+stageCount=7
 libraryProject=libappbase
-baseVersion=15.10
-publishVersion=15.10.8
-buildCount=0
-baseBetaVersion=15.10.9
+baseVersion=15.7
+publishVersion=15.7.6
+buildCount=15
+baseBetaVersion=15.7.7
--- a/appbase/src/beta/AndroidManifest.xml
+++ b/appbase/src/beta/AndroidManifest.xml
@@ -2,10 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools" >

-    <application
-		tools:replace="android:icon,android:roundIcon"
-        android:icon="@drawable/ic_winboll_beta"
-        android:roundIcon="@drawable/ic_winboll_beta">
+    <application>

        <!-- Put flavor specific code here -->

--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -2,19 +2,16 @@
 <manifest
    xmlns:android="http://schemas.android.com/apk/res/android"
    package="cc.winboll.studio.appbase">
-	
-	<!-- 网络权限 -->
-	<uses-permission android:name="android.permission.INTERNET" />
-		
+
    <application
        android:name=".App"
-        android:icon="@drawable/ic_winboll"
+        android:icon="@drawable/ic_miapp"
        android:label="@string/app_name"
        android:theme="@style/MyAPPBaseTheme"
        android:resizeableActivity="true"
        android:process=":App">

-		<activity
+        <activity
            android:name=".MainActivity"
            android:label="@string/app_name"
            android:exported="true"
@@ -27,18 +24,105 @@

                <category android:name="android.intent.category.LAUNCHER"/>

+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>
+
                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

        </activity>
-		
-        <activity android:name=".GlobalApplication$CrashActivity"/>
-		
+
+        <activity
+            android:name=".activities.NewActivity"
+            android:label="NewActivity"
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
+
+        <activity android:name=".activities.New2Activity"
+            android:label="New2Activity"
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
+
+        <service
+            android:name=".MyTileService"
+            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>
+
+        <service
+            android:name=".services.MainService"
+            android:exported="true"/>
+
+        <service
+            android:name="cc.winboll.studio.appbase.services.TestDemoBindService"
+            android:exported="true"/>
+
+        <service
+            android:name="cc.winboll.studio.appbase.services.TestDemoService"
+            android:exported="true"/>
+
+        <service android:name=".services.AssistantService"/>
+
+        <receiver android:name="cc.winboll.studio.appbase.receivers.MainReceiver"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.appbase.receivers.MainReceiver"/>
+
+            </intent-filter>
+
+        </receiver>
+
+        <receiver
+            android:name=".widgets.APPNewsWidget"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.appbase.widgets.APPNewsWidget.ACTION_WAKEUP_SERVICE"/>
+
+                <action android:name="cc.winboll.studio.appbase.widgets.APPNewsWidget.ACTION_RELOAD_REPORT"/>
+
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_provider_info_sos"/>
+
+        </receiver>
+
+        <receiver android:name=".receivers.APPNewsWidgetClickListener"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.appbase.receivers.APPNewsWidgetClickListener.ACTION_PRE"/>
+
+                <action android:name="cc.winboll.studio.appbase.receivers.APPNewsWidgetClickListener.ACTION_NEXT"/>
+
+            </intent-filter>
+
+        </receiver>
+
        <meta-data
            android:name="android.max_aspect"
            android:value="4.0"/>

+
    </application>

 </manifest>
--- a/appbase/src/main/java/cc/winboll/studio/appbase/App.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/App.java
@@ -1,19 +1,27 @@
 package cc.winboll.studio.appbase;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/01/05 09:54:42
 * @Describe APPbase 应用类
 */
-import android.content.IntentFilter;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import android.content.IntentFilter;
+import cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver;
+import cc.winboll.studio.libappbase.sos.SOS;

 public class App extends GlobalApplication {

    public static final String TAG = "App";
    
+    SOSCenterServiceReceiver mSOSCenterServiceReceiver;
+    
    @Override
    public void onCreate() {
        super.onCreate();
+        mSOSCenterServiceReceiver = new SOSCenterServiceReceiver();
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(SOS.ACTION_SOS);
+        registerReceiver(mSOSCenterServiceReceiver, intentFilter);
    }
 }
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -1,24 +1,46 @@
 package cc.winboll.studio.appbase;

 import android.app.Activity;
-import android.content.Context;
+import android.content.ComponentName;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.Toast;
+import android.widget.CheckBox;
 import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.libappbase.LogActivity;
-import cc.winboll.studio.libappbase.ToastUtils;
+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;
+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;

-public class MainActivity extends Activity {
+public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {

    public static final String TAG = "MainActivity";

+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
    Toolbar mToolbar;
+    LogView mLogView;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -28,47 +50,134 @@ public class MainActivity extends Activity {

        mToolbar = findViewById(R.id.toolbar);
        setActionBar(mToolbar);
+
+        CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
+        cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
+        mLogView = findViewById(R.id.logview);
+        mLogView.start(); 
    }

    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
        return super.onCreateOptionsMenu(menu);
    }

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.item_home : {
-					openWebsiteInBrowser(this);
-				}
-		}
        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
        return super.onOptionsItemSelected(item);
    }

-    public void onCrashTest(View view) {
-		for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
-			getString(i);
-		}
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Intent intentAPPWidget = new Intent(this, StatusWidget.class);
+        intentAPPWidget.setAction(StatusWidget.ACTION_STATUS_UPDATE);
+        sendBroadcast(intentAPPWidget);
    }

-    public void onLogTest(View view) {
-        LogActivity.startLogActivity(this);
+	public void onSwitchDebugMode(View view) {
+        boolean isDebuging = ((CheckBox)view).isChecked();
+        GlobalApplication.setIsDebuging(isDebuging);
+        GlobalApplication.saveDebugStatus();
    }

-	/**
-	 * 唤起默认浏览器打开指定网站
-	 * @param context 上下文（如 Activity.this）
-	 */
-	public void openWebsiteInBrowser(Context context) {
-		// 目标网站地址
-		String url = "https://www.winboll.cc";
-		// 构建打开浏览器的意图
-		Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-		// 设置标志：避免创建新的任务栈（可选，按需求调整）
-		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-		context.startActivity(intent);
-		
-	}
+    public void onPreviewGlobalCrashActivity(View view) {
+        Intent intent = new Intent(this, GlobalCrashActivity.class);
+        intent.putExtra(CrashHandler.EXTRA_CRASH_INFO, "Demo log...");
+        startActivity(intent);
+    }
+
+    public void onStartCenter(View view) {
+        MainService.startMainService(this);
+    }
+
+    public void onStopCenter(View view) {
+        MainService.stopMainService(this);
+    }
+
+    public void onTestStopMainServiceWithoutSettingEnable(View view) {
+        LogUtils.d(TAG, "onTestStopMainServiceWithoutSettingEnable");
+        stopService(new Intent(this, MainService.class));
+    }
+
+    public void onTestUseComponentStartService(View view) {
+        LogUtils.d(TAG, "onTestUseComponentStartService");
+
+        // 目标服务的包名和类名
+        String packageName = this.getPackageName();
+        String serviceClassName = TestDemoService.class.getName();
+
+        // 构建Intent
+        Intent intentService = new Intent();
+        intentService.setComponent(new ComponentName(packageName, serviceClassName));
+
+        startService(intentService);
+    }
+
+    public void onTestDemoServiceSOS(View view) {
+        Intent intent = new Intent(this, TestDemoService.class);
+        stopService(intent);
+        if (App.isDebuging()) {
+            SOS.sosToAppBaseBeta(this, TestDemoService.class.getName());
+        } else {
+            SOS.sosToAppBase(this, TestDemoService.class.getName());
+        }
+    }
+
+    public void onSartTestDemoService(View view) {
+        Intent intent = new Intent(this, TestDemoService.class);
+        intent.setAction(TestDemoService.ACTION_ENABLE);
+        startService(intent);
+
+    }
+
+    public void onStopTestDemoService(View view) {
+        Intent intent = new Intent(this, TestDemoService.class);
+        intent.setAction(TestDemoService.ACTION_DISABLE);
+        startService(intent);
+
+        Intent intentStop = new Intent(this, TestDemoService.class);
+        stopService(intentStop);
+    }
+
+    public void onStopTestDemoServiceNoSettings(View view) {
+        Intent intent = new Intent(this, TestDemoService.class);
+        stopService(intent);
+    }
+
+    public void onSartTestDemoBindService(View view) {
+        Intent intent = new Intent(this, TestDemoBindService.class);
+        intent.setAction(TestDemoBindService.ACTION_ENABLE);
+        startService(intent);
+
+    }
+
+    public void onStopTestDemoBindService(View view) {
+        Intent intent = new Intent(this, TestDemoBindService.class);
+        intent.setAction(TestDemoBindService.ACTION_DISABLE);
+        startService(intent);
+
+        Intent intentStop = new Intent(this, TestDemoBindService.class);
+        stopService(intentStop);
+    }
+
+    public void onStopTestDemoBindServiceNoSettings(View view) {
+        Intent intent = new Intent(this, TestDemoBindService.class);
+        stopService(intent);
+    }
+
+    public void onTestOpenNewActivity(View view) {
+        GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, NewActivity.class);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+    
+    
 }
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MyTileService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MyTileService.java
@@ -0,0 +1,79 @@
+package cc.winboll.studio.appbase;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/02/13 19:30:10
+ */
+import android.content.Context;
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.TileService;
+import cc.winboll.studio.appbase.models.MainServiceBean;
+import cc.winboll.studio.appbase.services.MainService;
+
+public class MyTileService extends TileService {
+    public static final String TAG = "MyTileService";
+
+    volatile static MyTileService _MyTileService;
+
+    @Override
+    public void onStartListening() {
+        super.onStartListening();
+        _MyTileService = this;
+        Tile tile = getQsTile();
+        MainServiceBean bean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        if (bean != null && bean.isEnable()) {
+            //MainService.startMainService(context);
+            tile.setState(Tile.STATE_ACTIVE);
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(this, R.drawable.ic_cloud));
+        } else {
+            //MainService.stopMainService(context);
+            tile.setState(Tile.STATE_INACTIVE);
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(this, R.drawable.ic_cloud_outline));
+        }
+        tile.updateTile();
+//        Tile tile = getQsTile();
+//        tile.setState(Tile.STATE_INACTIVE);
+//        tile.setLabel(getString(R.string.tileservice_name));
+//        tile.setIcon(android.graphics.drawable.Icon.createWithResource(this, R.drawable.ic_cloud_outline));
+//        tile.updateTile();
+
+    }
+
+    @Override
+    public void onClick() {
+        super.onClick();
+        Tile tile = getQsTile();
+        MainServiceBean bean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        if (bean == null) {
+            bean = new MainServiceBean();
+        }
+
+        if (tile.getState() == Tile.STATE_ACTIVE) {
+            bean.setIsEnable(false);
+            MainServiceBean.saveBean(this, bean);
+            MainService.stopMainService(this);
+        } else if (tile.getState() == Tile.STATE_INACTIVE) {
+            bean.setIsEnable(true);
+            MainServiceBean.saveBean(this, bean);
+            MainService.startMainService(this);
+        }
+        updateServiceIconStatus(this);
+    }
+
+    public static void updateServiceIconStatus(Context context) {
+        if (_MyTileService == null) {
+            return;
+        }
+
+        Tile tile = _MyTileService.getQsTile();
+        MainServiceBean bean = MainServiceBean.loadBean(context, MainServiceBean.class);
+        if (bean != null && bean.isEnable()) {
+            tile.setState(Tile.STATE_ACTIVE);
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(context, R.drawable.ic_cloud));
+        } else {
+            tile.setState(Tile.STATE_INACTIVE);
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(context, R.drawable.ic_cloud_outline));
+        }
+        tile.updateTile();
+    }
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
@@ -0,0 +1,82 @@
+package cc.winboll.studio.appbase.activities;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/03/25 11:46:40
+ * @Describe 测试窗口2
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toolbar;
+import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+
+public class New2Activity extends WinBoLLActivity implements IWinBoLLActivity {
+
+    public static final String TAG = "New2Activity";
+
+    Toolbar mToolbar;
+    //LogView mLogView;
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new2);
+
+//        mLogView = findViewById(R.id.logview);
+//        mLogView.start();
+        mToolbar = findViewById(R.id.toolbar);
+        setActionBar(mToolbar);
+        
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        //mLogView.start();
+    }
+
+    public void onCloseThisActivity(View view) {
+        GlobalApplication.getWinBoLLActivityManager().finish(this);
+    }
+
+    public void onCloseAllActivity(View view) {
+        GlobalApplication.getWinBoLLActivityManager().finishAll();
+    }
+
+    public void onNewActivity(View view) {
+        GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, NewActivity.class);
+    }
+    
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+            //GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
+            return true;
+        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
@@ -0,0 +1,80 @@
+package cc.winboll.studio.appbase.activities;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/03/25 05:04:22
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toolbar;
+import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+
+public class NewActivity extends WinBoLLActivity implements IWinBoLLActivity {
+
+    public static final String TAG = "NewActivity";
+
+    Toolbar mToolbar;
+    //LogView mLogView;
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new);
+//        mLogView = findViewById(R.id.logview);
+//        mLogView.start();
+        mToolbar = findViewById(R.id.toolbar);
+        setActionBar(mToolbar);
+        
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        //mLogView.start();
+    }
+
+    public void onCloseThisActivity(View view) {
+        GlobalApplication.getWinBoLLActivityManager().finish(this);
+    }
+
+    public void onCloseAllActivity(View view) {
+        GlobalApplication.getWinBoLLActivityManager().finishAll();
+    }
+
+    public void onNew2Activity(View view) {
+        GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, New2Activity.class);
+    }
+    
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+            //GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
+            return true;
+        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/WinBoLLActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/WinBoLLActivity.java
@@ -1,9 +1,9 @@
-package cc.winboll.studio.apputils;
+package cc.winboll.studio.appbase.activities;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2025/05/13 11:15
- * @Describe WinBoLLActivity
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/05/10 09:48
+ * @Describe WinBoLL 窗口基础类
 */
 import android.app.Activity;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
--- a/appbase/src/main/java/cc/winboll/studio/appbase/handlers/MainServiceHandler.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/handlers/MainServiceHandler.java
@@ -0,0 +1,38 @@
+package cc.winboll.studio.appbase.handlers;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/02/14 03:51:40
+ */
+import android.os.Handler;
+import android.os.Message;
+import cc.winboll.studio.appbase.services.MainService;
+import java.lang.ref.WeakReference;
+
+public class MainServiceHandler extends Handler {
+    public static final String TAG = "MainServiceHandler";
+
+    public static final int MSG_REMINDTHREAD = 0;
+
+    WeakReference<MainService> serviceWeakReference;
+    public MainServiceHandler(MainService service) {
+        serviceWeakReference = new WeakReference<MainService>(service);
+    }
+
+    @Override
+    public void handleMessage(Message msg) {
+        switch (msg.what) {
+            case MSG_REMINDTHREAD: // 处理下载完成消息，更新UI
+                {
+                    // 显示提醒消息
+                    //
+                    //LogUtils.d(TAG, "显示提醒消息");
+                    MainService mainService = serviceWeakReference.get();
+                    if (mainService != null) {
+                        mainService.appenMessage((String)msg.obj);
+                    }
+                    break;
+                }
+        }
+    }
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/models/MainServiceBean.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/models/MainServiceBean.java
@@ -0,0 +1,67 @@
+package cc.winboll.studio.appbase.models;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/02/13 07:06:13
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class MainServiceBean extends BaseBean {
+
+    public static final String TAG = "MainServiceBean";
+
+    boolean isEnable;
+
+    public MainServiceBean() {
+        this.isEnable = false;
+    }
+
+    public void setIsEnable(boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public boolean isEnable() {
+        return isEnable;
+    }
+
+    @Override
+    public String getName() {
+        return MainServiceBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("isEnable").value(isEnable());
+
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("isEnable")) {
+                setIsEnable(jsonReader.nextBoolean());
+            } 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;
+    }
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoBindServiceBean.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoBindServiceBean.java
@@ -0,0 +1,67 @@
+package cc.winboll.studio.appbase.models;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/03/07 12:47:22
+ * @Describe TestServiceBean
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class TestDemoBindServiceBean extends BaseBean {
+
+    public static final String TAG = "TestServiceBean";
+
+    boolean isEnable;
+
+    public TestDemoBindServiceBean() {
+        this.isEnable = false;
+    }
+
+    public void setIsEnable(boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public boolean isEnable() {
+        return isEnable;
+    }
+
+    @Override
+    public String getName() {
+        return TestDemoBindServiceBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("isEnable").value(isEnable());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("isEnable")) {
+                setIsEnable(jsonReader.nextBoolean());
+            } 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;
+    }
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoServiceBean.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoServiceBean.java
@@ -0,0 +1,68 @@
+package cc.winboll.studio.appbase.models;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/03/07 12:49:21
+ * @Describe TestDemoServiceBean
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class TestDemoServiceBean extends BaseBean {
+
+    public static final String TAG = "TestDemoServiceBean";
+
+    boolean isEnable;
+
+    public TestDemoServiceBean() {
+        this.isEnable = false;
+    }
+
+    public void setIsEnable(boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public boolean isEnable() {
+        return isEnable;
+    }
+
+    @Override
+    public String getName() {
+        return TestDemoServiceBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("isEnable").value(isEnable());
+
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("isEnable")) {
+                setIsEnable(jsonReader.nextBoolean());
+            } 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;
+    }
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/receivers/APPNewsWidgetClickListener.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/APPNewsWidgetClickListener.java
@@ -0,0 +1,36 @@
+package cc.winboll.studio.appbase.receivers;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/03/24 07:11:44
+ */
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import cc.winboll.studio.appbase.widgets.APPNewsWidget;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class APPNewsWidgetClickListener extends BroadcastReceiver {
+
+    public static final String TAG = "APPNewsWidgetClickListener";
+    public static final String ACTION_PRE = APPNewsWidgetClickListener.class.getName() + ".ACTION_PRE";
+    public static final String ACTION_NEXT = APPNewsWidgetClickListener.class.getName() + ".ACTION_NEXT";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+        if (action == null) {
+            LogUtils.d(TAG, String.format("action %s", action));
+            return;
+        }
+        if (action.equals(ACTION_PRE)) {
+            LogUtils.d(TAG, "ACTION_PRE");
+            APPNewsWidget.prePage(context);
+        } else if (action.equals(ACTION_NEXT)) {
+            LogUtils.d(TAG, "ACTION_NEXT");
+            APPNewsWidget.nextPage(context);
+        } else {
+            LogUtils.d(TAG, String.format("action %s", action));
+        }
+    }
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java
@@ -0,0 +1,119 @@
+package cc.winboll.studio.appbase.receivers;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/02/13 06:58:04
+ * @Describe 主要广播接收器
+ */
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+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.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.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;
+import java.util.Date;
+
+public class MainReceiver extends BroadcastReceiver {
+
+    public static final String TAG = "MainReceiver";
+
+    public static final String ACTION_BOOT_COMPLETED = "android.intent.action.BOOT_COMPLETED";
+
+    WeakReference<MainService> mwrService;
+
+    public MainReceiver(MainService service) {
+        mwrService = new WeakReference<MainService>(service);
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String szAction = intent.getAction();
+        if (szAction.equals(ACTION_BOOT_COMPLETED)) {
+            ToastUtils.show("ACTION_BOOT_COMPLETED");
+        } 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 szWinBoLLModel = intent.getStringExtra(WinBoLL.EXTRA_WINBOLLMODEL);
+            LogUtils.d(TAG, String.format("szAPPModel %s", szWinBoLLModel));
+            if (szWinBoLLModel != null && !szWinBoLLModel.equals("")) {
+                try {
+                    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().bindWinBoLLModelConnection(bean);
+                    }
+                } catch (IOException e) {
+                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                }
+            }
+        } else if (intent.getAction().equals(SOS.ACTION_SOS)) {
+            LogUtils.d(TAG, "ACTION_SOS");
+            String sos = intent.getStringExtra(SOS.EXTRA_OBJECT);
+            LogUtils.d(TAG, String.format("SOS %s", sos));
+            if (sos != null && !sos.equals("")) {
+                SOSObject bean = SOS.parseSOSObject(sos);
+                if (bean != null) {
+                    String szObjectPackageName = bean.getObjectPackageName();
+                    LogUtils.d(TAG, String.format("szObjectPackageName %s", szObjectPackageName));
+                    String szObjectServiveName = bean.getObjectServiveName();
+                    LogUtils.d(TAG, String.format("szObjectServiveName %s", szObjectServiveName));
+
+                    Intent intentService = new Intent();
+                    intentService.setComponent(new ComponentName(szObjectPackageName, szObjectServiveName));
+                    context.startService(intentService);
+
+                    String appName = AppUtils.getAppNameByPackageName(context, szObjectPackageName);
+                    LogUtils.d(TAG, String.format("appName %s", appName));
+                    WinBoLLNewsBean appWinBoLLNewsBean = new WinBoLLNewsBean(appName);
+                    SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+                    String currentTime = sdf.format(new Date());
+                    StringBuilder sbLine = new StringBuilder();
+                    sbLine.append("[");
+                    sbLine.append(currentTime);
+                    sbLine.append("] Power to ");
+                    sbLine.append(appName);
+                    appWinBoLLNewsBean.setMessage(sbLine.toString());
+
+                    APPNewsWidget.addWinBoLLNewsBean(context, appWinBoLLNewsBean);
+
+                    Intent intentWidget = new Intent(context, APPNewsWidget.class);
+                    intentWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT);
+                    context.sendBroadcast(intentWidget);
+                }
+
+
+            }
+        } else {
+            ToastUtils.show(szAction);
+        }
+    }
+
+    // 注册 Receiver
+    //
+    public void registerAction(MainService service) {
+        IntentFilter filter=new IntentFilter();
+        filter.addAction(ACTION_BOOT_COMPLETED);
+        filter.addAction(SOS.ACTION_SOS);
+        filter.addAction(WinBoLL.ACTION_BIND);
+        //filter.addAction(Intent.ACTION_BATTERY_CHANGED);
+        service.registerReceiver(this, filter);
+    }
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/AssistantService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/AssistantService.java
@@ -0,0 +1,138 @@
+package cc.winboll.studio.appbase.services;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/02/14 03:38:31
+ * @Describe 守护进程服务
+ */
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import cc.winboll.studio.appbase.models.MainServiceBean;
+import cc.winboll.studio.appbase.services.AssistantService;
+import cc.winboll.studio.appbase.services.MainService;
+import cc.winboll.studio.libappbase.LogUtils;
+import android.os.Binder;
+
+public class AssistantService extends Service {
+
+    public static final String TAG = "AssistantService";
+
+    MainServiceBean mMainServiceBean;
+    MyServiceConnection mMyServiceConnection;
+    MainService mMainService;
+    boolean isBound = false;
+    volatile boolean isThreadAlive = false;
+
+    public synchronized void setIsThreadAlive(boolean isThreadAlive) {
+        LogUtils.d(TAG, "setIsThreadAlive(...)");
+        LogUtils.d(TAG, String.format("isThreadAlive %s", isThreadAlive));
+        this.isThreadAlive = isThreadAlive;
+    }
+
+    public boolean isThreadAlive() {
+        return isThreadAlive;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return new MyBinder();
+    }
+
+    @Override
+    public void onCreate() {
+        LogUtils.d(TAG, "onCreate");
+        super.onCreate();
+
+        //mMyBinder = new MyBinder();
+        if (mMyServiceConnection == null) {
+            mMyServiceConnection = new MyServiceConnection();
+        }
+        // 设置运行参数
+        setIsThreadAlive(false);
+        assistantService();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        LogUtils.d(TAG, "call onStartCommand(...)");
+        assistantService();
+        return START_STICKY;
+    }
+
+    @Override
+    public void onDestroy() {
+        //LogUtils.d(TAG, "onDestroy");
+        setIsThreadAlive(false);
+        // 解除绑定
+        if (isBound) {
+            unbindService(mMyServiceConnection);
+            isBound = false;
+        }
+        super.onDestroy();
+    }
+
+    // 运行服务内容
+    //
+    void assistantService() {
+        LogUtils.d(TAG, "assistantService()");
+        mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        LogUtils.d(TAG, String.format("mMainServiceBean.isEnable() %s", mMainServiceBean.isEnable()));
+        if (mMainServiceBean.isEnable()) {
+            LogUtils.d(TAG, String.format("mIsThreadAlive %s", isThreadAlive()));
+            if (isThreadAlive() == false) {
+                // 设置运行状态
+                setIsThreadAlive(true);
+                // 唤醒和绑定主进程
+                wakeupAndBindMain();
+            }
+        }
+    }
+
+    // 唤醒和绑定主进程
+    //
+    void wakeupAndBindMain() {
+        LogUtils.d(TAG, "wakeupAndBindMain()");
+        // 绑定服务的Intent
+        Intent intent = new Intent(this, MainService.class);
+        startService(new Intent(this, MainService.class));
+        bindService(intent, mMyServiceConnection, Context.BIND_IMPORTANT);
+    
+//        startService(new Intent(this, MainService.class));
+//        bindService(new Intent(AssistantService.this, MainService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
+    }
+
+    // 主进程与守护进程连接时需要用到此类
+    //
+    class MyServiceConnection implements ServiceConnection {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            LogUtils.d(TAG, "onServiceConnected(...)");
+            MainService.MyBinder binder = (MainService.MyBinder) service;
+            mMainService = binder.getService();
+            isBound = true;
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            LogUtils.d(TAG, "onServiceDisconnected(...)");
+            mMainServiceBean = MainServiceBean.loadBean(AssistantService.this, MainServiceBean.class);
+            if (mMainServiceBean.isEnable()) {
+                wakeupAndBindMain();
+            }
+            isBound = false;
+            mMainService = null;
+        }
+    }
+    
+    // 用于返回服务实例的Binder
+    public class MyBinder extends Binder {
+        AssistantService getService() {
+            LogUtils.d(TAG, "AssistantService MyBinder getService()");
+            return AssistantService.this;
+        }
+    }
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java
@@ -0,0 +1,317 @@
+package cc.winboll.studio.appbase.services;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/02/13 06:56:41
+ * @Describe 拨号主服务
+ * 参考:
+ * 进程保活-双进程守护的正确姿势
+ * https://blog.csdn.net/sinat_35159441/article/details/75267380
+ * Android Service之onStartCommand方法研究
+ * https://blog.csdn.net/cyp331203/article/details/38920491
+ */
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Binder;
+import android.os.IBinder;
+import cc.winboll.studio.appbase.MyTileService;
+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;
+
+public class MainService extends Service {
+
+    public static final String TAG = "MainService";
+
+    public static final int MSG_UPDATE_STATUS = 0;
+
+    static MainService _mControlCenterService;
+
+    volatile boolean isServiceRunning;
+
+    MainServiceBean mMainServiceBean;
+    MainServiceThread mMainServiceThread;
+    MainServiceHandler mMainServiceHandler;
+    MyServiceConnection mMyServiceConnection;
+    AssistantService mAssistantService;
+    boolean isBound = false;
+    MainReceiver mMainReceiver;
+    ArrayList<APPConnection> mAPPModelConnectionList;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return new MyBinder();
+    }
+
+    public MainServiceThread getRemindThread() {
+        return mMainServiceThread;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LogUtils.d(TAG, "onCreate()");
+        mAPPModelConnectionList = new ArrayList<APPConnection>();
+
+        _mControlCenterService = MainService.this;
+        isServiceRunning = false;
+        mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
+
+        if (mMyServiceConnection == null) {
+            mMyServiceConnection = new MyServiceConnection();
+        }
+        mMainServiceHandler = new MainServiceHandler(this);
+
+        // 运行服务内容
+        mainService();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        LogUtils.d(TAG, "onStartCommand(...)");
+        // 运行服务内容
+        mainService();
+        return (mMainServiceBean.isEnable()) ? START_STICKY : super.onStartCommand(intent, flags, startId);
+    }
+
+    // 运行服务内容
+    //
+    void mainService() {
+        LogUtils.d(TAG, "mainService()");
+        mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        if (mMainServiceBean.isEnable() && isServiceRunning == false) {
+            LogUtils.d(TAG, "mainService() start running");
+            isServiceRunning = true;
+            // 唤醒守护进程
+            wakeupAndBindAssistant();
+
+            if (mMainReceiver == null) {
+                // 注册广播接收器
+                mMainReceiver = new MainReceiver(this);
+                mMainReceiver.registerAction(this);
+            }
+
+            // 启动小部件
+            Intent intentTimeWidget = new Intent(this, APPNewsWidget.class);
+            intentTimeWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT);
+            this.sendBroadcast(intentTimeWidget);
+
+            startMainServiceThread();
+
+            MyTileService.updateServiceIconStatus(this);
+
+            LogUtils.i(TAG, "Main Service Is Start.");
+        }
+    }
+
+    // 唤醒和绑定守护进程
+    //
+    void wakeupAndBindAssistant() {
+        LogUtils.d(TAG, "wakeupAndBindAssistant()");
+
+        Intent intent = new Intent(this, AssistantService.class);
+        startService(intent);
+        // 绑定服务的Intent
+        bindService(intent, mMyServiceConnection, Context.BIND_IMPORTANT);
+    }
+
+    // 开启提醒铃声线程
+    //
+    public void startMainServiceThread() {
+        LogUtils.d(TAG, "startMainServiceThread");
+        if (mMainServiceThread == null) {
+            mMainServiceThread = new MainServiceThread(this, mMainServiceHandler);
+            LogUtils.d(TAG, "new MainServiceThread");
+        } else {
+            if (mMainServiceThread.isExist() == true) {
+                mMainServiceThread = new MainServiceThread(this, mMainServiceHandler);
+                LogUtils.d(TAG, "renew MainServiceThread");
+            } else {
+                // 提醒进程正在进行中就更新状态后退出
+                LogUtils.d(TAG, "A mMainServiceThread running.");
+                return;
+            }
+        }
+        mMainServiceThread.start();
+    }
+
+    public void stopRemindThread() {
+        if (mMainServiceThread != null) {
+            mMainServiceThread.setIsExist(true);
+            mMainServiceThread = null;
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        //LogUtils.d(TAG, "onDestroy");
+        mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        if (mMainServiceBean.isEnable() == false) {
+            // 设置运行状态
+            isServiceRunning = false;// 解除绑定
+            if (isBound) {
+                unbindService(mMyServiceConnection);
+                isBound = false;
+            }
+            // 停止守护进程
+            Intent intent = new Intent(this, AssistantService.class);
+            stopService(intent);
+            // 停止Receiver
+            if (mMainReceiver != null) {
+                unregisterReceiver(mMainReceiver);
+                mMainReceiver = null;
+            }
+            // 停止前台通知栏
+            stopForeground(true);
+            // 停止消息提醒进程
+            stopRemindThread();
+
+            MyTileService.updateServiceIconStatus(this);
+
+            super.onDestroy();
+            //LogUtils.d(TAG, "onDestroy done");
+        }
+    }
+
+    public void bindWinBoLLModelConnection(WinBoLLModel bean) {
+        LogUtils.d(TAG, "bindAPPModelConnection(...)");
+        // 清理旧的绑定链接
+        for (int i = mAPPModelConnectionList.size() - 1; i > -1; i--) {
+            APPConnection item = mAPPModelConnectionList.get(i);
+            if (item.isBindToAPP(bean)) {
+                LogUtils.d(TAG, "Bind Servive exist.");
+                unbindService(item);
+                mAPPModelConnectionList.remove(i);
+            }
+        }
+
+        // 绑定服务
+        APPConnection appConnection = new APPConnection();
+        Intent intentService = new Intent();
+        intentService.setComponent(new ComponentName(bean.getAppPackageName(), bean.getAppMainServiveName()));
+        bindService(intentService, appConnection, Context.BIND_IMPORTANT);
+        mAPPModelConnectionList.add(appConnection);
+        
+        Intent intentWidget = new Intent(this, APPNewsWidget.class);
+        intentWidget.setAction(APPNewsWidget.ACTION_WAKEUP_SERVICE);
+        WinBoLLModel appSOSBean = new WinBoLLModel(bean.getAppPackageName(), bean.getAppMainServiveName());
+        intentWidget.putExtra("APPSOSBean", appSOSBean.toString());
+        sendBroadcast(intentWidget);
+    }
+
+    public class APPConnection implements ServiceConnection {
+
+        ComponentName mComponentName;
+
+        boolean isBindToAPP(WinBoLLModel bean) {
+            return mComponentName != null
+                && mComponentName.getClassName().equals(bean.getAppMainServiveName())
+                && mComponentName.getPackageName().equals(bean.getAppPackageName());
+        }
+
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            LogUtils.d(TAG, "onServiceConnected(...)");
+            mComponentName = name;
+            LogUtils.d(TAG, String.format("onServiceConnected : \ngetClassName %s\ngetPackageName %s", name.getClassName(), name.getPackageName()));
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            LogUtils.d(TAG, "onServiceDisconnected(...)");
+            LogUtils.d(TAG, String.format("onServiceDisconnected : \ngetClassName %s\ngetPackageName %s", name.getClassName(), name.getPackageName()));
+
+            // 尝试无参数启动一下服务
+            String appPackage = mComponentName.getPackageName();
+            LogUtils.d(TAG, String.format("appPackage %s", appPackage));
+            String appMainServiceClassName = mComponentName.getClassName();
+            LogUtils.d(TAG, String.format("appMainServiceClassName %s", appMainServiceClassName));
+
+            Intent intentService = new Intent();
+            intentService.setComponent(new ComponentName(appPackage, appMainServiceClassName));
+            startService(intentService);
+        }
+
+    }
+
+    // 主进程与守护进程连接时需要用到此类
+    //
+    private class MyServiceConnection implements ServiceConnection {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            LogUtils.d(TAG, "onServiceConnected(...)");
+            AssistantService.MyBinder binder = (AssistantService.MyBinder) service;
+            mAssistantService = binder.getService();
+            isBound = true;
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            LogUtils.d(TAG, "onServiceDisconnected(...)");
+
+            if (mMainServiceBean.isEnable()) {
+                // 唤醒守护进程
+                wakeupAndBindAssistant();
+            }
+            isBound = false;
+            mAssistantService = null;
+        }
+
+    }
+
+
+    // 用于返回服务实例的Binder
+    public class MyBinder extends Binder {
+        MainService getService() {
+            LogUtils.d(TAG, "MainService MyBinder getService()");
+            return MainService.this;
+        }
+    }
+
+//    //
+//    // 启动服务
+//    //
+//    public static void startControlCenterService(Context context) {
+//        Intent intent = new Intent(context, MainService.class);
+//        context.startForegroundService(intent);
+//    }
+//
+//    //
+//    // 停止服务
+//    //
+//    public static void stopControlCenterService(Context context) {
+//        Intent intent = new Intent(context, MainService.class);
+//        context.stopService(intent);
+//    }
+
+    public void appenMessage(String message) {
+        LogUtils.d(TAG, String.format("Message : %s", message));
+    }
+
+    public static void stopMainService(Context context) {
+        LogUtils.d(TAG, "stopMainService");
+        MainServiceBean bean = new MainServiceBean();
+        bean.setIsEnable(false);
+        MainServiceBean.saveBean(context, bean);
+        context.stopService(new Intent(context, MainService.class));
+    }
+
+    public static void startMainService(Context context) {
+        LogUtils.d(TAG, "startMainService");
+        MainServiceBean bean = new MainServiceBean();
+        bean.setIsEnable(true);
+        MainServiceBean.saveBean(context, bean);
+        context.startService(new Intent(context, MainService.class));
+    }
+}
+
--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java
@@ -0,0 +1,179 @@
+package cc.winboll.studio.appbase.services;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/03/07 12:45:49
+ * @Describe 启动时申请绑定到APPBase主服务的服务示例
+ */
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+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 {
+
+    public static final String TAG = "TestDemoBindService";
+
+    public static final String ACTION_ENABLE = TestDemoBindService.class.getName() + ".ACTION_ENABLE";
+    public static final String ACTION_DISABLE = TestDemoBindService.class.getName() + ".ACTION_DISABLE";
+
+    volatile static TestThread _TestThread;
+
+    volatile static boolean _IsRunning;
+
+    public synchronized static void setIsRunning(boolean isRunning) {
+        _IsRunning = isRunning;
+    }
+
+    public static boolean isRunning() {
+        return _IsRunning;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return new MyBinder();
+    }
+
+    public class MyBinder extends Binder {
+        public TestDemoBindService getService() {
+            return TestDemoBindService.this;
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LogUtils.d(TAG, "onCreate()");
+
+        run();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        LogUtils.d(TAG, "onStartCommand(...)");
+        TestDemoBindServiceBean bean = TestDemoBindServiceBean.loadBean(this, TestDemoBindServiceBean.class);
+        if (bean == null) {
+            bean = new TestDemoBindServiceBean();
+        }
+
+        if (intent.getAction() != null) {
+            if (intent.getAction().equals(ACTION_ENABLE)) {
+                bean.setIsEnable(true);
+                LogUtils.d(TAG, "setIsEnable(true);");
+                TestDemoBindServiceBean.saveBean(this, bean);
+            } else if (intent.getAction().equals(ACTION_DISABLE)) {
+                bean.setIsEnable(false);
+                LogUtils.d(TAG, "setIsEnable(false);");
+                TestDemoBindServiceBean.saveBean(this, bean);
+            }
+        }
+
+        run();
+
+        return (bean.isEnable()) ? START_STICKY : super.onStartCommand(intent, flags, startId);
+        //return super.onStartCommand(intent, flags, startId);
+    }
+
+    void run() {
+        LogUtils.d(TAG, "run()");
+        TestDemoBindServiceBean bean = TestDemoBindServiceBean.loadBean(this, TestDemoBindServiceBean.class);
+        if (bean == null) {
+            bean = new TestDemoBindServiceBean();
+            TestDemoBindServiceBean.saveBean(this, bean);
+        }
+        if (bean.isEnable()) {
+            LogUtils.d(TAG, "run() bean.isEnable()");
+            TestThread.getInstance(this).start();
+            LogUtils.d(TAG, "_TestThread.start()");
+        }
+    }
+
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy()");
+        TestDemoBindServiceBean bean = TestDemoBindServiceBean.loadBean(this, TestDemoBindServiceBean.class);
+        if (bean == null) {
+            bean = new TestDemoBindServiceBean();
+        }
+
+        TestThread.getInstance(this).setIsExit(true);
+        
+        // 预防 APPBase 应用重启绑定失效。
+        // 所以退出时检查本服务是否配置启用，如果启用就发送一个 SOS 信号。
+        // 这样 APPBase 就会用组件方式启动本服务。
+        if (bean.isEnable()) {
+            if (App.isDebuging()) {
+                SOS.sosToAppBaseBeta(this, TestDemoBindService.class.getName());
+            } else {
+                SOS.sosToAppBase(this, TestDemoBindService.class.getName());
+            }
+        }
+
+        _IsRunning = false;
+    }
+
+    static class TestThread extends Thread {
+
+        volatile static TestThread _TestThread;
+        Context mContext;
+        volatile boolean isStarted = false;
+        volatile boolean isExit = false;
+
+        TestThread(Context context) {
+            super();
+            mContext = context;
+        }
+
+        public static synchronized TestThread getInstance(Context context) {
+            if (_TestThread != null) {
+                _TestThread.setIsExit(true);
+            }
+            _TestThread = new TestThread(context);
+
+            return _TestThread;
+        }
+
+        public synchronized void setIsExit(boolean isExit) {
+            this.isExit = isExit;
+        }
+
+        public boolean isExit() {
+            return isExit;
+        }
+
+        @Override
+        public void run() {
+            if (isStarted == false) {
+                isStarted = true;
+                super.run();
+                LogUtils.d(TAG, "run() start");
+                if (App.isDebuging()) {
+                    WinBoLL.bindToAPPBaseBeta(mContext, TestDemoBindService.class.getName());
+                } else {
+                    WinBoLL.bindToAPPBase(mContext, TestDemoBindService.class.getName());
+                }
+
+                while (!isExit()) {
+                    LogUtils.d(TAG, "run()");
+
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                    }
+                }
+
+                LogUtils.d(TAG, "run() exit");
+            }
+        }
+    }
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java
@@ -0,0 +1,155 @@
+package cc.winboll.studio.appbase.services;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/03/07 12:39:24
+ * @Describe 普通服务示例
+ */
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+import cc.winboll.studio.appbase.models.TestDemoServiceBean;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class TestDemoService extends Service {
+
+    public static final String TAG = "TestDemoService";
+
+    public static final String ACTION_ENABLE = TestDemoService.class.getName() + ".ACTION_ENABLE";
+    public static final String ACTION_DISABLE = TestDemoService.class.getName() + ".ACTION_DISABLE";
+
+    volatile static TestThread _TestThread;
+
+    volatile static boolean _IsRunning;
+
+    public synchronized static void setIsRunning(boolean isRunning) {
+        _IsRunning = isRunning;
+    }
+
+    public static boolean isRunning() {
+        return _IsRunning;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return new MyBinder();
+    }
+
+    public class MyBinder extends Binder {
+        public TestDemoService getService() {
+            return TestDemoService.this;
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LogUtils.d(TAG, "onCreate()");
+
+
+        run();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        LogUtils.d(TAG, "onStartCommand(...)");
+        TestDemoServiceBean bean = TestDemoServiceBean.loadBean(this, TestDemoServiceBean.class);
+        if (bean == null) {
+            bean = new TestDemoServiceBean();
+        }
+
+        if (intent.getAction() != null) {
+            if (intent.getAction().equals(ACTION_ENABLE)) {
+                bean.setIsEnable(true);
+                LogUtils.d(TAG, "setIsEnable(true);");
+                TestDemoServiceBean.saveBean(this, bean);
+            } else if (intent.getAction().equals(ACTION_DISABLE)) {
+                bean.setIsEnable(false);
+                LogUtils.d(TAG, "setIsEnable(false);");
+                TestDemoServiceBean.saveBean(this, bean);
+            }
+        }
+
+        run();
+
+        return (bean.isEnable()) ? START_STICKY : super.onStartCommand(intent, flags, startId);
+        //return super.onStartCommand(intent, flags, startId);
+    }
+
+    void run() {
+        LogUtils.d(TAG, "run()");
+        TestDemoServiceBean bean = TestDemoServiceBean.loadBean(this, TestDemoServiceBean.class);
+        if (bean == null) {
+            bean = new TestDemoServiceBean();
+            TestDemoServiceBean.saveBean(this, bean);
+        }
+        if (bean.isEnable()) {
+            LogUtils.d(TAG, "run() bean.isEnable()");
+            TestThread.getInstance(this).start();
+            LogUtils.d(TAG, "_TestThread.start()");
+        }
+    }
+
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy()");
+        TestThread.getInstance(this).setIsExit(true);
+
+        _IsRunning = false;
+    }
+
+    static class TestThread extends Thread {
+
+        volatile static TestThread _TestThread;
+        Context mContext;
+        volatile boolean isStarted = false;
+        volatile boolean isExit = false;
+
+        TestThread(Context context) {
+            super();
+            mContext = context;
+        }
+
+        public static synchronized TestThread getInstance(Context context) {
+            if (_TestThread != null) {
+                _TestThread.setIsExit(true);
+            }
+            _TestThread = new TestThread(context);
+
+            return _TestThread;
+        }
+
+        public synchronized void setIsExit(boolean isExit) {
+            this.isExit = isExit;
+        }
+
+        public boolean isExit() {
+            return isExit;
+        }
+
+        @Override
+        public void run() {
+            if (isStarted == false) {
+                isStarted = true;
+                super.run();
+                LogUtils.d(TAG, "run() start");
+
+                while (!isExit()) {
+                    LogUtils.d(TAG, "run()");
+
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                    }
+                }
+
+                LogUtils.d(TAG, "run() exit");
+            }
+        }
+    }
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/threads/MainServiceThread.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/threads/MainServiceThread.java
@@ -0,0 +1,54 @@
+package cc.winboll.studio.appbase.threads;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/02/14 03:46:44
+ */
+import android.content.Context;
+import cc.winboll.studio.appbase.handlers.MainServiceHandler;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.lang.ref.WeakReference;
+
+public class MainServiceThread extends Thread {
+
+    public static final String TAG = "MainServiceThread";
+
+    Context mContext;
+
+    // 控制线程是否退出的标志
+    volatile boolean isExist = false;
+
+    // 服务Handler, 用于线程发送消息使用
+    WeakReference<MainServiceHandler> mwrMainServiceHandler;
+
+    public void setIsExist(boolean isExist) {
+        this.isExist = isExist;
+    }
+
+    public boolean isExist() {
+        return isExist;
+    }
+
+    public MainServiceThread(Context context, MainServiceHandler handler) {
+        mContext = context;
+        mwrMainServiceHandler = new WeakReference<MainServiceHandler>(handler);
+    }
+
+    @Override
+    public void run() {
+        LogUtils.d(TAG, "run()");
+
+        while (!isExist()) {
+            //ToastUtils.show("run()");
+            //LogUtils.d(TAG, "run()");
+
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            }
+        }
+        LogUtils.d(TAG, "run() exit.");
+    }
+
+}
--- a/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java
@@ -0,0 +1,187 @@
+package cc.winboll.studio.appbase.widgets;
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/02/15 14:41:25
+ * @Describe TimeWidget
+ */
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.widget.RemoteViews;
+import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.appbase.receivers.APPNewsWidgetClickListener;
+import cc.winboll.studio.libappbase.AppUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+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 {
+
+    public static final String TAG = "APPNewsWidget";
+    
+    public static final String ACTION_WAKEUP_SERVICE = APPNewsWidget.class.getName() + ".ACTION_WAKEUP_SERVICE";
+    public static final String ACTION_RELOAD_REPORT = APPNewsWidget.class.getName() + ".ACTION_RELOAD_REPORT";
+
+
+    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);
+        for (int appWidgetId : appWidgetIds) {
+            updateAppWidget(context, appWidgetManager, appWidgetId);
+        }
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        super.onReceive(context, intent);
+        initWinBoLLNewsBeanList(context);
+        if (intent.getAction().equals(ACTION_RELOAD_REPORT)) {
+            LogUtils.d(TAG, "ACTION_RELOAD_REPORT");
+            AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
+            int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, APPNewsWidget.class));
+            for (int appWidgetId : appWidgetIds) {
+                updateAppWidget(context, appWidgetManager, appWidgetId);
+            }
+        }else if (intent.getAction().equals(ACTION_WAKEUP_SERVICE)) {
+            LogUtils.d(TAG, "ACTION_WAKEUP_SERVICE");
+            String szWinBoLLModel = intent.getStringExtra(WinBoLL.EXTRA_WINBOLLMODEL);
+            LogUtils.d(TAG, String.format("szWinBoLLModel %s", szWinBoLLModel));
+            if (szWinBoLLModel != null && !szWinBoLLModel.equals("")) {
+                try {
+                    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));
+
+                        
+                        String appName = AppUtils.getAppNameByPackageName(context, szAppPackageName);
+                        LogUtils.d(TAG, String.format("appName %s", appName));
+                        WinBoLLNewsBean winBollNewsBean = new WinBoLLNewsBean(appName);
+                        SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+                        String currentTime = sdf.format(new Date());
+                        StringBuilder sbLine = new StringBuilder();
+                        sbLine.append("[");
+                        sbLine.append(currentTime);
+                        sbLine.append("] Wake up ");
+                        sbLine.append(appName);
+                        winBollNewsBean.setMessage(sbLine.toString());
+                        
+                        addWinBoLLNewsBean(context, winBollNewsBean);
+
+                        AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
+                        int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, APPNewsWidget.class));
+                        for (int appWidgetId : appWidgetIds) {
+                            updateAppWidget(context, appWidgetManager, appWidgetId);
+                        }
+                    }
+                } catch (IOException e) {
+                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                }
+            }
+        }
+    }
+
+    //
+    // 加入新报告信息
+    //
+    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);
+        }
+        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);
+        }
+        if (_WinBoLLNewsBeanList == null) {
+            _WinBoLLNewsBeanList = new ArrayList<WinBoLLNewsBean>();
+            WinBoLLNewsBean.saveBeanList(context, _WinBoLLNewsBeanList, WinBoLLNewsBean.class);
+        }
+    }
+
+    private void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId) {
+        LogUtils.d(TAG, "updateAppWidget(...)");
+
+        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_news);
+        //设置按钮点击事件
+        Intent intentPre = new Intent(context, APPNewsWidgetClickListener.class);
+        intentPre.setAction(APPNewsWidgetClickListener.ACTION_PRE);
+        PendingIntent pendingIntentPre = PendingIntent.getBroadcast(context, 0, intentPre, PendingIntent.FLAG_UPDATE_CURRENT);
+        views.setOnClickPendingIntent(R.id.widget_button_pre, pendingIntentPre);
+        Intent intentNext = new Intent(context, APPNewsWidgetClickListener.class);
+        intentNext.setAction(APPNewsWidgetClickListener.ACTION_NEXT);
+        PendingIntent pendingIntentNext = PendingIntent.getBroadcast(context, 0, intentNext, PendingIntent.FLAG_UPDATE_CURRENT);
+        views.setOnClickPendingIntent(R.id.widget_button_next, pendingIntentNext);
+
+        views.setTextViewText(R.id.tv_msg, getPageInfo());
+        views.setTextViewText(R.id.tv_news, getMessage());
+        appWidgetManager.updateAppWidget(appWidgetId, views);
+    }
+
+    public static String getMessage() {
+        ArrayList<String> msgTemp = new ArrayList<String>();
+        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());
+            }
+            String message = String.join("\n", msgTemp);
+            return message;
+        }
+        return "";
+    }
+
+    public static void prePage(Context context) {
+        if (_WinBoLLNewsBeanList != null) {
+            if (_CurrentPageIndex > 0) {
+                _CurrentPageIndex = _CurrentPageIndex - 1;
+            }
+            Intent intentWidget = new Intent(context, APPNewsWidget.class);
+            intentWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT);
+            context.sendBroadcast(intentWidget);
+        }
+    }
+
+    public static void nextPage(Context context) {
+        if (_WinBoLLNewsBeanList != null) {
+            if ((_CurrentPageIndex + 1) * _OnePageLinesCount < _WinBoLLNewsBeanList.size()) {
+                _CurrentPageIndex = _CurrentPageIndex + 1;
+            }
+            Intent intentWidget = new Intent(context, APPNewsWidget.class);
+            intentWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT);
+            context.sendBroadcast(intentWidget);
+        }
+    }
+
+    String getPageInfo() {
+        if (_WinBoLLNewsBeanList == null) {
+            return "0/0";
+        }
+        int leftCount = _WinBoLLNewsBeanList.size() % _OnePageLinesCount;
+        int currentPageCount = _WinBoLLNewsBeanList.size() / _OnePageLinesCount + (leftCount == 0 ?0: 1);
+        return String.format("%d/%d", _CurrentPageIndex + 1, currentPageCount);
+    }
+}
--- a/appbase/src/main/res/drawable/btn_light_blue.xml
+++ b/appbase/src/main/res/drawable/btn_light_blue.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#81C7F5"/> <!-- 浅蓝色填充 -->
-    <corners android:radius="8dp"/> <!-- 8dp 圆角 -->
-</shape>
-
--- a/appbase/src/main/res/drawable/ic_cloud.xml
+++ b/appbase/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>
--- a/appbase/src/main/res/drawable/ic_cloud_outline.xml
+++ b/appbase/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>
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -3,45 +3,219 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:padding="16dp">
+	android:layout_height="match_parent">

 	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>

-	<LinearLayout
+	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1"
-		android:orientation="vertical"
-		android:gravity="center_vertical"
-		android:spacing="12dp">
+		android:layout_weight="1.0">

-		<Button
+		<LinearLayout
+			xmlns:app="http://schemas.android.com/apk/res-auto"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:text="应用崩溃测试"
-			android:textSize="16sp"
-			android:textColor="@android:color/white"
-			android:background="#81C7F5"
-			android:paddingVertical="12dp"
-			android:layout_marginHorizontal="24dp"
-			android:onClick="onCrashTest"/>
+			android:orientation="vertical"
+			android:gravity="center">

-		<Button
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="应用日志测试"
-			android:textSize="16sp"
-			android:textColor="@android:color/white"
-			android:background="#81C7F5"
-			android:paddingVertical="12dp"
-			android:layout_marginHorizontal="24dp"
-			android:onClick="onLogTest"/>
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:layout_weight="1.0"
+				android:gravity="center_horizontal">

-	</LinearLayout>
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="Hello, WinBoLL!"/>
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="Android版本10的代号是“Q”，API级别是29。   Android 10开始谷歌不再公开使用甜品作为版本代号，但内部仍保留了大量与“Q”相关的元素。Android 10本身并没有严格对应某个特定的Java版本，但在开发Android 10应用时，通常可以使用Java 8或更高版本。   Java 8为Android开发带来了诸如Lambda表达式、方法引用等新特性，能提高开发效率和代码可读性，与Android 10开发适配良好。Java 9及更高版本也可用于Android 10开发，能使用一些新的语言特性和API，但可能需要注意兼容性和配置问题。"/>
+
+				<HorizontalScrollView
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content">
+
+					<LinearLayout
+						android:orientation="horizontal"
+						android:layout_height="wrap_content"
+						android:gravity="right|center_vertical"
+						android:layout_width="wrap_content">
+
+						<CheckBox
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="Debug Mode"
+							android:layout_weight="1.0"
+							android:onClick="onSwitchDebugMode"
+							android:id="@+id/activitymainCheckBox1"/>
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="Test Application CrashReport"
+							android:textAllCaps="false"
+							android:onClick="onTestApplicationCrashReport"/>
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="PreviewGlobalCrashActivity"
+							android:textAllCaps="false"
+							android:onClick="onPreviewGlobalCrashActivity"/>
+
+					</LinearLayout>
+
+				</HorizontalScrollView>
+
+				<ScrollView
+					android:layout_width="match_parent"
+					android:layout_height="400dp">
+
+					<LinearLayout
+						android:orientation="vertical"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:gravity="right">
+
+						<LinearLayout
+							android:orientation="horizontal"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content">
+
+							<Button
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:text="StartCenter"
+								android:textAllCaps="false"
+								android:onClick="onStartCenter"/>
+
+							<Button
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:text="StopCenter"
+								android:textAllCaps="false"
+								android:onClick="onStopCenter"/>
+
+						</LinearLayout>
+
+						<HorizontalScrollView
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content">
+
+							<LinearLayout
+								android:orientation="horizontal"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content">
+
+								<Button
+									android:layout_width="wrap_content"
+									android:layout_height="wrap_content"
+									android:text="SartTestDemoService"
+									android:textAllCaps="false"
+									android:onClick="onSartTestDemoService"/>
+
+								<Button
+									android:layout_width="wrap_content"
+									android:layout_height="wrap_content"
+									android:text="StopTestDemoService"
+									android:textAllCaps="false"
+									android:onClick="onStopTestDemoService"/>
+
+								<Button
+									android:layout_width="wrap_content"
+									android:layout_height="wrap_content"
+									android:text="StopTestDemoServiceNoSettings"
+									android:textAllCaps="false"
+									android:onClick="onStopTestDemoServiceNoSettings"/>
+
+							</LinearLayout>
+
+						</HorizontalScrollView>
+
+						<HorizontalScrollView
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content">
+
+							<LinearLayout
+								android:orientation="horizontal"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content">
+
+								<Button
+									android:layout_width="wrap_content"
+									android:layout_height="wrap_content"
+									android:text="SartTestDemoBindService"
+									android:textAllCaps="false"
+									android:onClick="onSartTestDemoBindService"/>
+
+								<Button
+									android:layout_width="wrap_content"
+									android:layout_height="wrap_content"
+									android:text="StopTestDemoBindService"
+									android:textAllCaps="false"
+									android:onClick="onStopTestDemoBindService"/>
+
+								<Button
+									android:layout_width="wrap_content"
+									android:layout_height="wrap_content"
+									android:text="StopTestDemoBindServiceNoSettings"
+									android:textAllCaps="false"
+									android:onClick="onStopTestDemoBindServiceNoSettings"/>
+
+							</LinearLayout>
+
+						</HorizontalScrollView>
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="TestStopMainServiceWithoutSettingEnable"
+							android:textAllCaps="false"
+							android:onClick="onTestStopMainServiceWithoutSettingEnable"/>
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="TestUseComponentStartService"
+							android:textAllCaps="false"
+							android:onClick="onTestUseComponentStartService"/>
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="TestDemoServiceSOS"
+							android:textAllCaps="false"
+							android:onClick="onTestDemoServiceSOS"/>
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="TestOpenNewActivity"
+							android:textAllCaps="false"
+							android:onClick="onTestOpenNewActivity"/>
+
+					</LinearLayout>
+
+				</ScrollView>
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+	</ScrollView>
+
+	<cc.winboll.studio.libappbase.LogView
+		android:layout_width="match_parent"
+		android:layout_height="300dp"
+		android:id="@+id/logview"/>

 </LinearLayout>

--- a/appbase/src/main/res/layout/activity_new.xml
+++ b/appbase/src/main/res/layout/activity_new.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+    <android.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+		android:id="@+id/toolbar"/>
+    
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="NewActivity"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="CloseThisActivity"
+        android:textAllCaps="false"
+        android:onClick="onCloseThisActivity"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="CloseAllActivity"
+        android:textAllCaps="false"
+        android:onClick="onCloseAllActivity"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="New2Activity"
+        android:textAllCaps="false"
+        android:onClick="onNew2Activity"/>
+
+    
+    
+</LinearLayout>
+
--- a/appbase/src/main/res/layout/activity_new2.xml
+++ b/appbase/src/main/res/layout/activity_new2.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+    <android.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+		android:id="@+id/toolbar"/>
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="New2Activity"/>
+
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="CloseThisActivity"
+		android:textAllCaps="false"
+		android:onClick="onCloseThisActivity"/>
+
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="CloseAllActivity"
+		android:textAllCaps="false"
+		android:onClick="onCloseAllActivity"/>
+
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="NewActivity"
+		android:textAllCaps="false"
+		android:onClick="onNewActivity"/>
+
+	
+
+</LinearLayout>
+
--- a/appbase/src/main/res/layout/widget_news.xml
+++ b/appbase/src/main/res/layout/widget_news.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	android:background="#FFFFFFFF">
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="right|center_vertical">
+
+		<TextView
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:id="@+id/tv_title"
+			android:layout_weight="1.0"
+			android:text="WinBoLLNews"
+			android:textStyle="bold"
+			android:textSize="16sp"/>
+
+		<Button
+			android:layout_width="48dp"
+			android:layout_height="48dp"
+			android:text="⇦"
+			android:id="@+id/widget_button_pre"/>
+
+		<Button
+			android:layout_width="48dp"
+			android:layout_height="48dp"
+			android:text="⇨"
+			android:id="@+id/widget_button_next"/>
+
+	</LinearLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/tv_msg"/>
+    
+	<TextView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:id="@+id/tv_news"
+		android:layout_weight="1.0"/>
+
+</LinearLayout>
+
--- a/appbase/src/main/res/menu/toolbar_main.xml
+++ b/appbase/src/main/res/menu/toolbar_main.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/item_home"
-        android:title="WinBoLL Home"
-        android:icon="@drawable/ic_winboll"/>
+    
+    
 </menu>
--- a/appbase/src/main/res/xml/widget_provider_info_sos.xml
+++ b/appbase/src/main/res/xml/widget_provider_info_sos.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="200dp"
+    android:minHeight="100dp"
+    android:updatePeriodMillis="1000"
+    android:initialLayout="@layout/widget_news">
+</appwidget-provider>
--- a/apputils/build.gradle
+++ b/apputils/build.gradle
@@ -29,7 +29,7 @@ android {
        // versionName 更新后需要手动设置 
        // 项目模块目录的 build.gradle 文件的 stageCount=0
        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.8" 
+        versionName "15.3" 
        if(true) {
            versionName = genVersionName("${versionName}")
        }
--- a/apputils/build.properties
+++ b/apputils/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Sep 01 07:56:33 HKT 2025
-stageCount=7
+#Tue Apr 29 15:04:17 HKT 2025
+stageCount=5
 libraryProject=libapputils
-baseVersion=15.8
-publishVersion=15.8.6
+baseVersion=15.3
+publishVersion=15.3.4
 buildCount=0
-baseBetaVersion=15.8.7
+baseBetaVersion=15.3.5
--- a/apputils/src/main/java/cc/winboll/studio/apputils/App.java
+++ b/apputils/src/main/java/cc/winboll/studio/apputils/App.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.apputils;

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

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/01/03 11:02:49
 * @Describe 一个可以浏览随 APP 附带的 Html 文档的窗口
 */
@@ -20,7 +20,18 @@ import cc.winboll.studio.libapputils.views.SimpleWebView;
 import java.io.IOException;
 import java.io.InputStream;

-public class AssetsHtmlActivity extends WinBoLLActivity implements IWinBoLLActivity {
+public class AssetsHtmlActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
+
+    @Override
+    public Activity getActivity() {
+        return super.getActivity();
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+

    public static final String TAG = "AssetsHtmlActivity";

@@ -32,17 +43,12 @@ public class AssetsHtmlActivity extends WinBoLLActivity implements IWinBoLLActiv

    // 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);
--- a/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java
+++ b/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java
@@ -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);
--- a/apputils/src/main/java/cc/winboll/studio/apputils/QRCodeDecodeActivity.java
+++ b/apputils/src/main/java/cc/winboll/studio/apputils/QRCodeDecodeActivity.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.apputils;

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

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/23 16:14:45
 */
 import android.app.Activity;
--- a/autoinstaller/README.md
+++ b/autoinstaller/README.md
@@ -1,35 +0,0 @@
-# AutoInstaller
-
-#### 介绍
-APK 文件监控，监控指定文件路径的 APK 文件。
-在 APK 文件改变后自动调用系统安装命令安装，或者调用[应用信息查看器]打开。
-
-#### 软件架构
-适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
-也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
-
-
-#### Gradle 编译说明
-调试版编译命令 ：gradle assembleBetaDebug
-阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh autoinstaller
-
-#### 使用说明
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
-4.  新建 Pull Request
-
-
-#### 特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
-5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
-
-#### 参考文档
--- a/autoinstaller/build.properties
+++ b/autoinstaller/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Jun 24 09:54:47 HKT 2025
-stageCount=3
+#Sun May 04 05:32:00 GMT 2025
+stageCount=1
 libraryProject=
 baseVersion=15.2
-publishVersion=15.2.2
-buildCount=0
-baseBetaVersion=15.2.3
+publishVersion=15.2.0
+buildCount=74
+baseBetaVersion=15.2.1
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/App.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/App.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.autoinstaller;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2024/04/28 02:39:58
 * @Describe 全局应用类
 */
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/AppBaseTileService.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/AppBaseTileService.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.autoinstaller;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/04/15 09:24:46
 * @Describe 磁贴工具服务类
 */
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/APKModel.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/APKModel.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.autoinstaller.models;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/04/02 20:50:29
 * @Describe 监控的 APK 安装文件对应的应用信息数据模型
 */
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/AppConfigs.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/AppConfigs.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.autoinstaller.models;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2024/05/27 17:36:01
 * @Describe 应用配置数据类
 */
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/MainServiceBean.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/MainServiceBean.java
@@ -5,7 +5,7 @@ import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/04/15 09:27:39
 * @Describe MainServiceBean
 */
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/receivers/MainReceiver.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/receivers/MainReceiver.java
@@ -9,7 +9,7 @@ import cc.winboll.studio.autoinstaller.services.MainService;
 import cc.winboll.studio.libappbase.LogUtils;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2024/06/06 13:19:38
 * @Describe 应用消息接收类
 */
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/AssistantService.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/AssistantService.java
@@ -10,7 +10,7 @@ import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.utils.ServiceUtil;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2024/05/27 20:16:00
 * @Describe MainService 守护进程服务
 */
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/FileUtil.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/FileUtil.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.autoinstaller.utils;

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

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2024/12/11 06:28:50
 * @Describe 一个获取安卓APK安装文件的应用包名的函数
 */
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/ServiceUtil.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/ServiceUtil.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.autoinstaller.utils;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2024/05/27 20:20:03
 * @Describe 服务类工具
 */
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,14 @@ buildscript {
        //mavenLocal()
        
        // WinBoLL.CC 紧急备用 Maven 仓库
-        maven { url 'https://spare-maven.winboll.cc/repository/' }
+        //maven { url 'https://spare-maven.winboll.cc/repository/' }
+        maven {
+            url 'sftp://studio@winboll.cc:2222//winboll/spare-maven/repository/'
+            credentials {
+                username 'studio'
+                password 'winbollstudio'
+            }
+        }
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:7.2.1' // 对应 compileSdkVersion 32
@@ -40,7 +47,6 @@ allprojects {
            // 设置本地Maven仓库路径
            url 'file:///sdcard/.m2/repository/'
        }
-        
        // Nexus Maven 库地址
        // "WinBoLL Release"
        maven { url "https://nexus.winboll.cc/repository/maven-public/" }
@@ -61,7 +67,14 @@ allprojects {
        //mavenLocal()
        
        // WinBoLL.CC 紧急备用 Maven 仓库
-        maven { url 'https://spare-maven.winboll.cc/repository/' }
+        //maven { url 'https://spare-maven.winboll.cc/repository/' }
+        maven {
+            url 'sftp://studio@winboll.cc:2222//winboll/spare-maven/repository/'
+            credentials {
+                username 'studio'
+                password 'winbollstudio'
+            }
+        }
    }
    ext {
        // 定义全局变量，常用于版本管理
@@ -72,7 +85,7 @@ allprojects {
        bashCommitAppPublishBuildFlagInfoFilePath = ".winboll/bashCommitAppPublishBuildFlagInfo.sh"
        
        winbollFilePath = "winboll.properties"
-        keyPropsFilePath = "appkey.keystore"
+        keyPropsFilePath = "current.keystore"
        // 定义 lint 输出文件
        lintXmlReportFilePath = "build/reports/lint-results.xml"
        lintHTMLReportFilePath = "build/reports/lint-results.html"
--- a/contacts/README.md
+++ b/contacts/README.md
@@ -3,7 +3,7 @@
 https://github.com/aJIEw/PhoneCallApp.git

 #### 介绍
-这是可以根据正则表达式匹配拦截骚扰电话的手机拨号应用。
+通讯录与拨号

 #### 软件架构
 适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
--- a/contacts/build.gradle
+++ b/contacts/build.gradle
@@ -24,12 +24,12 @@ android {
    defaultConfig {
        applicationId "cc.winboll.studio.contacts"
        minSdkVersion 24
-        targetSdkVersion 30
+        targetSdkVersion 29
        versionCode 1
        // versionName 更新后需要手动设置 
        // 项目模块目录的 build.gradle 文件的 stageCount=0
        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.3" 
+        versionName "15.2" 
        if(true) {
            versionName = genVersionName("${versionName}")
        }
@@ -45,9 +45,6 @@ android {

 dependencies {
    api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libaes:15.9.3'
-    api 'cc.winboll.studio:libapputils:15.8.5'
-    api 'cc.winboll.studio:libappbase:15.9.5'
    
    // 权限请求框架：https://github.com/getActivity/XXPermissions
    api 'com.github.getActivity:XXPermissions:18.63'
@@ -84,4 +81,8 @@ dependencies {
    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
    //api 'androidx.fragment:fragment:1.1.0'
+    
+    api 'cc.winboll.studio:libaes:15.2.4'
+    api 'cc.winboll.studio:libapputils:15.2.1'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }
--- a/contacts/build.properties
+++ b/contacts/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Aug 31 06:05:42 CST 2025
-stageCount=17
+#Sun Apr 13 02:46:09 HKT 2025
+stageCount=8
 libraryProject=
-baseVersion=15.3
-publishVersion=15.3.16
+baseVersion=15.2
+publishVersion=15.2.7
 buildCount=0
-baseBetaVersion=15.3.17
+baseBetaVersion=15.2.8
--- a/contacts/src/main/AndroidManifest.xml
+++ b/contacts/src/main/AndroidManifest.xml
@@ -42,8 +42,7 @@
        android:icon="@drawable/ic_winboll"
        android:label="@string/app_name"
        android:theme="@style/MyAppTheme"
-        android:supportsRtl="true"
-        android:networkSecurityConfig="@xml/network_security_config">
+        android:supportsRtl="true">

        <activity
            android:name=".MainActivity"
@@ -193,4 +192,4 @@

    </application>

-</manifest>
+</manifest>
--- a/contacts/src/main/java/cc/winboll/studio/contacts/App.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/App.java
@@ -1,13 +1,13 @@
 package cc.winboll.studio.contacts;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2024/12/08 15:10:51
 * @Describe 全局应用类
 */
 import android.view.Gravity;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
 import com.hjq.toast.ToastUtils;

 public class App extends GlobalApplication {
@@ -20,8 +20,8 @@ public class App extends GlobalApplication {
        // 这样可以预先设置日志与数据的存储根目录。
        //setIsDebuging(BuildConfig.DEBUG);
        super.onCreate();
-        // 设置 WinBoLL 应用 UI 类型
-        getWinBoLLActivityManager().setWinBoLLUI_TYPE(WinBoLLActivityManager.WinBoLLUI_TYPE.Aplication);
+        // 设置 WinBoll 应用 UI 类型
+        WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Aplication);
        
        //LogUtils.d(TAG, "onCreate");
        
--- a/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java
@@ -1,10 +1,5 @@
 package cc.winboll.studio.contacts;

-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/08/30 14:32
- * @Describe 主窗口
- */
 import android.Manifest;
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -13,7 +8,6 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.telecom.TelecomManager;
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
@@ -38,21 +32,22 @@ import cc.winboll.studio.contacts.fragments.CallLogFragment;
 import cc.winboll.studio.contacts.fragments.ContactsFragment;
 import cc.winboll.studio.contacts.fragments.LogFragment;
 import cc.winboll.studio.contacts.services.MainService;
+import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 import com.google.android.material.tabs.TabLayout;
 import java.util.ArrayList;
 import java.util.List;

-final public class MainActivity extends AppCompatActivity implements IWinBoLLActivity, ViewPager.OnPageChangeListener, View.OnClickListener {
+final public class MainActivity extends AppCompatActivity implements IWinBollActivity, ViewPager.OnPageChangeListener, View.OnClickListener {

-    public static final String TAG = "MainActivity";
+	public static final String TAG = "MainActivity";

    public static final int REQUEST_HOME_ACTIVITY = 0;
    public static final int REQUEST_ABOUT_ACTIVITY = 1;

-    public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoLL.ACTION_SOS";
+    public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoll.ACTION_SOS";

    static MainActivity _MainActivity;
    LogView mLogView;
@@ -61,10 +56,13 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
    MainServiceBean mMainServiceBean;
    private TabLayout tabLayout;
    private ViewPager viewPager;
-    private List<View> views; 
+    private List<View> views; //用来存放放进ViewPager里面的布局
+    //实例化存储imageView（导航原点）的集合
    ImageView[] imageViews;
-    LinearLayout linearLayout;
-    int currentPoint = 0;
+    //MyPagerAdapter adapter;//适配器
+    MyPagerAdapter pagerAdapter;
+    LinearLayout linearLayout;//下标所在在LinearLayout布局里
+    int currentPoint = 0;//当前被选中中页面的下标

    private TelephonyManager telephonyManager;
    private MyPhoneStateListener phoneStateListener;
@@ -73,75 +71,115 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct

    private static final int DIALER_REQUEST_CODE = 1;

-
    @Override
    public Activity getActivity() {
        return this;
    }

-    @Override
-    public String getTag() {
-        return TAG;
-    }
+//    @Override
+//    public APPInfo getAppInfo() {
+//        String szBranchName = "contacts";
+//
+//        APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo();
+//        appInfo.setAppName("Contacts");
+//        appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
+//        appInfo.setAppDescription("Contacts Description");
+//        appInfo.setAppGitName("APP");
+//        appInfo.setAppGitOwner("Studio");
+//        appInfo.setAppGitAPPBranch(szBranchName);
+//        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
+//        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=Contacts");
+//        appInfo.setAppAPKName("Contacts");
+//        appInfo.setAppAPKFolderName("Contacts");
+//        return appInfo;
+//        return null;
+//    }

    @Override
    protected void onCreate(Bundle savedInstanceState) {
+        // 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回
+        //if (prosessIntents(getIntent())) return;
+        // 以下正常创建主窗口
        super.onCreate(savedInstanceState);
        _MainActivity = this;
        setContentView(R.layout.activity_main);

-        // 初始化工具栏（仅加载基础UI）
-        mToolbar = (Toolbar) findViewById(R.id.activitymainToolbar1);
+        // 初始化工具栏
+        mToolbar = findViewById(R.id.activitymainToolbar1);
        setSupportActionBar(mToolbar);
-        getSupportActionBar().setSubtitle(TAG);
+//        if (isEnableDisplayHomeAsUp()) {
+//            // 显示后退按钮
+//            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+//        }
+        getSupportActionBar().setSubtitle(getTag());

-        tabLayout = (TabLayout) findViewById(R.id.tabLayout);
-        viewPager = (ViewPager) findViewById(R.id.viewPager);
+        tabLayout = findViewById(R.id.tabLayout);
+        viewPager = findViewById(R.id.viewPager);

-        // 创建Fragment列表（仅实例化，不加载数据）
-        fragmentList = new ArrayList<Fragment>();
-        tabTitleList = new ArrayList<String>();
+        // 创建Fragment列表和标题列表
+        fragmentList = new ArrayList<>();
+        tabTitleList = new ArrayList<>();
        fragmentList.add(CallLogFragment.newInstance(0));
-        fragmentList.add(ContactsFragment.newInstance(1)); // 延迟加载联系人数据
+        fragmentList.add(ContactsFragment.newInstance(1));
        fragmentList.add(LogFragment.newInstance(2));
        tabTitleList.add("通话记录");
        tabTitleList.add("联系人");
        tabTitleList.add("应用日志");

-        // 设置ViewPager适配器
+        // 设置ViewPager的适配器
        MyPagerAdapter adapter = new MyPagerAdapter(getSupportFragmentManager(), fragmentList, tabTitleList);
        viewPager.setAdapter(adapter);

-        // 关键：关闭预加载，仅当前页初始化
-        viewPager.setOffscreenPageLimit(0);
-
        // 关联TabLayout和ViewPager
        tabLayout.setupWithViewPager(viewPager);

-        // 初始化服务状态（延迟启动非核心服务）
+
+
+//        initData();
+//        initView();
+//        //initPoint();//调用初始化导航原点的方法
+//        viewPager.addOnPageChangeListener(this);//滑动事件
+
+        //ViewPager viewPager = findViewById(R.id.activitymainViewPager1);
+        //MyPagerAdapter pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
+        //viewPager.setAdapter(pagerAdapter);
+        //TabLayout tabLayout = findViewById(R.id.activitymainTabLayout1);
+        //tabLayout.setupWithViewPager(viewPager);
+
+//        mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
+//        if (mMainServiceBean == null) {
+//            mMainServiceBean = new MainServiceBean();
+//        }
+//        cbMainService = findViewById(R.id.activitymainCheckBox1);
+//        cbMainService.setChecked(mMainServiceBean.isEnable());
+//        cbMainService.setOnClickListener(new View.OnClickListener(){
+//                @Override
+//                public void onClick(View view) {
+//                    if (cbMainService.isChecked()) {
+//                        MainService.startMainService(MainActivity.this);
+//                    } else {
+//                        MainService.stopMainService(MainActivity.this);
+//                    }
+//                }
+//            });
+
        MainServiceBean mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
        if (mMainServiceBean == null) {
            mMainServiceBean = new MainServiceBean();
            MainServiceBean.saveBean(this, mMainServiceBean);
        }
        if (mMainServiceBean.isEnable()) {
-            // 延迟1秒启动服务，避免阻塞启动
-            new Handler().postDelayed(new Runnable() {
-					@Override
-					public void run() {
-						MainService.startMainService(MainActivity.this);
-					}
-				}, 1000);
+            MainService.startMainService(this);
        }

-        // 初始化电话状态监听（基础功能保留）
+        // 初始化TelephonyManager和PhoneStateListener
        telephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
        phoneStateListener = new MyPhoneStateListener();
        telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
    }


-    // ViewPager适配器（Java 7语法）
+    // ViewPager的适配器
    private class MyPagerAdapter extends FragmentPagerAdapter {

        private List<Fragment> fragmentList;
@@ -178,22 +216,91 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
        _MainActivity.startActivity(intent);
    }

-    // OnPageChangeListener接口实现
-    @Override
-    public void onPageScrollStateChanged(int state) {}
+    //初始化view，即显示的图片
+//    void initView() {
+//        viewPager = findViewById(R.id.activitymainViewPager1);
+//        pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
+//        viewPager.setAdapter(pagerAdapter);
+//        //adapter = new MyPagerAdapter(views);
+//        //viewPager = findViewById(R.id.activitymainViewPager1);
+//        //viewPager.setAdapter(adapter);
+//        //linearLayout = findViewById(R.id.activitymainLinearLayout1);
+//        //initPoint();//初始化页面下方的点
+//        viewPager.setOnPageChangeListener(this);
+//
+//    }

-    @Override
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {}
+    //初始化所要显示的布局
+//    void initData() {
+//        LayoutInflater inflater = LayoutInflater.from(getActivity());
+//        View view1 = inflater.inflate(R.layout.fragment_call_log, viewPager, false);
+//        View view2 = inflater.inflate(R.layout.fragment_contacts, viewPager, false);
+//        View view3 = inflater.inflate(R.layout.fragment_log, viewPager, false);
+//
+//        views = new ArrayList<>();
+//        views.add(view1);
+//        views.add(view2);
+//        views.add(view3);
+//    }

-    @Override
-    public void onPageSelected(int position) {}
+//    void initPoint() {
+//        imageViews = new ImageView[5];//实例化5个图片
+//        for (int i = 0; i < linearLayout.getChildCount(); i++) {
+//            imageViews[i] = (ImageView) linearLayout.getChildAt(i);
+//            imageViews[i].setImageResource(R.drawable.ic_launcher);
+//            imageViews[i].setOnClickListener(this);//点击导航点，即可跳转
+//            imageViews[i].setTag(i);//重复利用实例化的对象
+//        }
+//        currentPoint = 0;//默认第一个坐标
+//        imageViews[currentPoint].setImageResource(R.drawable.ic_launcher);
+//    }

+    //OnPageChangeListener接口要实现的三个方法
+    /*    onPageScrollStateChanged(int state)
+     此方法是在状态改变的时候调用，其中state这个参数有三种状态：
+     SCROLL_STATE_DRAGGING（1）表示用户手指“按在屏幕上并且开始拖动”的状态
+     （手指按下但是还没有拖动的时候还不是这个状态，只有按下并且手指开始拖动后log才打出。）
+     SCROLL_STATE_IDLE（0）滑动动画做完的状态。
+     SCROLL_STATE_SETTLING（2）在“手指离开屏幕”的状态。*/
    @Override
-    public void onClick(View v) {}
+    public void onPageScrollStateChanged(int state) {
+
+    }
+    /*    onPageScrolled(int position, float positionOffset, int positionOffsetPixels)
+     当页面在滑动的时候会调用此方法，在滑动被停止之前，此方法回一直得到调用。其中三个参数的含义分别为：
+
+     position :当前页面，即你点击滑动的页面（从A滑B，则是A页面的position。
+     positionOffset:当前页面偏移的百分比
+     positionOffsetPixels:当前页面偏移的像素位置*/
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+    }
+    /*    onPageSelected(int position)
+     此方法是页面滑动完后得到调用，position是你当前选中的页面的Position（位置编号）
+     (从A滑动到B，就是B的position)*/
+    public void onPageSelected(int position) {
+
+//        ImageView preView = imageViews[currentPoint];
+//        preView.setImageResource(R.drawable.ic_launcher);
+//        ImageView currView = imageViews[position];
+//        currView.setImageResource(R.drawable.ic_launcher);
+//        currentPoint = position;
+    }
+
+    //小圆点点击事件
+    @Override
+    public void onClick(View v) {
+        // TODO Auto-generated method stub
+        //通过getTag(),可以判断是哪个控件
+//        int i = (Integer) v.getTag();
+//        viewPager.setCurrentItem(i);//直接跳转到某一个页面的情况
+    }

    @Override
    protected void onPostCreate(Bundle savedInstanceState) {
        super.onPostCreate(savedInstanceState);
+        //setSubTitle("");
    }

    private class MyPhoneStateListener extends PhoneStateListener {
@@ -219,31 +326,109 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
        LogUtils.d(TAG, "onDestroy() SOS");
    }

+
+
+    //
+    // 处理传入的 Intent 数据
+    //
+//    boolean prosessIntents(Intent intent) {
+//        if (intent == null 
+//            || intent.getAction() == null
+//            || intent.getAction().equals(""))
+//            return false;
+//
+//        if (intent.getAction().equals(StringToQrCodeView.ACTION_UNITTEST_QRCODE)) {
+//            try {
+//                WinBollActivity clazzActivity = UnitTestActivity.class.newInstance();
+//                String tag = clazzActivity.getTag();
+//                LogUtils.d(TAG, "String tag = clazzActivity.getTag(); tag " + tag);
+//                Intent subIntent = new Intent(this, UnitTestActivity.class);
+//                subIntent.setAction(intent.getAction());
+//                File file = new File(getCacheDir(), UUID.randomUUID().toString());
+//                //取出文件uri
+//                Uri uri = intent.getData();
+//                if (uri == null) {
+//                    uri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
+//                }
+//                //获取文件真实地址
+//                String szSrcPath = UriUtils.getFileFromUri(getApplication(), uri);
+//                if (TextUtils.isEmpty(szSrcPath)) {
+//                    return false;
+//                }
+//
+//                Files.copy(Paths.get(szSrcPath), Paths.get(file.getPath()));
+//                //startWinBollActivity(subIntent, tag);
+//                WinBollActivityManager.getInstance(this).startWinBollActivity(this, subIntent, UnitTestActivity.class);
+//            } catch (IllegalAccessException | InstantiationException | IOException e) {
+//                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+//                // 函数处理异常返回失败
+//                return false;
+//            }
+//        } else {
+//            LogUtils.d(TAG, "prosessIntents|" + intent.getAction() + "|yet");
+//            return false;
+//        }
+//        return true;
+//    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+//    @Override
+//    public void onBackPressed() {
+//        exit();
+//    }
+//
+//    void exit() {
+//        YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
+//
+//            @Override
+//            public void onYes() {
+//                WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
+//            }
+//
+//            @Override
+//            public void onNo() {
+//            }
+//        };
+//        YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
+//    }
+
    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        getMenuInflater().inflate(R.menu.toolbar_main, menu);
        return super.onCreateOptionsMenu(menu);
    }

+
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        if (item.getItemId() == R.id.item_settings) {
            Intent intent = new Intent(this, SettingsActivity.class);
            startActivity(intent);
+            //WinBollActivityManager.getInstance(this).startWinBollActivity(this, CallActivity.class);
        }
+//        } else 
+//        if (item.getItemId() == R.id.item_exit) {
+//            exit();
+//            return true;
+//        }
        return super.onOptionsItemSelected(item);
    }

+
    @Override
    protected void onResume() {
        super.onResume();
    }

    /**
-     * 检查是否是系统默认电话应用
+     * Android M 及以上检查是否是系统默认电话应用
     */
    public boolean isDefaultPhoneCallApp() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
            TelecomManager manger = (TelecomManager) getSystemService(TELECOM_SERVICE);
            if (manger != null && manger.getDefaultDialerPackage() != null) {
                return manger.getDefaultDialerPackage().equals(getPackageName());
@@ -257,22 +442,35 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
        if (manager == null) return false;

        for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(
-			Integer.MAX_VALUE)) {
+            Integer.MAX_VALUE)) {
            if (serviceClass.getName().equals(service.service.getClassName())) {
                return true;
            }
        }
+
        return false;
    }

    @Override
    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+//        switch (resultCode) {
+//            case REQUEST_HOME_ACTIVITY : {
+//                    LogUtils.d(TAG, "REQUEST_HOME_ACTIVITY");
+//                    break;
+//                }
+//            case REQUEST_ABOUT_ACTIVITY : {
+//                    LogUtils.d(TAG, "REQUEST_ABOUT_ACTIVITY");
+//                    break;
+//                }
+//            default : {
+//                    super.onActivityResult(requestCode, resultCode, data);
+//                }
+//        }
        if (requestCode == DIALER_REQUEST_CODE) {
            if (resultCode == Activity.RESULT_OK) {
                Toast.makeText(MainActivity.this, getString(R.string.app_name) + " 已成为默认电话应用",
-							   Toast.LENGTH_SHORT).show();
+                               Toast.LENGTH_SHORT).show();
            }
        }
    }
 }
-
--- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.activities;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/31 15:15:54
 * @Describe 应用介绍窗口
 */
@@ -10,15 +10,14 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libaes.winboll.AboutView;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;

-public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity {
+public class AboutActivity extends WinBollActivity implements IWinBollActivity {

    public static final String TAG = "AboutActivity";

@@ -65,13 +64,13 @@ public class AboutActivity extends AppCompatActivity 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() {
@@ -79,12 +78,12 @@ public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity
        APPInfo appInfo = new APPInfo();
        appInfo.setAppName("Contacts");
        appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
-        appInfo.setAppDescription("这是可以根据正则表达式匹配拦截骚扰电话的手机拨号应用。");
-        appInfo.setAppGitName("APPBase");
+        appInfo.setAppDescription("通讯录与拨号");
+        appInfo.setAppGitName("APP");
        appInfo.setAppGitOwner("Studio");
        appInfo.setAppGitAPPBranch(szBranchName);
        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=4&extra=page%3D1");
+        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=Contacts");
        appInfo.setAppAPKName("Contacts");
        appInfo.setAppAPKFolderName("Contacts");
        return new AboutView(mContext, appInfo);
--- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/CallActivity.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/CallActivity.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.activities;

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

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/20 20:18:26
 */
 import android.content.Intent;
--- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.activities;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/21 05:37:42
 */
 import android.content.Context;
@@ -24,7 +24,6 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import cc.winboll.studio.contacts.App;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.adapters.PhoneConnectRuleAdapter;
 import cc.winboll.studio.contacts.beans.MainServiceBean;
@@ -35,13 +34,15 @@ import cc.winboll.studio.contacts.bobulltoon.TomCat;
 import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.contacts.views.DuInfoTextView;
+import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 import com.hjq.toast.ToastUtils;
 import java.lang.reflect.Field;
 import java.util.List;
+import cc.winboll.studio.contacts.App;

-public class SettingsActivity extends AppCompatActivity implements IWinBoLLActivity {
+public class SettingsActivity extends AppCompatActivity implements IWinBollActivity {

    public static final String TAG = "SettingsActivity";

@@ -176,8 +177,6 @@ public class SettingsActivity extends AppCompatActivity implements IWinBoLLActiv
        etDunResumeSecondCount.setEnabled(!isEnableDun);
        etDunResumeCount.setEnabled(!isEnableDun);

-        EditText etBoBullToonURL = findViewById(R.id.bobulltoonurl_et);
-        etBoBullToonURL.setText(Rules.getInstance(this).getBoBullToonURL());
    }

    public static void notifyDunInfoUpdate() {
@@ -198,19 +197,10 @@ public class SettingsActivity extends AppCompatActivity implements IWinBoLLActiv
            settingsModel.setDunTotalCount(Integer.parseInt(etDunTotalCount.getText().toString()));
            settingsModel.setDunResumeSecondCount(Integer.parseInt(etDunResumeSecondCount.getText().toString()));
            settingsModel.setDunResumeCount(Integer.parseInt(etDunResumeCount.getText().toString()));
-			
-			// 应用效果提示
-			ToastUtils.show((settingsModel.getDunTotalCount() == 1)?"电话骚扰防御力几乎为0。":String.format("以下设置将在连拨%d次后接通电话。", settingsModel.getDunTotalCount()));
        }
        settingsModel.setIsEnableDun(isEnableDun);
        Rules.getInstance(this).saveDun();
        Rules.getInstance(this).reload();
-        
-        // 重新加载盾牌参数
-        etDunTotalCount.setText(Integer.toString(settingsModel.getDunTotalCount()));
-        etDunResumeSecondCount.setText(Integer.toString(settingsModel.getDunResumeSecondCount()));
-        etDunResumeCount.setText(Integer.toString(settingsModel.getDunResumeCount()));
-		
    }

    void updateStreamVolumeTextView() {
@@ -243,21 +233,7 @@ public class SettingsActivity extends AppCompatActivity implements IWinBoLLActiv
        }
    }

-    public void onResetBoBullToonURL(View view) {
-        Rules.getInstance(this).resetDefaultBoBullToonURL();
-        EditText etBoBullToonURL = findViewById(R.id.bobulltoonurl_et);
-        etBoBullToonURL.setText(Rules.getInstance(this).getBoBullToonURL());
-		
-		final TomCat tomCat = TomCat.getInstance(this);
-		tomCat.cleanBoBullToon();
-    }
-
    public void onDownloadBoBullToon(View view) {
-        EditText etBoBullToonURL = findViewById(R.id.bobulltoonurl_et);
-        if (!etBoBullToonURL.getText().toString().trim().equals(Rules.getInstance(this).getBoBullToonURL())) {
-            Rules.getInstance(this).setBoBullToonURL(etBoBullToonURL.getText().toString().trim());
-        }
-
        final TomCat tomCat = TomCat.getInstance(this);
        new Thread(new Runnable() {
                @Override
@@ -271,6 +247,8 @@ public class SettingsActivity extends AppCompatActivity implements IWinBoLLActiv
            }).start();
    }

+
+
    public void onSearchBoBullToonPhone(View view) {
        TomCat tomCat = TomCat.getInstance(this);
        EditText etPhone = findViewById(R.id.activitysettingsEditText1);
@@ -333,12 +311,8 @@ public class SettingsActivity extends AppCompatActivity implements IWinBoLLActiv
            }
        }
    }
-
+    
    public void onAbout(View view) {
-        App.getWinBoLLActivityManager().startWinBoLLActivity(this, AboutActivity.class);
-    }
-	
-	public void onLogView(View view) {
-        App.getWinBoLLActivityManager().startLogActivity(this);
+        App.getWinBollActivityManager().startWinBollActivity(this, AboutActivity.class);
    }
 }
--- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/UnitTestActivity.java
+++ b/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<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/02 16:07:04
 */
 public class UnitTestActivity extends Activity {
--- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.activities;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/31 15:16:45
 * @Describe 应用窗口基类
 */
@@ -11,9 +11,9 @@ import android.view.MenuItem;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.beans.AESThemeBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;

-public class WinBollActivity extends AppCompatActivity implements IWinBoLLActivity {
+public class WinBollActivity extends AppCompatActivity implements IWinBollActivity {

    public static final String TAG = "WinBollActivity";

--- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
@@ -1,22 +1,17 @@
 package cc.winboll.studio.contacts.adapters;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/26 13:09:32
 * @Describe CallLogAdapter
 */
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.PopupMenu;
 import android.widget.TextView;
-import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.studio.contacts.R;
@@ -40,10 +35,6 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
        this.mContactUtils = ContactUtils.getInstance(mContext);
        this.callLogList = callLogList;
    }
-	
-	public void relaodContacts() {
-		this.mContactUtils.relaodContacts();
-	}

    @NonNull
    @Override
@@ -56,38 +47,6 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
    public void onBindViewHolder(@NonNull CallLogViewHolder holder, int position) {
        final CallLogModel callLog = callLogList.get(position);
        holder.phoneNumber.setText(callLog.getPhoneNumber() + "☎" + mContactUtils.getContactsName(callLog.getPhoneNumber()));
-		holder.phoneNumber.setOnLongClickListener(new View.OnLongClickListener() {
-				@Override
-				public boolean onLongClick(View p1) {
-					// 弹出复制菜单
-					PopupMenu menu = new PopupMenu(mContext, holder.phoneNumber);
-					//加载菜单资源
-					menu.getMenuInflater().inflate(R.menu.toolbar_calllog_phonenumber, menu.getMenu());
-					//设置点击事件的响应
-					menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-							@Override
-							public boolean onMenuItemClick(MenuItem menuItem) {
-								int nItemId = menuItem.getItemId();
-								if (nItemId == R.id.item_calllog_phonenumber_copy) {
-									// Gets a handle to the clipboard service.
-									ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
-									// Creates a new text clip to put on the clipboard
-									ClipData clip = ClipData.newPlainText("simple text", callLog.getPhoneNumber());
-									// Set the clipboard's primary clip.
-									clipboard.setPrimaryClip(clip);
-									Toast.makeText(mContext, "Copy to clipboard.", Toast.LENGTH_SHORT).show();
-								}
-
-								return true;
-							}
-						});
-					//一定要调用show()来显示弹出式菜单
-					menu.show();
-
-					return true;
-				}
-			});
-		
        holder.callStatus.setText(callLog.getCallStatus());
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
        holder.callDate.setText(dateFormat.format(callLog.getCallDate()));
--- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java
@@ -1,29 +1,23 @@
 package cc.winboll.studio.contacts.adapters;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/26 13:35:44
 * @Describe ContactAdapter
 */
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
 import android.content.Intent;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
+import android.widget.Button;
 import android.widget.TextView;
-import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.beans.ContactModel;
-import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 import com.hjq.toast.ToastUtils;
 import java.util.List;
+import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;

 public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactViewHolder> {

@@ -32,10 +26,8 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
    private static final int REQUEST_CALL_PHONE = 1;

    private List<ContactModel> contactList;
-	Context mContext;

-    public ContactAdapter(Context context, List<ContactModel> contactList) {
-		mContext = context;
+    public ContactAdapter(List<ContactModel> contactList) {
        this.contactList = contactList;
    }

@@ -49,37 +41,6 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
    @Override
    public void onBindViewHolder(@NonNull ContactViewHolder holder, int position) {
        final ContactModel contact = contactList.get(position);
-		holder.llPhoneNumberMain.setOnLongClickListener(new View.OnLongClickListener() {
-				@Override
-				public boolean onLongClick(View p1) {
-					// 弹出复制菜单
-					PopupMenu menu = new PopupMenu(mContext, holder.llPhoneNumberMain);
-					//加载菜单资源
-					menu.getMenuInflater().inflate(R.menu.toolbar_contact_phonenumber, menu.getMenu());
-					//设置点击事件的响应
-					menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-							@Override
-							public boolean onMenuItemClick(MenuItem menuItem) {
-								int nItemId = menuItem.getItemId();
-								if (nItemId == R.id.item_contact_phonenumber_copy) {
-									// Gets a handle to the clipboard service.
-									ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
-									// Creates a new text clip to put on the clipboard
-									ClipData clip = ClipData.newPlainText("simple text", contact.getNumber());
-									// Set the clipboard's primary clip.
-									clipboard.setPrimaryClip(clip);
-									Toast.makeText(mContext, "Copy to clipboard.", Toast.LENGTH_SHORT).show();
-								}
-
-								return true;
-							}
-						});
-					//一定要调用show()来显示弹出式菜单
-					menu.show();
-
-					return true;
-				}
-			});
        holder.contactName.setText(contact.getName());
        holder.contactNumber.setText(contact.getNumber());

@@ -108,14 +69,12 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
    }

    public class ContactViewHolder extends RecyclerView.ViewHolder {
-		LinearLayout llPhoneNumberMain;
        TextView contactName;
        TextView contactNumber;
        AOHPCTCSeekBar dialAOHPCTCSeekBar;
        
        public ContactViewHolder(@NonNull View itemView) {
            super(itemView);
-			llPhoneNumberMain = itemView.findViewById(R.id.itemcontactLinearLayout1);
            contactName = itemView.findViewById(R.id.contact_name);
            contactNumber = itemView.findViewById(R.id.contact_number);
            dialAOHPCTCSeekBar = itemView.findViewById(R.id.aohpctcseekbar_dial);
--- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ImagePagerAdapter.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ImagePagerAdapter.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.adapters;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/20 14:20:38
 * @Describe ImagePagerAdapter
 */
--- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java
@@ -1,13 +1,12 @@
 package cc.winboll.studio.contacts.adapters;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/02 17:27:41
 * @Describe PhoneConnectRuleAdapter
 */
 import android.content.Context;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -21,7 +20,6 @@ import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.beans.PhoneConnectRuleModel;
 import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.contacts.views.LeftScrollView;
-import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
 import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
@@ -62,10 +60,6 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.V
            final SimpleViewHolder simpleViewHolder = (SimpleViewHolder) holder;
            String szView = model.getRuleText().trim().equals("") ?"[NULL]": model.getRuleText();
            simpleViewHolder.tvRuleText.setText(szView);
-            simpleViewHolder.checkBoxAllow.setChecked(model.isAllowConnection());
-			simpleViewHolder.checkBoxAllow.setEnabled(false);
-            simpleViewHolder.checkBoxEnable.setChecked(model.isEnable());
-			simpleViewHolder.checkBoxEnable.setEnabled(false);
            simpleViewHolder.scrollView.setOnActionListener(new LeftScrollView.OnActionListener(){

                    @Override
@@ -221,22 +215,16 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.V

        private final LeftScrollView scrollView;
        private final TextView tvRuleText;
-		CheckBox checkBoxAllow;
-        CheckBox checkBoxEnable;


        public SimpleViewHolder(@NonNull ViewGroup parent, @NonNull View itemView) {
            super(itemView);
            scrollView = itemView.findViewById(R.id.scrollView);
-			LayoutInflater inflater = LayoutInflater.from(itemView.getContext());
-		    View viewContent = inflater.inflate(R.layout.view_phone_connect_rule_simple_content, parent, false);
-            tvRuleText = viewContent.findViewById(R.id.ruletext_tv);
-            checkBoxAllow = viewContent.findViewById(R.id.checkbox_allow);
-            checkBoxEnable = viewContent.findViewById(R.id.checkbox_enable);
-            //tvRuleText = new TextView(itemView.getContext());
+            //tvRuleText = itemView.findViewById(R.id.ruletext_tv);
+            tvRuleText = new TextView(itemView.getContext());
            scrollView.setContentWidth(parent.getWidth());
            //scrollView.setContentWidth(600);
-            scrollView.addContentLayout(viewContent);
+            scrollView.addContentLayout(tvRuleText);
        }

    }
@@ -255,9 +243,5 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.V
            buttonConfirm = itemView.findViewById(R.id.button_confirm);
        }
    }
-
-	private void setCheckBoxTouchListener(CheckBox checkBox) {
-
-	}
 }

--- a/contacts/src/main/java/cc/winboll/studio/contacts/beans/CallLogModel.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/beans/CallLogModel.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.beans;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/26 13:10:57
 * @Describe CallLogModel
 */
--- a/contacts/src/main/java/cc/winboll/studio/contacts/beans/ContactModel.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/beans/ContactModel.java
@@ -1,9 +1,9 @@
 package cc.winboll.studio.contacts.beans;

 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/08/30 14:32
- * @Describe 联系人信息数据模型
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/02/26 13:37:00
+ * @Describe ContactModel
 */
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
@@ -18,18 +18,13 @@ public class ContactModel {
    private String name;
    private String number;
    private String pinyin;
-    // 新增：存储姓名的拼音首字母（如"啊牛"→"an"）
-    private String pinyinFirstLetter;

    public ContactModel(String name, String number) {
        this.name = name;
        this.number = number.replaceAll("\\s", "");
        this.pinyin = convertToPinyin(name);
-        // 初始化时生成拼音首字母
-        this.pinyinFirstLetter = convertToPinyinFirstLetter(name);
    }

-    // 原方法：转换为全拼（如"啊牛"→"aniu"）
    private String convertToPinyin(String chinese) {
        HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();
        format.setCaseType(HanyuPinyinCaseType.LOWERCASE);
@@ -38,55 +33,22 @@ public class ContactModel {
        StringBuilder pinyin = new StringBuilder();
        for (int i = 0; i < chinese.length(); i++) {
            char ch = chinese.charAt(i);
-            if (Character.toString(ch).matches("[\\u4e00-\\u9fa5]")) { // 仅处理汉字
+            if (Character.toString(ch).matches("[\\u4e00-\\u9fa5]")) {
                try {
                    String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(ch, format);
-                    if (pinyinArray != null && pinyinArray.length > 0) {
-                        pinyin.append(pinyinArray[0]); // 取第一个拼音（多音字默认首选项）
+                    if (pinyinArray != null) {
+                        pinyin.append(pinyinArray[0]);
                    }
                } catch (BadHanyuPinyinOutputFormatCombination e) {
                    e.printStackTrace();
                }
            } else {
-                pinyin.append(ch); // 非汉字直接拼接（如字母、数字、符号）
+                pinyin.append(ch);
            }
        }
        return pinyin.toString();
    }

-    // 新增：转换为拼音首字母（如"啊牛"→"an"）
-    private String convertToPinyinFirstLetter(String chinese) {
-        HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();
-        format.setCaseType(HanyuPinyinCaseType.LOWERCASE);
-        format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
-
-        StringBuilder firstLetters = new StringBuilder();
-        for (int i = 0; i < chinese.length(); i++) {
-            char ch = chinese.charAt(i);
-            if (Character.toString(ch).matches("[\\u4e00-\\u9fa5]")) { // 仅处理汉字
-                try {
-                    String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(ch, format);
-                    if (pinyinArray != null && pinyinArray.length > 0) {
-                        // 取拼音的第一个字母（如"a"、"niu"→"a"、"n"）
-                        firstLetters.append(pinyinArray[0].charAt(0));
-                    }
-                } catch (BadHanyuPinyinOutputFormatCombination e) {
-                    e.printStackTrace();
-                }
-            } else {
-                // 非汉字可根据需求处理：此处保留原字符（如"李3"→"l3"，"张A"→"za"）
-                firstLetters.append(ch);
-            }
-        }
-        return firstLetters.toString();
-    }
-
-    // 新增：获取拼音首字母
-    public String getPinyinFirstLetter() {
-        return pinyinFirstLetter;
-    }
-
-    // 原有getter方法
    public String getName() {
        return name;
    }
--- a/contacts/src/main/java/cc/winboll/studio/contacts/beans/MainServiceBean.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/beans/MainServiceBean.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.beans;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/13 07:06:13
 */
 import android.util.JsonReader;
--- a/contacts/src/main/java/cc/winboll/studio/contacts/beans/PhoneConnectRuleModel.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/beans/PhoneConnectRuleModel.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.beans;

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

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

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/02 19:51:40
 * @Describe SettingsModel
 */
@@ -14,7 +14,6 @@ import cc.winboll.studio.contacts.utils.IntUtils;
 public class SettingsModel extends BaseBean {

    public static final String TAG = "SettingsModel";
-    
    public static final int MAX_INTRANGE = 666666;
    public static final int MIN_INTRANGE = 1;
    
@@ -28,8 +27,6 @@ public class SettingsModel extends BaseBean {
    int dunResumeCount;
    // 是否启用云盾
    boolean isEnableDun;
-    // BoBullToon 应用模块数据请求地址
-    String szBoBullToon_URL;

    public SettingsModel() {
        this.dunTotalCount = 6;
@@ -37,24 +34,14 @@ public class SettingsModel extends BaseBean {
        this.dunResumeSecondCount = 60;
        this.dunResumeCount = 1;
        this.isEnableDun = false;
-        this.szBoBullToon_URL = "";
    }

-    public SettingsModel(int dunTotalCount, int dunCurrentCount, int dunResumeSecondCount, int dunResumeCount, boolean isEnableDun, String szBoBullToon_URL) {
+    public SettingsModel(int dunTotalCount, int dunCurrentCount, int dunResumeSecondCount, int dunResumeCount, boolean isEnableDun) {
        this.dunTotalCount = getSettingsModelRangeInt(dunTotalCount);
        this.dunCurrentCount = getSettingsModelRangeInt(dunCurrentCount);
        this.dunResumeSecondCount = getSettingsModelRangeInt(dunResumeSecondCount);
        this.dunResumeCount = getSettingsModelRangeInt(dunResumeCount);
        this.isEnableDun = isEnableDun;
-        this.szBoBullToon_URL = szBoBullToon_URL;
-    }
-
-    public void setBoBullToon_URL(String boBullToon_URL) {
-        this.szBoBullToon_URL = boBullToon_URL;
-    }
-
-    public String getBoBullToon_URL() {
-        return szBoBullToon_URL;
    }

    public void setDunTotalCount(int dunTotalCount) {
@@ -115,8 +102,7 @@ public class SettingsModel extends BaseBean {
        jsonWriter.name("dunResumeSecondCount").value(getDunResumeSecondCount());
        jsonWriter.name("dunResumeCount").value(getDunResumeCount());
        jsonWriter.name("isEnableDun").value(isEnableDun());
-        jsonWriter.name("szBoBullToon_URL").value(getBoBullToon_URL());
-        
+
    }

    @Override
@@ -132,8 +118,6 @@ public class SettingsModel extends BaseBean {
                setDunResumeCount(getSettingsModelRangeInt(jsonReader.nextInt()));
            } else if (name.equals("isEnableDun")) {
                setIsEnableDun(jsonReader.nextBoolean());
-            } else if (name.equals("szBoBullToon_URL")) {
-                setBoBullToon_URL(jsonReader.nextString());
            } else {
                return false;
            }
--- a/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java
@@ -1,17 +1,14 @@
 package cc.winboll.studio.contacts.bobulltoon;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/02 13:47:48
 * @Describe 汤姆猫管家 ：使用 BoBullToon 项目，对通讯地址进行筛选判断的好朋友。
 */
 import android.content.Context;
-import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.libappbase.LogUtils;
 import com.hjq.toast.ToastUtils;
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -31,7 +28,6 @@ public class TomCat {
    public static final String TAG = "TomCat";

    List<String> listPhoneBoBullToon = new ArrayList<String>();
-    String mszBoBullToon_URL;

    static volatile TomCat _TomCat;
    Context mContext;
@@ -46,11 +42,7 @@ public class TomCat {
        return _TomCat;
    }

-    public String getDefaultBobulltoonUrl() {
-        return mContext.getString(R.string.default_bobulltoon_url);
-    }
-
-    boolean downloadAndExtractZip(String zipUrl, String destinationFolder) throws IOException {
+    void downloadAndExtractZip(String zipUrl, String destinationFolder) throws IOException {
        OkHttpClient client = new OkHttpClient();
        Request request = new Request.Builder()
            .url(zipUrl)
@@ -103,16 +95,13 @@ public class TomCat {
            // 删除临时 ZIP 文件
            tempZipFile.delete();
            LogUtils.d(TAG, "已更新 BoBullToon 数据");
-            return true;
        } catch (Exception e) {
-            ToastUtils.show(e.getMessage());
            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-            return false;
        }
    }

    public boolean downloadBoBullToon() {
-        String zipUrl = Rules.getInstance(mContext).getBoBullToonURL(); // 替换为实际的 ZIP 文件 URL
+        String zipUrl = "http://10.8.0.12:3000/Studio/BoBullToon/archive/main.zip"; // 替换为实际的 ZIP 文件 URL
        String destinationFolder = getWorkingFolder().getPath(); // 替换为实际的目标文件夹路径
        try {
            // 删除旧文件
@@ -124,11 +113,9 @@ public class TomCat {
            }

            // 更新新文件
-            if (downloadAndExtractZip(zipUrl, destinationFolder)) {
-                LogUtils.d(TAG, "ZIP 文件下载并解压成功。");
-                return true;
-            }
-            return false;
+            downloadAndExtractZip(zipUrl, destinationFolder);
+            LogUtils.d(TAG, "ZIP 文件下载并解压成功。");
+            return true;
        } catch (IOException e) {
            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
        }
@@ -155,81 +142,12 @@ public class TomCat {
    File getWorkingFolder() {
        return mContext.getExternalFilesDir(TAG);
    }
-	
-	public File getBoBullToonDataFolder() {
-		File fCheckRoot = getWorkingFolder();
-		if (fCheckRoot == null || !fCheckRoot.exists()) {
-			return fCheckRoot;
-		}
-
-		// 递归查找符合条件的文件夹
-		File targetFolder = findTargetFolder(fCheckRoot);
-		return targetFolder != null ? targetFolder : fCheckRoot;
-	}
-
-	/**
-	 * 递归查找同时包含LICENSE和README.md文件的文件夹
-	 */
-	private File findTargetFolder(File currentFolder) {
-		// 检查当前文件夹是否符合条件
-		if (hasRequiredFiles(currentFolder)) {
-			return currentFolder;
-		}
-
-		// 查找子文件夹（Java 7不支持方法引用，用匿名内部类过滤）
-		File[] subFolders = currentFolder.listFiles(new FileFilter() {
-				@Override
-				public boolean accept(File file) {
-					return file.isDirectory(); // 仅保留子文件夹
-				}
-			});
-
-		if (subFolders != null) {
-			for (File subFolder : subFolders) {
-				File result = findTargetFolder(subFolder);
-				if (result != null) {
-					return result;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * 检查文件夹中是否同时存在LICENSE和README.md文件
-	 */
-	private boolean hasRequiredFiles(File folder) {
-		if (folder == null || !folder.isDirectory()) {
-			return false;
-		}
-
-		// 检查两个文件是否同时存在且均为文件（非文件夹）
-		File licenseFile = new File(folder, "LICENSE");
-		File readmeFile = new File(folder, "README.md");
-
-		return licenseFile.exists() && licenseFile.isFile()
-			&& readmeFile.exists() && readmeFile.isFile();
-	}
-
-	public void cleanBoBullToon() {
-		String destinationFolder = getWorkingFolder().getPath(); // 替换为实际的目标文件夹路径
-		// 删除旧文件
-		File fOldFolder = new File(destinationFolder);
-		if (fOldFolder.exists()) {
-			deleteFolderRecursive(fOldFolder);
-			fOldFolder.mkdirs();
-		}
-
-		ToastUtils.show("已清空 BoBullToon 数据!");
-		LogUtils.d(TAG, "已清空 BoBullToon 数据");
-	}

    public boolean loadPhoneBoBullToon() {
        listPhoneBoBullToon.clear();
-        File fBoBullToon = getBoBullToonDataFolder();
+        File fBoBullToon = new File(getWorkingFolder(), "bobulltoon");
        if (fBoBullToon.exists()) {
-            LogUtils.d(TAG, String.format("getBoBullToonDataFolder() %s", getWorkingFolder()));
+            LogUtils.d(TAG, String.format("getWorkingFolder() %s", getWorkingFolder()));
            for (File userFolder : fBoBullToon.listFiles()) {
                if (userFolder.isDirectory()) {
                    for (File recordFile : userFolder.listFiles()) {
--- a/contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.dun;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/21 06:15:10
 * @Describe 云盾防御规则
 */
@@ -18,7 +18,6 @@ import java.util.ArrayList;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.regex.Pattern;
-import cc.winboll.studio.contacts.bobulltoon.TomCat;

 public class Rules {

@@ -85,20 +84,6 @@ public class Rules {
        PhoneConnectRuleModel.saveBeanList(mContext, _PhoneConnectRuleModelList, PhoneConnectRuleModel.class);
    }

-    public void resetDefaultBoBullToonURL() {
-        mSettingsModel.setBoBullToon_URL(TomCat.getInstance(mContext).getDefaultBobulltoonUrl());
-        saveDun();
-    }
-
-    public void setBoBullToonURL(String szUrl) {
-        mSettingsModel.setBoBullToon_URL(szUrl);
-        saveDun();
-    }
-
-    public String getBoBullToonURL() {
-        return mSettingsModel.getBoBullToon_URL();
-    }
-
    public void loadDun() {
        mSettingsModel = SettingsModel.loadBean(mContext, SettingsModel.class);
        if (mSettingsModel == null) {
@@ -124,12 +109,8 @@ public class Rules {
        boolean isDefend = false; // 盾牌是否生效
        boolean isConnect = true; // 防御结果是否连接

-        // 进行盾牌层数预计缩减计算
-        int nDunCurrentCount = mSettingsModel.getDunCurrentCount() - 1;
-        LogUtils.d(TAG, String.format("nDunCurrentCount : %d", nDunCurrentCount));
-
        // 如果盾值小于1，则解除防御
-        if (!isDefend && nDunCurrentCount < 1) {
+        if (!isDefend && mSettingsModel.getDunCurrentCount() < 1) {
            // 盾层为1以下，防御解除
            LogUtils.d(TAG, "盾层为1以下，防御解除");
            isDefend = true;
@@ -145,14 +126,6 @@ public class Rules {
            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
        }

-        // 检验拨不通号码群
-        if (!isDefend && MainService.isPhoneInBoBullToon(phoneNumber)) {
-            LogUtils.d(TAG, String.format("PhoneNumber %s\n Is In BoBullToon", phoneNumber));
-            isDefend = true;
-            isConnect = false;
-            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
-        }
-
        // 查询通讯录是否有该联系人
        boolean isPhoneInContacts = ContactUtils.getInstance(mContext).isPhoneInContacts(mContext, phoneNumber);
        if (!isDefend) {
@@ -166,6 +139,14 @@ public class Rules {
            }
        }

+        // 检验拨不通号码群
+        if (!isDefend && MainService.isPhoneInBoBullToon(phoneNumber)) {
+            LogUtils.d(TAG, String.format("PhoneNumber %s\n Is In BoBullToon", phoneNumber));
+            isDefend = true;
+            isConnect = false;
+            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
+        }
+
        // 正则匹配规则名单校验
        if (!isDefend) {
            for (int i = 0; i < _PhoneConnectRuleModelList.size(); i++) {
@@ -193,17 +174,17 @@ public class Rules {
            // 就减少防御盾牌层数。
            // 每校验一次规则，云盾防御层数减1
            // 当云盾防御层数为0时，再次进行以下程序段则恢复满值防御。
-            int newDunCount = nDunCurrentCount;
+            int newDunCount = mSettingsModel.getDunCurrentCount() - 1;
            LogUtils.d(TAG, String.format("新的防御层数预计为 %d", newDunCount));

-            // 保证盾值在[1，DunTotalCount]之内其他值一律重置为 DunTotalCount。
-            if (newDunCount > 0 && newDunCount < mSettingsModel.getDunTotalCount()) {
-                mSettingsModel.setDunCurrentCount(newDunCount);
-                LogUtils.d(TAG, String.format("设置防御层数为 %d", newDunCount));
-            } else {
+            // 保证盾值在[0，DunTotalCount]之内其他值一律重置为 DunTotalCount。
+            if (newDunCount < 0 || newDunCount > mSettingsModel.getDunTotalCount()) {
                mSettingsModel.setDunCurrentCount(mSettingsModel.getDunTotalCount());
                LogUtils.d(TAG, String.format("盾值不在[0，%d]区间，恢复防御最大值%d", mSettingsModel.getDunTotalCount(), mSettingsModel.getDunTotalCount()));
-            } 
+            } else {
+                mSettingsModel.setDunCurrentCount(newDunCount);
+                LogUtils.d(TAG, String.format("设置防御层数为 %d", newDunCount));
+            }

            saveDun();
            SettingsActivity.notifyDunInfoUpdate();
--- a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/CallLogFragment.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/CallLogFragment.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.fragments;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/20 12:57:00
 * @Describe 拨号
 */
@@ -161,12 +161,4 @@ public class CallLogFragment extends Fragment {
            _CallLogFragment.triggerUpdate();
        }
    }
-	
-	@Override
-	public void onResume() {
-		super.onResume();
-		//ToastUtils.show("onResume");
-		callLogAdapter.relaodContacts();
-		readCallLog();  // 窗口回显时更新通话记录
-	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ZhanGSKen	0411d564b9	<winboll>APK 15.0.2 release Publish.	2025-05-22 13:37:34 +08:00
ZhanGSKen	cc365f979e	添加自定义Toolbar	2025-05-22 13:35:52 +08:00
ZhanGSKen	6435bd28ac	<winboll>APK 15.0.1 release Publish.	2025-05-22 02:06:59 +08:00
ZhanGSKen	9b190e7dfa	<winboll>APK 15.0.0 release Publish.	2025-05-22 02:04:09 +08:00
ZhanGSKen	e7f2263860	<winboll>Start New Stage Version.	2025-05-22 01:57:02 +08:00
ZhanGSKen	e7b5cfd9b8	设置应用图标为钉钉默认机器人图标	2025-05-22 01:50:39 +08:00
ZhanGSKen	a4b7c59919	初始化 WinBoLL 项目	2025-05-13 11:55:57 +08:00