<winboll>APK 15.0.1 release Publish.

<winboll>APK 15.0.0 release Publish.
<winboll>Start New Stage Version.
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 · 2025-05-13 11:55:57 +08:00
573 changed files with 2165 additions and 14147 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "libjc/jcc/libs"]
 	path = libjc/jcc/libs
 	url = https://gitea.winboll.cc/Studio/APP_libjc_jcc_libs.git
-[submodule "keystore"]
-	path = keystore
-	url = https://gitea.winboll.cc/Studio/keystore.git
--- 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/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 库登录用户信息。
+## 1. 项目模块编译环境设置(必须)，settings.gradle-demo 要复制为 settings.gradle，并取消相应项目模块的注释。
+## 2. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。
+## 3. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoLL Maven 库登录用户信息。


 # ☆类库型项目编译方法
--- 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.9" 
+        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
-#Sun Aug 31 23:40:17 HKT 2025
+#Mon May 12 18:10:35 HKT 2025
 stageCount=4
 libraryProject=libaes
-baseVersion=15.9
-publishVersion=15.9.3
+baseVersion=15.6
+publishVersion=15.6.3
 buildCount=0
-baseBetaVersion=15.9.4
+baseBetaVersion=15.6.4
--- 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应用介绍窗口
 */
@@ -79,11 +79,11 @@ public class AboutActivity extends AppCompatActivity 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,7 +1,7 @@
 package cc.winboll.studio.aes;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2024/06/13 19:03:58
 * @Describe AES应用类
 */
--- 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 应用主窗口
 */
--- 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.9"
+        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
-#Sun Aug 31 23:37:38 HKT 2025
-stageCount=6
+#Sun May 11 19:36:35 GMT 2025
+stageCount=7
 libraryProject=libappbase
-baseVersion=15.9
-publishVersion=15.9.5
-buildCount=0
-baseBetaVersion=15.9.6
+baseVersion=15.7
+publishVersion=15.7.6
+buildCount=15
+baseBetaVersion=15.7.7
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -9,8 +9,7 @@
        android:label="@string/app_name"
        android:theme="@style/MyAPPBaseTheme"
        android:resizeableActivity="true"
-        android:process=":App"
-        android:networkSecurityConfig="@xml/network_security_config">
+        android:process=":App">

        <activity
            android:name=".MainActivity"
@@ -40,8 +39,7 @@
            android:resizeableActivity="true"
            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>

-        <activity
-            android:name=".activities.New2Activity"
+        <activity android:name=".activities.New2Activity"
            android:label="New2Activity"
            android:exported="true"
            android:resizeableActivity="true"
@@ -76,8 +74,7 @@

        <service android:name=".services.AssistantService"/>

-        <receiver
-            android:name="cc.winboll.studio.appbase.receivers.MainReceiver"
+        <receiver android:name="cc.winboll.studio.appbase.receivers.MainReceiver"
            android:exported="true">

            <intent-filter>
@@ -108,8 +105,7 @@

        </receiver>

-        <receiver
-            android:name=".receivers.APPNewsWidgetClickListener"
+        <receiver android:name=".receivers.APPNewsWidgetClickListener"
            android:exported="true">

            <intent-filter>
@@ -126,6 +122,7 @@
            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,7 +1,7 @@
 package cc.winboll.studio.appbase;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/01/05 09:54:42
 * @Describe APPbase 应用类
 */
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -40,6 +40,7 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
    }

    Toolbar mToolbar;
+    LogView mLogView;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -52,21 +53,19 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {

        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) {
-        if(item.getItemId() == R.id.item_yun) {
-            GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, cc.winboll.studio.libappbase.activities.YunActivity.class);
-        } else if(item.getItemId() == R.id.item_logon) {
-            GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(this, cc.winboll.studio.libappbase.activities.LogonActivity.class);
-        }
        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
        return super.onOptionsItemSelected(item);
    }
@@ -177,7 +176,8 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
    @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
@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/13 19:30:10
 */
 import android.content.Context;
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.activities;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/25 11:46:40
 * @Describe 测试窗口2
 */
@@ -66,11 +66,16 @@ public class New2Activity extends WinBoLLActivity implements IWinBoLLActivity {
    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
        return super.onCreateOptionsMenu(menu);
    }

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+            //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
@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.activities;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/25 05:04:22
 */
 import android.app.Activity;
@@ -64,11 +64,16 @@ public class NewActivity extends WinBoLLActivity implements IWinBoLLActivity {
    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
        return super.onCreateOptionsMenu(menu);
    }

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+            //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,17 +1,11 @@
 package cc.winboll.studio.appbase.activities;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/05/10 09:48
 * @Describe WinBoLL 窗口基础类
 */
 import android.app.Activity;
-import android.os.Bundle;
-import android.view.MenuItem;
-import cc.winboll.studio.appbase.MainActivity;
-import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;

 public class WinBoLLActivity extends Activity implements IWinBoLLActivity {
@@ -27,35 +21,4 @@ public class WinBoLLActivity extends Activity implements IWinBoLLActivity {
    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) {
-            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
-            return true;
-        } else if (item.getItemId() == R.id.item_home) {
-            GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), MainActivity.class);
-            return true;
-        }
-        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        GlobalApplication.getWinBoLLActivityManager().add(this);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
-    }
 }
--- a/appbase/src/main/java/cc/winboll/studio/appbase/handlers/MainServiceHandler.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/handlers/MainServiceHandler.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.handlers;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/14 03:51:40
 */
 import android.os.Handler;
--- a/appbase/src/main/java/cc/winboll/studio/appbase/models/MainServiceBean.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/models/MainServiceBean.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.models;

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

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/07 12:47:22
 * @Describe TestServiceBean
 */
--- a/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoServiceBean.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoServiceBean.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.models;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/07 12:49:21
 * @Describe TestDemoServiceBean
 */
--- a/appbase/src/main/java/cc/winboll/studio/appbase/receivers/APPNewsWidgetClickListener.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/APPNewsWidgetClickListener.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.receivers;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/24 07:11:44
 */
 import android.content.BroadcastReceiver;
--- a/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.receivers;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/13 06:58:04
 * @Describe 主要广播接收器
 */
--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/AssistantService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/AssistantService.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.services;

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

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/13 06:56:41
 * @Describe 拨号主服务
 * 参考:
--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.services;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/07 12:45:49
 * @Describe 启动时申请绑定到APPBase主服务的服务示例
 */
--- a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.services;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/03/07 12:39:24
 * @Describe 普通服务示例
 */
--- a/appbase/src/main/java/cc/winboll/studio/appbase/threads/MainServiceThread.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/threads/MainServiceThread.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.appbase.threads;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/14 03:46:44
 */
 import android.content.Context;
--- a/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java
@@ -1,6 +1,6 @@
 package cc.winboll.studio.appbase.widgets;
 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/15 14:41:25
 * @Describe TimeWidget
 */
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -32,19 +32,13 @@
 				<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="安卓R对应的是Android 11，其API级别是30。以下是Android 11中一些重要的API相关特性：
+					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，但可能需要注意兼容性和配置问题。"/>

-                    \n- 隐私保护方面：引入单次授权，让用户可以选择授予应用对位置信息、麦克风和摄像头的临时访问权限。还增加了数据访问审核功能，能让开发者深入了解应用在何处访问私密数据。
-                    
-                    \n- 系统功能方面：提供了ControlsProviderService API，用于向连接的外部设备提供控件，这些控件显示于Android电源菜单中的设备控件下。媒体控件也得到更新，显示于快捷设置旁，来自多个应用的会话排列在一个可滑动的轮播界面中。
-                    
-                    \n- 硬件支持方面：提供了一些API以支持瀑布屏，通过将窗口布局属性  layoutInDisplayCutoutMode  设为  LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS ，可允许窗口延伸到屏幕各个边缘上的刘海和瀑布区域。对于合页式屏幕配置的设备，提供了具有  TYPE_HINGE_ANGLE  的新传感器以及新的  SensorEvent ，用于监控合页角度。
-                    
-                    \n- 安全方面：对生物识别身份验证机制进行了更新，引入了  BiometricManager.Authenticators  接口，定义了  BIOMETRIC_STRONG 、 BIOMETRIC_WEAK 、 DEVICE_CREDENTIAL  等身份验证类型。还在  BiometricPrompt  类中提供了对“每次使用时进行身份验证”密钥的更多支持。
-                    
-                    \n- 性能和质量方面：支持无线调试，通过Android调试桥（adb）从工作站以无线方式部署和调试应用，避免了常见的USB连接问题。"/>
-                
-                    
 				<HorizontalScrollView
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content">
@@ -217,5 +211,11 @@
 		</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/menu/toolbar_main.xml
+++ b/appbase/src/main/res/menu/toolbar_main.xml
@@ -1,20 +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="HOME"
-        android:icon="@drawable/ic_winboll"/>
-    <item
-        android:id="@+id/item_yun"
-        android:title="YUN"
-        android:icon="@drawable/ic_winboll"/>
-    <item
-        android:id="@+id/item_logon"
-        android:title="Logon"
-        android:icon="@drawable/ic_winboll"/>
-    <item
-        android:id="@+id/item_log"
-        android:title="LOG"
-        android:icon="@drawable/ic_winboll_log"/>
+    
+    
 </menu>
--- a/appbase/src/main/res/xml/network_security_config.xml
+++ b/appbase/src/main/res/xml/network_security_config.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <!-- 允许访问 winboll.cc 及其子域名（原配置） -->
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">winboll.cc</domain>
-    </domain-config>
-
-    <!-- **新增：允许访问 IP 地址 10.8.0.250** -->
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="false">10.8.0.250</domain> <!-- 不包含子域名 -->
-    </domain-config>
-</network-security-config>
--- 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/apputils/src/main/java/cc/winboll/studio/apputils/WinBoLLActivity.java
+++ b/apputils/src/main/java/cc/winboll/studio/apputils/WinBoLLActivity.java
@@ -1,24 +0,0 @@
-package cc.winboll.studio.apputils;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2025/05/13 11:15
- * @Describe WinBoLLActivity
- */
-import android.app.Activity;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
-
-public class WinBoLLActivity extends Activity implements IWinBoLLActivity {
-
-    public static final String TAG = "WinBoLLActivity";
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-}
--- 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/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java
@@ -1,18 +1,15 @@
 package cc.winboll.studio.contacts.fragments;

-
 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/08/30 14:32
- * @Describe 联系人视图
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/02/20 12:57:50
+ * @Describe 联系人
 */
 import android.Manifest;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.provider.ContactsContract;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -30,39 +27,24 @@ import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.adapters.ContactAdapter;
 import cc.winboll.studio.contacts.beans.ContactModel;
-import cc.winboll.studio.libappbase.LogUtils;
 import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+

 public class ContactsFragment extends Fragment {

    public static final String TAG = "ContactsFragment";
-    private static final String ARG_PAGE = "ARG_PAGE";
-    private static final int REQUEST_READ_CONTACTS = 1;

+    private static final String ARG_PAGE = "ARG_PAGE";
    private int mPage;
+
+    private static final int REQUEST_READ_CONTACTS = 1;
    private RecyclerView recyclerView;
    private ContactAdapter contactAdapter;
+    private List<ContactModel> contactList = new ArrayList<>();
+    private List<ContactModel> originalContactList = new ArrayList<>();
    private EditText searchEditText;
-    private Button btnDial;
-    private boolean isViewInitialized = false; // 标记视图是否已初始化
-
-    // 静态缓存：全局复用联系人数据
-    private static List<ContactModel> sCachedOriginalList = new ArrayList<ContactModel>();
-    private static List<ContactModel> sCachedFilteredList = new ArrayList<ContactModel>();
-
-    // 当前页面数据容器
-    private List<ContactModel> contactList = new ArrayList<ContactModel>();
-    private List<ContactModel> originalContactList = new ArrayList<ContactModel>();
-
-    // 异步工具
-    private final ExecutorService executor = Executors.newSingleThreadExecutor();
-    private final Handler mainHandler = new Handler(Looper.getMainLooper());
-    private boolean isDataLoaded = false;
-

    public static ContactsFragment newInstance(int page) {
        Bundle args = new Bundle();
@@ -83,272 +65,103 @@ public class ContactsFragment extends Fragment {
    @Nullable
    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        // 加载布局（已移除进度条相关代码）
-        View view = inflater.inflate(R.layout.fragment_contacts, container, false);
-        return view;
+        return inflater.inflate(R.layout.fragment_contacts, container, false);
    }

    @Override
    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);
-        // 初始化RecyclerView
-        recyclerView = (RecyclerView) view.findViewById(R.id.contacts_recycler_view);
+        recyclerView = view.findViewById(R.id.contacts_recycler_view);
        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        contactList = new ArrayList<ContactModel>();
-        contactAdapter = new ContactAdapter(getContext(), contactList);
+        contactAdapter = new ContactAdapter(contactList);
        recyclerView.setAdapter(contactAdapter);
-        // 初始隐藏列表，数据加载后显示
-        recyclerView.setVisibility(View.GONE);

-        // 绑定搜索框和拨号按钮
-        searchEditText = (EditText) view.findViewById(R.id.search_edit_text);
-        btnDial = (Button) view.findViewById(R.id.btn_dial);
-        // 初始隐藏搜索相关控件，延迟到首次可见时显示
-        searchEditText.setVisibility(View.GONE);
-        btnDial.setVisibility(View.GONE);
-    }
+        searchEditText = view.findViewById(R.id.search_edit_text);
+        searchEditText.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                }

-    // 首次可见时初始化资源
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (!isViewInitialized) {
-            initSearchAndDial(); // 初始化搜索和拨号功能
-            checkContactPermission(); // 检查权限并加载数据
-            isViewInitialized = true;
-        }
-    }
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    filterContacts(s.toString());
+                }

-    // 初始化搜索框和拨号按钮
-    private void initSearchAndDial() {
-        // 显示搜索相关控件
-        searchEditText.setVisibility(View.VISIBLE);
-        btnDial.setVisibility(View.VISIBLE);
+                @Override
+                public void afterTextChanged(Editable s) {
+                }
+            });

-        // 搜索框防抖监听
-        searchEditText.addTextChangedListener(new DebounceTextWatcher(300) {
-				@Override
-				public void onDebounceTextChanged(String query) {
-					filterContacts(query);
-				}
-			});
-
-        // 拨号按钮点击事件
-        btnDial.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					String phoneNumber = searchEditText.getText().toString().replaceAll("\\s", "");
-					if (phoneNumber.isEmpty()) {
-						ToastUtils.show("请输入号码");
-						return;
-					}
-					Intent intent = new Intent(Intent.ACTION_CALL);
-					intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
-					intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-					startActivity(intent);
-				}
-			});
-    }
-
-    // 权限检查
-    private void checkContactPermission() {
        if (ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
            ActivityCompat.requestPermissions(requireActivity(), new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_READ_CONTACTS);
        } else {
-            loadContacts();
-        }
-    }
-
-    // 加载联系人（延迟到首次可见时）
-    private void loadContacts() {
-        // 若有缓存，直接复用
-        if (!sCachedOriginalList.isEmpty() && !sCachedFilteredList.isEmpty()) {
-            originalContactList.clear();
-            originalContactList.addAll(sCachedOriginalList);
-            contactList.clear();
-            contactList.addAll(sCachedFilteredList);
-            contactAdapter.notifyDataSetChanged();
-            recyclerView.setVisibility(View.VISIBLE); // 显示列表
-            isDataLoaded = true;
-            return;
+            readContacts();
        }

-        // 无缓存时异步加载
-        if (!isDataLoaded) {
-            recyclerView.setVisibility(View.GONE); // 加载中隐藏列表
+        Button btnDial = view.findViewById(R.id.btn_dial);
+        btnDial.setOnClickListener(new View.OnClickListener(){
+                @Override
+                public void onClick(View p1) {

-            executor.execute(new Runnable() {
-					@Override
-					public void run() {
-						// 子线程读取联系人
-						final List<ContactModel> tempList = readContactsInBackground();
-
-						// 主线程更新UI
-						mainHandler.post(new Runnable() {
-								@Override
-								public void run() {
-									// 更新缓存
-									sCachedOriginalList.clear();
-									sCachedOriginalList.addAll(tempList);
-									sCachedFilteredList.clear();
-									sCachedFilteredList.addAll(tempList);
-
-									// 更新当前列表
-									originalContactList.clear();
-									originalContactList.addAll(sCachedOriginalList);
-									contactList.clear();
-									contactList.addAll(sCachedFilteredList);
-									contactAdapter.notifyDataSetChanged();
-									LogUtils.d(TAG, String.format("联系人加载完成，共%d条数据", contactList.size()));
-
-									// 数据加载后显示列表
-									recyclerView.setVisibility(View.VISIBLE);
-									isDataLoaded = true;
-								}
-							});
-					}
-				});
-        }
-    }
-
-    // 子线程读取联系人
-    private List<ContactModel> readContactsInBackground() {
-        List<ContactModel> tempList = new ArrayList<ContactModel>();
-        Cursor cursor = null;
-        try {
-            // 查询联系人姓名和号码
-            cursor = requireContext().getContentResolver().query(
-                ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
-                new String[]{
-                    ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME,
-                    ContactsContract.CommonDataKinds.Phone.NUMBER
-                },
-                null,
-                null,
-                ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME + " ASC"
-            );
-
-            if (cursor != null && cursor.moveToFirst()) {
-                int nameIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME);
-                int numberIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER);
-
-                do {
-                    String name = cursor.getString(nameIndex);
-                    String number = cursor.getString(numberIndex).replaceAll("\\s", ""); // 去除空格
-                    tempList.add(new ContactModel(name, number));
-                } while (cursor.moveToNext());
-            }
-        } catch (Exception e) {
-            LogUtils.d(TAG, "读取联系人失败：" + e);
-        } finally {
-            if (cursor != null) {
-                cursor.close(); // 关闭游标，避免内存泄漏
-            }
-        }
-        return tempList;
-    }
-
-    // 过滤联系人
-    private void filterContacts(String query) {
-        contactList.clear();
-        if (query.isEmpty()) {
-            contactList.addAll(originalContactList);
-            sCachedFilteredList.clear();
-            sCachedFilteredList.addAll(originalContactList);
-        } else {
-            String lowerQuery = query.toLowerCase();
-            for (ContactModel contact : originalContactList) {
-                // 匹配姓名、全拼、简拼、号码
-                boolean matchName = contact.getName().toLowerCase().contains(lowerQuery);
-                boolean matchPinyin = contact.getPinyin().toLowerCase().contains(lowerQuery);
-                boolean matchFirstLetter = contact.getPinyinFirstLetter().toLowerCase().contains(lowerQuery);
-                boolean matchNumber = contact.getNumber().contains(lowerQuery);
-
-                if (matchName || matchPinyin || matchFirstLetter || matchNumber) {
-                    contactList.add(contact);
+                    String phoneNumber = searchEditText.getText().toString().replaceAll("\\s", "");
+                    //phoneNumber = "+8616769764848";
+                    ToastUtils.show(phoneNumber);
+                    Intent intent = new Intent(Intent.ACTION_CALL);
+                    intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
+                    // 添加 FLAG_ACTIVITY_NEW_TASK 标志
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    startActivity(intent);
                }
-            }
-            sCachedFilteredList.clear();
-            sCachedFilteredList.addAll(contactList);
-        }
-        contactAdapter.notifyDataSetChanged();
-        // 过滤后确保列表可见
-        recyclerView.setVisibility(View.VISIBLE);
+            });
    }

-    // 权限回调
    @Override
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
        if (requestCode == REQUEST_READ_CONTACTS) {
            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                loadContacts(); // 授权后加载联系人
-            } else {
-                ToastUtils.show("请授予联系人权限以查看联系人列表");
-                recyclerView.setVisibility(View.VISIBLE); // 显示空列表
+                readContacts();
            }
        }
    }

-    // 防抖TextWatcher（Java 7实现）
-    public abstract static class DebounceTextWatcher implements TextWatcher {
-        private final long debounceDelay;
-        private Handler handler = new Handler(Looper.getMainLooper());
-        private Runnable pendingRunnable;
+    private void readContacts() {
+        contactList.clear();
+        originalContactList.clear();
+        Cursor cursor = requireContext().getContentResolver().query(
+            ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
+            null,
+            null,
+            null,
+            ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME + " ASC");

-        public DebounceTextWatcher(long debounceDelay) {
-            this.debounceDelay = debounceDelay;
-        }
-
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            // 无需处理
-        }
-
-        @Override
-        public void onTextChanged(final CharSequence s, int start, int before, int count) {
-            // 移除之前的延迟任务
-            if (pendingRunnable != null) {
-                handler.removeCallbacks(pendingRunnable);
+        if (cursor != null) {
+            while (cursor.moveToNext()) {
+                String name = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
+                String number = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER));
+                ContactModel contact = new ContactModel(name, number);
+                contactList.add(contact);
+                originalContactList.add(contact);
            }
-            // 延迟执行过滤
-            pendingRunnable = new Runnable() {
-                @Override
-                public void run() {
-                    onDebounceTextChanged(s.toString());
-                }
-            };
-            handler.postDelayed(pendingRunnable, debounceDelay);
-        }
-
-        @Override
-        public void afterTextChanged(Editable s) {
-            // 无需处理
-        }
-
-        // 抽象方法：防抖后的回调
-        public abstract void onDebounceTextChanged(String query);
-    }
-
-    // 资源释放
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        executor.shutdown(); // 关闭线程池
-        mainHandler.removeCallbacksAndMessages(null); // 清除未执行任务
-    }
-
-    // Fragment隐藏/显示时的处理
-    @Override
-    public void onHiddenChanged(boolean hidden) {
-        super.onHiddenChanged(hidden);
-        if (!hidden && isDataLoaded) {
-            // 复用缓存数据并显示列表
-            contactList.clear();
-            contactList.addAll(sCachedFilteredList);
+            cursor.close();
            contactAdapter.notifyDataSetChanged();
-            recyclerView.setVisibility(View.VISIBLE);
        }
    }
+
+    private void filterContacts(String query) {
+        contactList.clear();
+        if (query.isEmpty()) {
+            contactList.addAll(originalContactList);
+        } else {
+            for (ContactModel contact : originalContactList) {
+                if (contact.getName().toLowerCase().contains(query.toLowerCase()) ||
+                    contact.getPinyin().toLowerCase().contains(query.toLowerCase()) ||
+                    contact.getNumber().toLowerCase().contains(query.toLowerCase())) {
+                    contactList.add(contact);
+                }
+            }
+        }
+        contactAdapter.notifyDataSetChanged();
+    }
 }

--- a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/LogFragment.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/LogFragment.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:58:15
 * @Describe 应用日志
 */
--- a/contacts/src/main/java/cc/winboll/studio/contacts/handlers/MainServiceHandler.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/handlers/MainServiceHandler.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.handlers;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/14 03:51:40
 */
 import android.os.Handler;
--- a/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.receivers;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/13 06:58:04
 * @Describe 主要广播接收器
 */
--- a/contacts/src/main/java/cc/winboll/studio/contacts/services/AssistantService.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/services/AssistantService.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.services;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/14 03:38:31
 * @Describe 守护进程服务
 */
--- a/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.services;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/13 06:56:41
 * @Describe 拨号主服务
 * 参考:
@@ -18,7 +18,6 @@ import android.content.ServiceConnection;
 import android.media.AudioManager;
 import android.os.Binder;
 import android.os.IBinder;
-import cc.winboll.studio.contacts.App;
 import cc.winboll.studio.contacts.beans.MainServiceBean;
 import cc.winboll.studio.contacts.beans.RingTongBean;
 import cc.winboll.studio.contacts.bobulltoon.TomCat;
@@ -30,9 +29,11 @@ import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.contacts.threads.MainServiceThread;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.sos.SOS;
-import cc.winboll.studio.libappbase.winboll.WinBoLL;
 import java.util.Timer;
 import java.util.TimerTask;
+import cc.winboll.studio.libappbase.sos.WinBoll;
+import cc.winboll.studio.contacts.App;
+import cc.winboll.studio.libappbase.sos.APPModel;

 public class MainService extends Service {

@@ -128,11 +129,11 @@ public class MainService extends Service {
            isServiceRunning = true;
            // 唤醒守护进程
            wakeupAndBindAssistant();
-            // 召唤 WinBoLL APP 绑定本服务
+            // 召唤 WinBoll APP 绑定本服务
            if (App.isDebuging()) {
-                WinBoLL.bindToAPPBaseBeta(this, MainService.class.getName());
+                WinBoll.bindToAPPBaseBeta(this, MainService.class.getName());
            } else {
-                WinBoLL.bindToAPPBase(this, MainService.class.getName());
+                WinBoll.bindToAPPBase(this, MainService.class.getName());
            }

            // 初始化服务运行参数
--- a/contacts/src/main/java/cc/winboll/studio/contacts/threads/MainServiceThread.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/threads/MainServiceThread.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.threads;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/14 03:46:44
 */
 import android.content.Context;
--- a/contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java
@@ -1,9 +1,9 @@
 package cc.winboll.studio.contacts.utils;

 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/08/30 14:32
- * @Describe 联系人工具集
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/03/06 21:08:16
+ * @Describe ContactUtils
 */
 import android.content.ContentResolver;
 import android.content.Context;
--- a/contacts/src/main/java/cc/winboll/studio/contacts/utils/EditTextIntUtils.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/EditTextIntUtils.java
@@ -3,7 +3,7 @@ import android.widget.EditText;
 import cc.winboll.studio.libappbase.LogUtils;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/04/13 00:59:13
 * @Describe Int类型数字输入框工具集
 */
--- a/contacts/src/main/java/cc/winboll/studio/contacts/utils/IntUtils.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/IntUtils.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.utils;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/04/13 01:16:28
 * @Describe Int数字操作工具集
 */
--- a/contacts/src/main/java/cc/winboll/studio/contacts/utils/PhoneUtils.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/PhoneUtils.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.contacts.utils;

 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen<zhangsken@188.com>
 * @Date 2025/02/26 15:21:48
 * @Describe PhoneUtils
 */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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