Merge remote-tracking branch 'gitee/timestamp' into appbase

.gitmodules

@@ -1,3 +1,6 @@
 [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

.winboll/bashChangeToBetaKeyStore.sh

@@ -1,3 +0,0 @@
-#!/bin/usr/bash
-## Change Back To Beta KeyStore in keystore module.
-cd keystore;git reset --hard f5bc75ff45fcb8894b5bd3f49b91bdd8fe3c317e;cd ..

.winboll/bashChangeToStageMGKeyStore.sh

@@ -1,3 +0,0 @@
-#!/bin/usr/bash
-## Change Back To StageMG KeyStore in keystore module.
-cd keystore;git reset --hard d22519b11253f85f495400b01b6373e9657defb4;cd ..

.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

GenKeyStore/gen_debug_keystore.sh

@@ -0,0 +1,49 @@
+#!/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

README.md

@@ -114,9 +114,12 @@
 
 # 本项目要实际运用需要注意以下几个步骤：
 # 在项目根目录下：
-## 1. 项目模块编译环境设置(必须)，settings.gradle-demo 要复制为 settings.gradle，并取消相应项目模块的注释。
-## 2. 项目 Android SDK 编译环境设置(可选)，local.properties-demo 要复制为 local.properties，并按需要设置 Android SDK 目录。
-## 3. 类库型模块编译环境设置(可选)，winboll.properties-demo 要复制为 winboll.properties，并按需要设置 WinBoLL Maven 库登录用户信息。
+## ★. 项目模块编译环境设置(必须)，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 库登录用户信息。
 
 
 # ☆类库型项目编译方法

aes/README.md

@@ -0,0 +1,35 @@
+# 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/)
+
+#### 参考文档

aes/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.8" 
+        versionName "15.9" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 13 11:22:39 HKT 2025
-stageCount=1
+#Sun Aug 31 23:40:17 HKT 2025
+stageCount=4
 libraryProject=libaes
-baseVersion=15.8
-publishVersion=15.8.0
+baseVersion=15.9
+publishVersion=15.9.3
 buildCount=0
-baseBetaVersion=15.8.1
+baseBetaVersion=15.9.4

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

@@ -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("APP");
+        appInfo.setAppGitName("APPBase");
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(szBranchName);
         appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=AES");
+        appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=3&extra=page%3D1");
         appInfo.setAppAPKName("AES");
         appInfo.setAppAPKFolderName("AES");
         //appInfo.setIsAddDebugTools(false);

androiddemo/app_update_description.txt

@@ -0,0 +1 @@
+

androiddemo/build.gradle

@@ -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.1'
-    api 'cc.winboll.studio:libappbase:15.8.1'
+    api 'cc.winboll.studio:libapputils:15.8.5'
+    api 'cc.winboll.studio:libappbase:15.9.5'
 }

androiddemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon May 19 21:45:28 GMT 2025
-stageCount=0
+#Sun Aug 31 05:11:26 CST 2025
+stageCount=1
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=25
+buildCount=0
 baseBetaVersion=15.0.1

androidxdemo/app_update_description.txt

@@ -0,0 +1 @@
+

androidxdemo/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.0"
+        versionName "15.1"
         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.8.0'
-    api 'cc.winboll.studio:libapputils:15.8.1'
-    api 'cc.winboll.studio:libappbase:15.8.1'
+    api 'cc.winboll.studio:libaes:15.9.3'
+    api 'cc.winboll.studio:libapputils:15.8.5'
+    api 'cc.winboll.studio:libappbase:15.9.5'
 }

androidxdemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon May 19 21:43:40 GMT 2025
-stageCount=0
+#Sun Aug 31 05:42:50 CST 2025
+stageCount=2
 libraryProject=
-baseVersion=15.0
-publishVersion=15.0.0
-buildCount=22
-baseBetaVersion=15.0.1
+baseVersion=15.1
+publishVersion=15.1.1
+buildCount=0
+baseBetaVersion=15.1.2

appbase/build.gradle

@@ -30,7 +30,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.8"
+        versionName "15.9"
         if(true) {
             versionName = genVersionName("${versionName}")
         }

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 20 03:28:00 GMT 2025
-stageCount=2
+#Sun Aug 31 23:37:38 HKT 2025
+stageCount=6
 libraryProject=libappbase
-baseVersion=15.8
-publishVersion=15.8.1
-buildCount=1
-baseBetaVersion=15.8.2
+baseVersion=15.9
+publishVersion=15.9.5
+buildCount=0
+baseBetaVersion=15.9.6

appbase/src/main/AndroidManifest.xml

@@ -9,7 +9,8 @@
         android:label="@string/app_name"
         android:theme="@style/MyAPPBaseTheme"
         android:resizeableActivity="true"
-        android:process=":App">
+        android:process=":App"
+        android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
             android:name=".MainActivity"
@@ -39,7 +40,8 @@
             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"
@@ -74,7 +76,8 @@
 
         <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>
@@ -105,7 +108,8 @@
 
         </receiver>
 
-        <receiver android:name=".receivers.APPNewsWidgetClickListener"
+        <receiver
+            android:name=".receivers.APPNewsWidgetClickListener"
             android:exported="true">
 
             <intent-filter>
@@ -122,7 +126,6 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
-
     </application>
 
 </manifest>

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

@@ -40,7 +40,6 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
     }
 
     Toolbar mToolbar;
-    LogView mLogView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -53,19 +52,21 @@ 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);
     }
@@ -176,8 +177,7 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        mLogView.start();
     }
-    
-    
+
+
 }

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

@@ -66,16 +66,11 @@ 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);
     }

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

@@ -64,16 +64,11 @@ 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);
     }

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

@@ -6,6 +6,12 @@ package cc.winboll.studio.appbase.activities;
  * @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 {
@@ -21,4 +27,35 @@ 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);
+    }
 }

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

@@ -32,13 +32,19 @@
 				<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="Hello, WinBoLL!"/>
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Android版本10的代号是“Q”，API级别是29。   Android 10开始谷歌不再公开使用甜品作为版本代号，但内部仍保留了大量与“Q”相关的元素。Android 10本身并没有严格对应某个特定的Java版本，但在开发Android 10应用时，通常可以使用Java 8或更高版本。   Java 8为Android开发带来了诸如Lambda表达式、方法引用等新特性，能提高开发效率和代码可读性，与Android 10开发适配良好。Java 9及更高版本也可用于Android 10开发，能使用一些新的语言特性和API，但可能需要注意兼容性和配置问题。"/>
+					android:text="安卓R对应的是Android 11，其API级别是30。以下是Android 11中一些重要的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">
@@ -211,11 +217,5 @@
 		</LinearLayout>
 
 	</ScrollView>
-
-	<cc.winboll.studio.libappbase.LogView
-		android:layout_width="match_parent"
-		android:layout_height="300dp"
-		android:id="@+id/logview"/>
-
 </LinearLayout>
 

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

@@ -1,6 +1,20 @@
 <?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>

appbase/src/main/res/xml/network_security_config.xml

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

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 13 11:18:09 HKT 2025
-stageCount=2
+#Sun Aug 31 23:39:16 HKT 2025
+stageCount=6
 libraryProject=libapputils
 baseVersion=15.8
-publishVersion=15.8.1
+publishVersion=15.8.5
 buildCount=0
-baseBetaVersion=15.8.2
+baseBetaVersion=15.8.6

autoinstaller/README.md

@@ -0,0 +1,35 @@
+# 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/)
+
+#### 参考文档

autoinstaller/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun May 04 05:32:00 GMT 2025
-stageCount=1
+#Tue Jun 24 09:54:47 HKT 2025
+stageCount=3
 libraryProject=
 baseVersion=15.2
-publishVersion=15.2.0
-buildCount=74
-baseBetaVersion=15.2.1
+publishVersion=15.2.2
+buildCount=0
+baseBetaVersion=15.2.3

build.gradle

@@ -72,7 +72,7 @@ allprojects {
         bashCommitAppPublishBuildFlagInfoFilePath = ".winboll/bashCommitAppPublishBuildFlagInfo.sh"
         
         winbollFilePath = "winboll.properties"
-        keyPropsFilePath = "current.keystore"
+        keyPropsFilePath = "appkey.keystore"
         // 定义 lint 输出文件
         lintXmlReportFilePath = "build/reports/lint-results.xml"
         lintHTMLReportFilePath = "build/reports/lint-results.html"

contacts/README.md

@@ -3,7 +3,7 @@
 https://github.com/aJIEw/PhoneCallApp.git
 
 #### 介绍
-通讯录与拨号
+这是可以根据正则表达式匹配拦截骚扰电话的手机拨号应用。
 
 #### 软件架构
 适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。

contacts/build.gradle

@@ -45,9 +45,9 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libaes:15.8.0'
-    api 'cc.winboll.studio:libapputils:15.8.1'
-    api 'cc.winboll.studio:libappbase:15.8.1'
+    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'

contacts/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 20 13:02:18 HKT 2025
-stageCount=3
+#Sun Aug 31 06:05:42 CST 2025
+stageCount=17
 libraryProject=
 baseVersion=15.3
-publishVersion=15.3.2
+publishVersion=15.3.16
 buildCount=0
-baseBetaVersion=15.3.3
+baseBetaVersion=15.3.17

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

@@ -1,5 +1,10 @@
 package cc.winboll.studio.contacts;
 
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@188.com>
+ * @Date 2025/08/30 14:32
+ * @Describe 主窗口
+ */
 import android.Manifest;
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -8,6 +13,7 @@ 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;
@@ -41,7 +47,7 @@ import java.util.List;
 
 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;
@@ -55,13 +61,10 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
     MainServiceBean mMainServiceBean;
     private TabLayout tabLayout;
     private ViewPager viewPager;
-    private List<View> views; //用来存放放进ViewPager里面的布局
-    //实例化存储imageView（导航原点）的集合
+    private List<View> views; 
     ImageView[] imageViews;
-    //MyPagerAdapter adapter;//适配器
-    MyPagerAdapter pagerAdapter;
-    LinearLayout linearLayout;//下标所在在LinearLayout布局里
-    int currentPoint = 0;//当前被选中中页面的下标
+    LinearLayout linearLayout;
+    int currentPoint = 0;
 
     private TelephonyManager telephonyManager;
     private MyPhoneStateListener phoneStateListener;
@@ -70,30 +73,6 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
 
     private static final int DIALER_REQUEST_CODE = 1;
 
-//    @Override
-//    public Activity getActivity() {
-//        return this;
-//    }
-
-//    @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
     public Activity getActivity() {
@@ -107,89 +86,62 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        // 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回
-        //if (prosessIntents(getIntent())) return;
-        // 以下正常创建主窗口
         super.onCreate(savedInstanceState);
         _MainActivity = this;
         setContentView(R.layout.activity_main);
 
-        // 初始化工具栏
-        mToolbar = findViewById(R.id.activitymainToolbar1);
+        // 初始化工具栏（仅加载基础UI）
+        mToolbar = (Toolbar) findViewById(R.id.activitymainToolbar1);
         setSupportActionBar(mToolbar);
-//        if (isEnableDisplayHomeAsUp()) {
-//            // 显示后退按钮
-//            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-//        }
         getSupportActionBar().setSubtitle(TAG);
 
-        tabLayout = findViewById(R.id.tabLayout);
-        viewPager = findViewById(R.id.viewPager);
+        tabLayout = (TabLayout) findViewById(R.id.tabLayout);
+        viewPager = (ViewPager) findViewById(R.id.viewPager);
 
-        // 创建Fragment列表和标题列表
-        fragmentList = new ArrayList<>();
-        tabTitleList = new ArrayList<>();
+        // 创建Fragment列表（仅实例化，不加载数据）
+        fragmentList = new ArrayList<Fragment>();
+        tabTitleList = new ArrayList<String>();
         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()) {
-            MainService.startMainService(this);
+            // 延迟1秒启动服务，避免阻塞启动
+            new Handler().postDelayed(new Runnable() {
+					@Override
+					public void run() {
+						MainService.startMainService(MainActivity.this);
+					}
+				}, 1000);
         }
 
-        // 初始化TelephonyManager和PhoneStateListener
+        // 初始化电话状态监听（基础功能保留）
         telephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
         phoneStateListener = new MyPhoneStateListener();
         telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
     }
 
 
-    // ViewPager的适配器
+    // ViewPager适配器（Java 7语法）
     private class MyPagerAdapter extends FragmentPagerAdapter {
 
         private List<Fragment> fragmentList;
@@ -226,91 +178,22 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct
         _MainActivity.startActivity(intent);
     }
 
-    //初始化view，即显示的图片
-//    void initView() {
-//        viewPager = findViewById(R.id.activitymainViewPager1);
-//        pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
-//        viewPager.setAdapter(pagerAdapter);
-//        //adapter = new MyPagerAdapter(views);
-//        //viewPager = findViewById(R.id.activitymainViewPager1);
-//        //viewPager.setAdapter(adapter);
-//        //linearLayout = findViewById(R.id.activitymainLinearLayout1);
-//        //initPoint();//初始化页面下方的点
-//        viewPager.setOnPageChangeListener(this);
-//
-//    }
-
-    //初始化所要显示的布局
-//    void initData() {
-//        LayoutInflater inflater = LayoutInflater.from(getActivity());
-//        View view1 = inflater.inflate(R.layout.fragment_call_log, viewPager, false);
-//        View view2 = inflater.inflate(R.layout.fragment_contacts, viewPager, false);
-//        View view3 = inflater.inflate(R.layout.fragment_log, viewPager, false);
-//
-//        views = new ArrayList<>();
-//        views.add(view1);
-//        views.add(view2);
-//        views.add(view3);
-//    }
-
-//    void 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）在“手指离开屏幕”的状态。*/
+    // OnPageChangeListener接口实现
     @Override
-    public void onPageScrollStateChanged(int state) {
+    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) {
+    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);//直接跳转到某一个页面的情况
-    }
+    public void onPageSelected(int position) {}
+
+    @Override
+    public void onClick(View v) {}
 
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        //setSubTitle("");
     }
 
     private class MyPhoneStateListener extends PhoneStateListener {
@@ -336,109 +219,31 @@ 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 (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        if (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());
@@ -452,35 +257,22 @@ 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();
             }
         }
     }
 }
+

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

@@ -79,12 +79,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("APP");
+        appInfo.setAppDescription("这是可以根据正则表达式匹配拦截骚扰电话的手机拨号应用。");
+        appInfo.setAppGitName("APPBase");
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(szBranchName);
         appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=Contacts");
+        appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=4&extra=page%3D1");
         appInfo.setAppAPKName("Contacts");
         appInfo.setAppAPKFolderName("Contacts");
         return new AboutView(mContext, appInfo);

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

@@ -198,6 +198,9 @@ 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();
@@ -207,6 +210,7 @@ public class SettingsActivity extends AppCompatActivity implements IWinBoLLActiv
         etDunTotalCount.setText(Integer.toString(settingsModel.getDunTotalCount()));
         etDunResumeSecondCount.setText(Integer.toString(settingsModel.getDunResumeSecondCount()));
         etDunResumeCount.setText(Integer.toString(settingsModel.getDunResumeCount()));
+		
     }
 
     void updateStreamVolumeTextView() {
@@ -243,6 +247,9 @@ public class SettingsActivity extends AppCompatActivity implements IWinBoLLActiv
         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) {
@@ -330,4 +337,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);
+    }
 }

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

@@ -5,13 +5,18 @@ package cc.winboll.studio.contacts.adapters;
  * @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;
@@ -35,6 +40,10 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
         this.mContactUtils = ContactUtils.getInstance(mContext);
         this.callLogList = callLogList;
     }
+	
+	public void relaodContacts() {
+		this.mContactUtils.relaodContacts();
+	}
 
     @NonNull
     @Override
@@ -47,6 +56,38 @@ 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()));

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

@@ -5,19 +5,25 @@ package cc.winboll.studio.contacts.adapters;
  * @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.Button;
+import android.widget.LinearLayout;
+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;
 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> {
 
@@ -26,8 +32,10 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
     private static final int REQUEST_CALL_PHONE = 1;
 
     private List<ContactModel> contactList;
+	Context mContext;
 
-    public ContactAdapter(List<ContactModel> contactList) {
+    public ContactAdapter(Context context, List<ContactModel> contactList) {
+		mContext = context;
         this.contactList = contactList;
     }
 
@@ -41,6 +49,37 @@ 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());
 
@@ -69,12 +108,14 @@ 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);

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

@@ -7,6 +7,7 @@ package cc.winboll.studio.contacts.adapters;
  */
 import android.content.Context;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -20,6 +21,7 @@ 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;
@@ -60,6 +62,10 @@ 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
@@ -215,16 +221,22 @@ 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);
-            //tvRuleText = itemView.findViewById(R.id.ruletext_tv);
-            tvRuleText = new TextView(itemView.getContext());
+			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());
             scrollView.setContentWidth(parent.getWidth());
             //scrollView.setContentWidth(600);
-            scrollView.addContentLayout(tvRuleText);
+            scrollView.addContentLayout(viewContent);
         }
 
     }
@@ -243,5 +255,9 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.V
             buttonConfirm = itemView.findViewById(R.id.button_confirm);
         }
     }
+
+	private void setCheckBoxTouchListener(CheckBox checkBox) {
+
+	}
 }
 

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

@@ -1,9 +1,9 @@
 package cc.winboll.studio.contacts.beans;
 
 /**
- * @Author ZhanGSKen<zhangsken@188.com>
- * @Date 2025/02/26 13:37:00
- * @Describe ContactModel
+ * @Author ZhanGSKen&豆包大模型<zhangsken@188.com>
+ * @Date 2025/08/30 14:32
+ * @Describe 联系人信息数据模型
  */
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
@@ -18,13 +18,18 @@ 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);
@@ -33,22 +38,55 @@ 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) {
-                        pinyin.append(pinyinArray[0]);
+                    if (pinyinArray != null && pinyinArray.length > 0) {
+                        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;
     }

contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java

@@ -11,6 +11,7 @@ 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;
@@ -44,7 +45,7 @@ public class TomCat {
         }
         return _TomCat;
     }
-    
+
     public String getDefaultBobulltoonUrl() {
         return mContext.getString(R.string.default_bobulltoon_url);
     }
@@ -123,7 +124,7 @@ public class TomCat {
             }
 
             // 更新新文件
-            if(downloadAndExtractZip(zipUrl, destinationFolder)) {
+            if (downloadAndExtractZip(zipUrl, destinationFolder)) {
                 LogUtils.d(TAG, "ZIP 文件下载并解压成功。");
                 return true;
             }
@@ -154,12 +155,81 @@ 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 = new File(getWorkingFolder(), "bobulltoon");
+        File fBoBullToon = getBoBullToonDataFolder();
         if (fBoBullToon.exists()) {
-            LogUtils.d(TAG, String.format("getWorkingFolder() %s", getWorkingFolder()));
+            LogUtils.d(TAG, String.format("getBoBullToonDataFolder() %s", getWorkingFolder()));
             for (File userFolder : fBoBullToon.listFiles()) {
                 if (userFolder.isDirectory()) {
                     for (File recordFile : userFolder.listFiles()) {

contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java

@@ -145,6 +145,14 @@ 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) {
@@ -158,14 +166,6 @@ 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++) {

contacts/src/main/java/cc/winboll/studio/contacts/fragments/CallLogFragment.java

@@ -161,4 +161,12 @@ public class CallLogFragment extends Fragment {
             _CallLogFragment.triggerUpdate();
         }
     }
+	
+	@Override
+	public void onResume() {
+		super.onResume();
+		//ToastUtils.show("onResume");
+		callLogAdapter.relaodContacts();
+		readCallLog();  // 窗口回显时更新通话记录
+	}
 }

contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java

@@ -1,15 +1,18 @@
 package cc.winboll.studio.contacts.fragments;
 
+
 /**
- * @Author ZhanGSKen<zhangsken@188.com>
- * @Date 2025/02/20 12:57:50
- * @Describe 联系人
+ * @Author ZhanGSKen&豆包大模型<zhangsken@188.com>
+ * @Date 2025/08/30 14:32
+ * @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;
@@ -27,24 +30,39 @@ 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 int mPage;
-
     private static final int REQUEST_READ_CONTACTS = 1;
+
+    private int mPage;
     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();
@@ -65,103 +83,272 @@ public class ContactsFragment extends Fragment {
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_contacts, container, false);
+        // 加载布局（已移除进度条相关代码）
+        View view = inflater.inflate(R.layout.fragment_contacts, container, false);
+        return view;
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        recyclerView = view.findViewById(R.id.contacts_recycler_view);
+        // 初始化RecyclerView
+        recyclerView = (RecyclerView) view.findViewById(R.id.contacts_recycler_view);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        contactAdapter = new ContactAdapter(contactList);
+        contactList = new ArrayList<ContactModel>();
+        contactAdapter = new ContactAdapter(getContext(), contactList);
         recyclerView.setAdapter(contactAdapter);
+        // 初始隐藏列表，数据加载后显示
+        recyclerView.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) {
-                }
+        // 绑定搜索框和拨号按钮
+        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);
+    }
 
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                    filterContacts(s.toString());
-                }
+    // 首次可见时初始化资源
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (!isViewInitialized) {
+            initSearchAndDial(); // 初始化搜索和拨号功能
+            checkContactPermission(); // 检查权限并加载数据
+            isViewInitialized = true;
+        }
+    }
 
-                @Override
-                public void afterTextChanged(Editable s) {
-                }
-            });
+    // 初始化搜索框和拨号按钮
+    private void initSearchAndDial() {
+        // 显示搜索相关控件
+        searchEditText.setVisibility(View.VISIBLE);
+        btnDial.setVisibility(View.VISIBLE);
 
+        // 搜索框防抖监听
+        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 {
-            readContacts();
+            loadContacts();
         }
-
-        Button btnDial = view.findViewById(R.id.btn_dial);
-        btnDial.setOnClickListener(new View.OnClickListener(){
-                @Override
-                public void onClick(View p1) {
-
-                    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);
-                }
-            });
     }
 
+    // 加载联系人（延迟到首次可见时）
+    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;
+        }
+
+        // 无缓存时异步加载
+        if (!isDataLoaded) {
+            recyclerView.setVisibility(View.GONE); // 加载中隐藏列表
+
+            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);
+                }
+            }
+            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) {
-                readContacts();
+                loadContacts(); // 授权后加载联系人
+            } else {
+                ToastUtils.show("请授予联系人权限以查看联系人列表");
+                recyclerView.setVisibility(View.VISIBLE); // 显示空列表
             }
         }
     }
 
-    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");
+    // 防抖TextWatcher（Java 7实现）
+    public abstract static class DebounceTextWatcher implements TextWatcher {
+        private final long debounceDelay;
+        private Handler handler = new Handler(Looper.getMainLooper());
+        private Runnable 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);
-            }
-            cursor.close();
-            contactAdapter.notifyDataSetChanged();
+        public DebounceTextWatcher(long debounceDelay) {
+            this.debounceDelay = debounceDelay;
         }
-    }
 
-    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);
+        @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);
+            }
+            // 延迟执行过滤
+            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);
+            contactAdapter.notifyDataSetChanged();
+            recyclerView.setVisibility(View.VISIBLE);
         }
-        contactAdapter.notifyDataSetChanged();
     }
 }
 

contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java

@@ -1,9 +1,9 @@
 package cc.winboll.studio.contacts.utils;
 
 /**
- * @Author ZhanGSKen<zhangsken@188.com>
- * @Date 2025/03/06 21:08:16
- * @Describe ContactUtils
+ * @Author ZhanGSKen&豆包大模型<zhangsken@188.com>
+ * @Date 2025/08/30 14:32
+ * @Describe 联系人工具集
  */
 import android.content.ContentResolver;
 import android.content.Context;

contacts/src/main/java/cc/winboll/studio/contacts/views/LeftScrollView.java

@@ -47,8 +47,8 @@ public class LeftScrollView extends HorizontalScrollView {
         init();
     }
 
-    public void addContentLayout(TextView textView) {
-        contentLayout.addView(textView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
+    public void addContentLayout(View viewContent) {
+        contentLayout.addView(viewContent, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
     }
 
     public void setContentWidth(int contentWidth) {

contacts/src/main/res/layout/activity_settings.xml

@@ -269,6 +269,19 @@
 
 			</LinearLayout>
 
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_horizontal">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="&lt;&lt;==向左拉动列表项可编辑内容"/>
+
+			</LinearLayout>
+
 			<androidx.recyclerview.widget.RecyclerView
 				android:id="@+id/recycler_view"
 				android:layout_width="match_parent"
@@ -287,6 +300,12 @@
 				android:layout_height="wrap_content"
 				android:gravity="right">
 
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="LogView"
+					android:onClick="onLogView"/>
+
 				<Button
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"

contacts/src/main/res/layout/activity_unittest.xml

@@ -15,8 +15,10 @@
 		<Button
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="Test Main"
-			android:onClick="onTestMain"/>
+			android:text="Add Demo Rules(While size is 0) and Test"
+			android:onClick="onTestMain"
+			android:textSize="10sp"
+			android:textAllCaps="false"/>
 
 	</LinearLayout>
 
@@ -43,7 +45,8 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:text="Test Phone"
-			android:onClick="onTestPhone"/>
+			android:onClick="onTestPhone"
+			android:textAllCaps="false"/>
 
 	</LinearLayout>
 

contacts/src/main/res/layout/item_contact.xml

@@ -9,7 +9,8 @@
 	<LinearLayout
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_height="wrap_content"
+		android:id="@+id/itemcontactLinearLayout1">
 
 		<TextView
 			android:id="@+id/contact_number"

contacts/src/main/res/layout/view_phone_connect_rule.xml

@@ -23,7 +23,7 @@
 			android:id="@+id/checkbox_allow"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="允许连接"/>
+			android:text="连接"/>
 
         <CheckBox
             android:id="@+id/checkbox_enable"

contacts/src/main/res/layout/view_phone_connect_rule_simple2.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<HorizontalScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none"
-    android:id="@+id/scrollView">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <!-- 内容区域 -->
-        <LinearLayout
-            android:id="@+id/content_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:background="@color/white">
-            <!-- 这里放置你的列表项内容 -->
-
-            <TextView
-                android:id="@+id/text_view"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:textSize="16sp"/>
-        </LinearLayout>
-
-        <!-- 操作按钮 -->
-        <LinearLayout
-            android:id="@+id/action_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:background="@color/lightgray">
-
-            <Button
-                android:id="@+id/edit_btn"
-                android:layout_width="80dp"
-                android:layout_height="match_parent"
-                android:text="编辑"
-                android:background="@color/blue" />
-
-            <Button
-                android:id="@+id/delete_btn"
-                android:layout_width="80dp"
-                android:layout_height="match_parent"
-                android:text="删除"
-                android:background="@color/red" />
-        </LinearLayout>
-    </LinearLayout>
-</HorizontalScrollView>

contacts/src/main/res/layout/view_phone_connect_rule_simple_content.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="horizontal"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_gravity="center_vertical"
+	android:gravity="center_vertical">
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="Text"
+		android:layout_weight="1.0"
+		android:id="@+id/ruletext_tv"/>
+
+	<CheckBox
+		android:id="@+id/checkbox_allow"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="连接"
+		android:clickable="false"
+		android:focusable="false"/>
+
+	<CheckBox
+		android:id="@+id/checkbox_enable"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="启用"
+		android:clickable="false"
+		android:focusable="false"/>
+
+</LinearLayout>
+

contacts/src/main/res/menu/toolbar_calllog_phonenumber.xml

@@ -0,0 +1,9 @@
+<?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_calllog_phonenumber_copy"
+        android:title="Copy"/>
+    
+</menu>

contacts/src/main/res/menu/toolbar_contact_phonenumber.xml

@@ -0,0 +1,9 @@
+<?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_contact_phonenumber_copy"
+        android:title="Copy"/>
+    
+</menu>

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

@@ -2,6 +2,6 @@
 <resources>
 
     <string name="app_name">Contacts</string>
-    <string name="default_bobulltoon_url">http://10.8.0.12:3000/Studio/BoBullToon/archive/main.zip</string>
+    <string name="default_bobulltoon_url">https://gitee.com/zhangsken/bobulltoon/repository/archive/main.zip</string>
 
 </resources>

current.keystore-demo

@@ -1,4 +0,0 @@
-keyAlias=WinBoLL.CC
-keyPassword=androiddebugkey
-storeFile=../WinBoLL.CC.jks
-storePassword=androiddebugkey

jc/build.gradle

@@ -42,23 +42,24 @@ android {
         }
     }
     
-    compileOptions {
+    /*compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
-    }
+    }*/
 }
 
 dependencies {
+    api fileTree(dir: 'libs', include: ['*.jar'])
+	api project(':libjc')
+	api 'cc.winboll.studio:libaes:15.9.1'
+	api 'cc.winboll.studio:libapputils:15.8.4'
+	api 'cc.winboll.studio:libappbase:15.8.4'
+	
     // https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on
     //implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
     implementation 'org.bouncycastle:bcprov-jdk15to18:1.69'
     implementation 'org.bouncycastle:bcpkix-jdk15to18:1.69'
 
-	api project(':libjc')
     api 'androidx.appcompat:appcompat:1.0.0'
 	api 'com.google.android.material:material:1.0.0'
-    
-    api 'cc.winboll.studio:libapputils:9.1.0'
-    api 'cc.winboll.studio:libappbase:1.0.3'
-    api fileTree(dir: 'libs', include: ['*.jar'])
 }

jc/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Jan 10 22:03:57 GMT 2025
+#Tue Jun 24 11:17:30 GMT 2025
 stageCount=0
 libraryProject=libjc
 baseVersion=1.0
 publishVersion=1.0.0
-buildCount=133
+buildCount=135
 baseBetaVersion=1.0.1

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

@@ -15,10 +15,10 @@ import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import cc.winboll.studio.jc.R;
-import cc.winboll.studio.libapputils.log.LogUtils;
-import cc.winboll.studio.libjc.JAR_RUNNING_MODE;
 import cc.winboll.studio.libjc.JCMainThread;
 import cc.winboll.studio.libjc.net.JCSocketClient;
+import cc.winboll.studio.libjc.util.LogUtils;
+import cc.winboll.studio.libjc.Main;
 
 final public class MainActivity extends Activity implements JCMainThread.OnMessageListener {
 
@@ -77,7 +77,7 @@ final public class MainActivity extends Activity implements JCMainThread.OnMessa
         // 启动主线程
         _JCMainThread = JCMainThread.getInstance(getPackageName());
         _JCMainThread.setOnLogListener(this);
-        _JCMainThread.setRunningMode(JAR_RUNNING_MODE.JC);
+        //_JCMainThread.setRunningMode(Main.JAR_RUNNING_MODE.JC);
         _JCMainThread.start();
 
         // 设置 WinBoll 应用 UI 类型

libaes/build.gradle

@@ -21,8 +21,8 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libapputils:15.8.1'
-    api 'cc.winboll.studio:libappbase:15.8.0'
+    api 'cc.winboll.studio:libapputils:15.8.5'
+	api 'cc.winboll.studio:libappbase:15.9.5'
     
     // 吐司类库
     api 'com.github.getActivity:ToastUtils:10.5'

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 13 11:22:23 HKT 2025
-stageCount=1
+#Sun Aug 31 05:00:43 CST 2025
+stageCount=4
 libraryProject=libaes
-baseVersion=15.8
-publishVersion=15.8.0
+baseVersion=15.9
+publishVersion=15.9.3
 buildCount=0
-baseBetaVersion=15.8.1
+baseBetaVersion=15.9.4

libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java

@@ -107,7 +107,7 @@ public class AboutView extends LinearLayout {
         mszAppDescription = mAPPInfo.getAppDescription();
         mnAppIcon = mAPPInfo.getAppIcon();
 
-        mszWinBoLLServerHost = GlobalApplication.isDebuging() ?  "https://dev.winboll.cc": "https://www.winboll.cc";
+        mszWinBoLLServerHost = GlobalApplication.isDebuging() ?  "https://yun-preivew.winboll.cc": "https://yun.winboll.cc";
 
         try {
             mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
@@ -115,7 +115,8 @@ public class AboutView extends LinearLayout {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
         mszCurrentAppPackageName = mszAppAPKName + "_" + mszAppVersionName + ".apk";
-        mszHomePage = mszWinBoLLServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
+        mszHomePage = mAPPInfo.getAppHomePage();
+        //mszHomePage = mszWinBoLLServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
         if (mAPPInfo.getAppGitAPPBranch().equals("")) {
             mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName;
         } else {

libappbase/build.gradle

@@ -22,4 +22,9 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
+    // 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
+    
+    api 'com.google.code.gson:gson:2.10.1'
 }

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 20 03:28:00 GMT 2025
-stageCount=2
+#Mon Aug 18 03:56:26 HKT 2025
+stageCount=6
 libraryProject=libappbase
-baseVersion=15.8
-publishVersion=15.8.1
-buildCount=1
-baseBetaVersion=15.8.2
+baseVersion=15.9
+publishVersion=15.9.5
+buildCount=0
+baseBetaVersion=15.9.6

libappbase/src/main/AndroidManifest.xml

@@ -103,6 +103,10 @@
 
         </receiver>
 
+        <activity android:name="cc.winboll.studio.libappbase.activities.YunActivity"/>
+
+        <activity android:name="cc.winboll.studio.libappbase.activities.LogonActivity"/>
+
     </application>
 
 </manifest>

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java

@@ -47,7 +47,7 @@ public class GlobalApplication extends Application {
     }
 
     public static WinBoLLActivityManager getWinBoLLActivityManager() {
-        return WinBoLLActivityManager.getInstance(_GlobalApplication);
+        return WinBoLLActivityManager.getInstance();
     }
 
     @Override

libappbase/src/main/java/cc/winboll/studio/libappbase/activities/LogonActivity.java

@@ -0,0 +1,150 @@
+package cc.winboll.studio.libappbase.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.RadioButton;
+import cc.winboll.studio.libappbase.BuildConfig;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.R;
+import cc.winboll.studio.libappbase.models.UserInfoModel;
+import cc.winboll.studio.libappbase.utils.RSAUtils;
+import cc.winboll.studio.libappbase.utils.YunUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/06/04 13:29
+ * @Describe 用户登录框
+ */
+public class LogonActivity extends Activity implements IWinBoLLActivity {
+
+    public static final String TAG = "LogonActivity";
+
+    public static final String DEBUG_HOST = "http://10.8.0.250:456";
+    public static final String YUN_HOST = "https://yun.winboll.cc";
+    
+    
+    String mHost = "";
+    RadioButton mrbYunHost;
+    RadioButton mrbDebugHost;
+    LogView mLogView;
+    
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_logon);
+        mLogView = findViewById(R.id.logview);
+        mLogView.start();
+
+        mHost = BuildConfig.DEBUG ? DEBUG_HOST: YUN_HOST;
+        if (BuildConfig.DEBUG) {
+            mrbYunHost = findViewById(R.id.rb_yunhost);
+            mrbDebugHost = findViewById(R.id.rb_debughost);
+            mrbYunHost.setChecked(!BuildConfig.DEBUG);
+            mrbDebugHost.setChecked(BuildConfig.DEBUG);
+        } else {
+            findViewById(R.id.ll_hostbar).setVisibility(View.GONE);
+        }
+    }
+    
+    public void onSwitchHost(View view) {
+        if (view.getId() == R.id.rb_yunhost) {
+            mrbDebugHost.setChecked(false);
+            mHost = YUN_HOST;
+        } else if (view.getId() == R.id.rb_debughost) {
+            mrbYunHost.setChecked(false);
+            mHost = DEBUG_HOST;
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+
+    public void onTestLogin(View view) {
+        LogUtils.d(TAG, "onTestLogin");
+        final YunUtils yunUtils = YunUtils.getInstance(this);
+        
+        UserInfoModel userInfoModel = new UserInfoModel();
+        userInfoModel.setUsername("jian");
+        userInfoModel.setPassword("kkiio");
+        userInfoModel.setToken("aaa111");
+        yunUtils.login(mHost, userInfoModel);
+    }
+
+    public void onTestRSA(View view) {
+        LogUtils.d(TAG, "onTestRSA");
+        RSAUtils utils = RSAUtils.getInstance(this);
+        
+        try {
+            // 测试 1：首次生成密钥对
+            LogUtils.d(TAG, "==== 首次生成密钥对 ====");
+            if (utils.keysExist()) {
+                LogUtils.d(TAG, "密钥对已生成");
+            } else {
+                utils.generateAndSaveKeys();
+                LogUtils.d(TAG, "密钥对生成成功。");
+            }
+
+            // 测试 2：获取密钥对（自动读取已生成的文件）
+            KeyPair keyPair = utils.getOrGenerateKeys();
+            PublicKey publicKey = keyPair.getPublic();
+            PrivateKey privateKey = keyPair.getPrivate();
+
+            // 打印密钥信息
+            LogUtils.d(TAG, "\n==== 密钥信息 ====");
+            LogUtils.d(TAG, "公钥算法：" + publicKey.getAlgorithm());
+            LogUtils.d(TAG, "公钥编码长度：" + publicKey.getEncoded().length + "字节");
+            LogUtils.d(TAG, "私钥算法：" + privateKey.getAlgorithm());
+            LogUtils.d(TAG, "私钥编码长度：" + privateKey.getEncoded().length + "字节");
+
+            // 测试 3：重复调用时检查是否复用文件
+            LogUtils.d(TAG, "\n==== 二次调用 ====");
+            KeyPair reusedPair = utils.getOrGenerateKeys();
+            LogUtils.d(TAG, "是否为同一公钥：" + (publicKey.equals(reusedPair.getPublic()))); // true（单例引用）
+            LogUtils.d(TAG, "操作完成");
+
+            String testMessage = "Hello, RSA Encryption!";
+
+            // 1. 获取或生成密钥对
+            PublicKey publicKeyReused = reusedPair.getPublic();
+            PrivateKey privateKeyReused = reusedPair.getPrivate();
+
+            // 2. 公钥加密
+            byte[] encryptedData = utils.encryptWithPublicKey(testMessage, publicKeyReused);
+            LogUtils.d(TAG, "加密后数据（字节长度）：" + encryptedData.length);
+
+            // 3. 私钥解密
+            String decryptedMessage = utils.decryptWithPrivateKey(encryptedData, privateKeyReused);
+            LogUtils.d(TAG, "解密结果: " + decryptedMessage);
+            
+            // 4. 验证解密是否成功
+            if (testMessage.equals(decryptedMessage)) {
+                LogUtils.d(TAG, "加密解密测试通过！");
+            } else {
+                LogUtils.d(TAG, "测试失败：内容不一致");
+            }
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+    
+
+}

libappbase/src/main/java/cc/winboll/studio/libappbase/activities/YunActivity.java

@@ -0,0 +1,126 @@
+package cc.winboll.studio.libappbase.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import cc.winboll.studio.libappbase.BuildConfig;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.R;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
+import java.io.IOException;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import android.widget.RadioButton;
+import cc.winboll.studio.libappbase.LogView;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/06/04 11:06
+ * @Describe 云宝云
+ */
+public class YunActivity extends Activity implements IWinBoLLActivity {
+
+    public static final String TAG = "YunActivity";
+
+    public static final String DEBUG_HOST = "http://10.8.0.250:456";
+    public static final String YUN_HOST = "https://yun.winboll.cc";
+
+    String mHost = "";
+    RadioButton mrbYunHost;
+    RadioButton mrbDebugHost;
+    LogView mLogView;
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_yun);
+        mLogView = findViewById(R.id.logview);
+        mLogView.start();
+
+        mHost = BuildConfig.DEBUG ? DEBUG_HOST: YUN_HOST;
+        if (BuildConfig.DEBUG) {
+            mrbYunHost = findViewById(R.id.rb_yunhost);
+            mrbDebugHost = findViewById(R.id.rb_debughost);
+            mrbYunHost.setChecked(!BuildConfig.DEBUG);
+            mrbDebugHost.setChecked(BuildConfig.DEBUG);
+        } else {
+            findViewById(R.id.ll_hostbar).setVisibility(View.GONE);
+        }
+    }
+
+    public void onSwitchHost(View view) {
+        if (view.getId() == R.id.rb_yunhost) {
+            mrbDebugHost.setChecked(false);
+            mHost = YUN_HOST;
+        } else if (view.getId() == R.id.rb_debughost) {
+            mrbYunHost.setChecked(false);
+            mHost = DEBUG_HOST;
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+
+    public void onTestYun(View view) {
+        LogUtils.d(TAG, "onTestYun");
+        (new Thread(new Runnable(){
+                @Override
+                public void run() {
+                    testYun();
+                }
+            })).start();
+    }
+
+    void testYun() {
+        OkHttpClient client = new OkHttpClient();
+        Request request = new Request.Builder()
+            .url(mHost + "/backups/")
+            .build();
+
+        Response response = null;
+        try {
+            response = client.newCall(request).execute();
+            if (response.isSuccessful()) {
+                String responseBody = "";
+                if (response.body() != null) {
+                    responseBody = response.body().string();
+                }
+
+                // 正则匹配：任意主机名 -> Test OK（主机名部分匹配非空字符）
+                boolean isMatch = responseBody.matches(".+? -> Test OK");
+
+                if (isMatch) {
+                    LogUtils.d(TAG, responseBody);
+                } else {
+                    LogUtils.d(TAG, "响应内容不匹配，内容：" + responseBody);
+                }
+            } else {
+                LogUtils.d(TAG, "请求失败，状态码：" + response.code());
+            }
+        } catch (IOException e) {
+            LogUtils.d(TAG, "读取响应体失败：" + e.getMessage());
+        } catch (Exception e) {
+            LogUtils.d(TAG, "异常：" + e.getMessage());
+            e.printStackTrace(); // Java 7 需显式打印堆栈
+        } finally {
+            // 手动关闭 Response（Java 7 不支持 try-with-resources）
+            if (response != null && response.body() != null) {
+                response.body().close();
+            }
+        }
+    }
+}

libappbase/src/main/java/cc/winboll/studio/libappbase/models/ResponseData.java

@@ -0,0 +1,53 @@
+package cc.winboll.studio.libappbase.models;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/06/05 11:26
+ */
+
+public class ResponseData {
+    
+    public static final String STATUS_SUCCESS = "success";
+    public static final String STATUS_ERROR = "error";
+    
+    private String status;
+    private String message;
+    private UserInfoModel data;
+    
+    public ResponseData() {
+        this.status = "";
+        this.message = "";
+        this.data = new UserInfoModel();
+    }
+    
+    public ResponseData(String status, String message, UserInfoModel data) {
+        this.status = status;
+        this.message = message;
+        this.data = data;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setData(UserInfoModel data) {
+        this.data = data;
+    }
+
+    public UserInfoModel getData() {
+        return data;
+    }
+}
+

libappbase/src/main/java/cc/winboll/studio/libappbase/models/UserInfoModel.java

@@ -0,0 +1,92 @@
+package cc.winboll.studio.libappbase.models;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/06/04 19:14
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class UserInfoModel extends BaseBean {
+
+    public static final String TAG = "UserInfoModel";
+
+    String username;
+    String password;
+    String token;
+
+    public UserInfoModel() {
+        this.username = "";
+        this.password = "";
+        this.token = "";
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    @Override
+    public String getName() {
+        return UserInfoModel.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("username").value(getUsername());
+        jsonWriter.name("password").value(getPassword());
+        jsonWriter.name("token").value(getToken());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("username")) {
+                setUsername(jsonReader.nextString());
+            } else if (name.equals("password")) {
+                setPassword(jsonReader.nextString());
+            } else if (name.equals("token")) {
+                setToken(jsonReader.nextString());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/FileUtils.java

@@ -0,0 +1,128 @@
+package cc.winboll.studio.libappbase.utils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/06/04 20:15
+ * @Describe 文件操作类
+ */
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+
+public class FileUtils {
+    public static final String TAG = "FileUtils";
+
+    /**
+     * 读取文件为字节数组（Java 7 语法）
+     */
+    public static byte[] readFileToByteArray(String filePath) {
+        FileInputStream fis = null;
+        ByteArrayOutputStream bos = null;
+        try {
+            fis = new FileInputStream(filePath);
+            bos = new ByteArrayOutputStream();
+            byte[] buffer = new byte[4096];
+            int bytesRead;
+            while ((bytesRead = fis.read(buffer)) != -1) {
+                bos.write(buffer, 0, bytesRead);
+            }
+            return bos.toByteArray();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            // 手动关闭流（Java 7 不支持 try-with-resources）
+            if (fis != null) {
+                try {
+                    fis.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (bos != null) {
+                try {
+                    bos.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 写入字节数组到文件（Java 7 语法）
+     */
+    public static boolean writeByteArrayToFile(byte[] data, String filePath) {
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(filePath);
+            fos.write(data);
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        } finally {
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    // 原字符串读写方法（适配 Java 7）
+    public static String readFileToString(String filePath) {
+        BufferedReader reader = null;
+        try {
+            reader = new BufferedReader(new FileReader(filePath));
+            StringBuilder content = new StringBuilder();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                content.append(line).append(System.getProperty("line.separator"));
+            }
+            // 去除最后一个换行符（可选）
+            if (content.length() > 0) {
+                content.deleteCharAt(content.length() - 1);
+            }
+            return content.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public static boolean writeStringToFile(String content, String filePath, boolean append) {
+        BufferedWriter writer = null;
+        try {
+            writer = new BufferedWriter(new FileWriter(filePath, append));
+            writer.write(content);
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        } finally {
+            if (writer != null) {
+                try {
+                    writer.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+}

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/RSAUtils.java

@@ -0,0 +1,222 @@
+package cc.winboll.studio.libappbase.utils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/06/04 13:36
+ * @Describe RSA加密工具
+ */
+import android.content.Context;
+import android.util.Base64;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.security.KeyFactory;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Objects;
+import javax.crypto.Cipher;
+
+public class RSAUtils {
+    private static final String TAG = "RSAUtils";
+    private static final int KEY_SIZE = 2048;
+    private static final String KEY_ALGORITHM = "RSA";
+    private static final String PUBLIC_KEY_FILE = "public.key";
+    private static final String PRIVATE_KEY_FILE = "private.key";
+    private static final String CIPHER_ALGORITHM = KEY_ALGORITHM + "/ECB/PKCS1Padding"; // 保留原加密方式
+
+    private final String keyPath;
+    private static volatile RSAUtils INSTANCE;
+
+    /**
+     * 构造方法：初始化密钥存储路径（内部存储）
+     */
+    private RSAUtils(Context context) {
+        keyPath = context.getFilesDir() + File.separator + "keys" + File.separator; // 修正路径格式
+    }
+
+    /**
+     * 获取单例实例
+     */
+    public static synchronized RSAUtils getInstance(Context context) {
+        if (INSTANCE == null) {
+            INSTANCE = new RSAUtils(context);
+        }
+        return INSTANCE;
+    }
+
+    /**
+     * 检查密钥文件是否存在
+     */
+    public boolean keysExist() {
+        File publicKeyFile = new File(keyPath + PUBLIC_KEY_FILE);
+        File privateKeyFile = new File(keyPath + PRIVATE_KEY_FILE);
+        return publicKeyFile.exists() && privateKeyFile.exists();
+    }
+
+    /**
+     * 生成密钥对并保存到文件
+     */
+    public void generateAndSaveKeys() throws Exception {
+        LogUtils.d(TAG, "开始生成 RSA 密钥对（2048位）");
+        KeyPairGenerator generator = KeyPairGenerator.getInstance(KEY_ALGORITHM);
+        generator.initialize(KEY_SIZE);
+        KeyPair keyPair = generator.generateKeyPair();
+
+        saveKey(PUBLIC_KEY_FILE, keyPair.getPublic().getEncoded());
+        saveKey(PRIVATE_KEY_FILE, keyPair.getPrivate().getEncoded());
+        LogUtils.d(TAG, "密钥对生成并保存成功");
+    }
+
+    /**
+     * 获取或生成密钥对（线程安全）
+     */
+    public KeyPair getOrGenerateKeys() throws Exception {
+        if (!keysExist()) {
+            synchronized (RSAUtils.class) { // 双重检查锁，避免多线程重复生成
+                if (!keysExist()) {
+                    generateAndSaveKeys();
+                }
+            }
+        }
+        return readKeysFromFile();
+    }
+
+    /**
+     * 从文件读取密钥对
+     */
+    private KeyPair readKeysFromFile() throws Exception {
+        LogUtils.d(TAG, "读取密钥对文件");
+        try {
+            byte[] publicKeyBytes = readFileToBytes(keyPath + PUBLIC_KEY_FILE);
+            byte[] privateKeyBytes = readFileToBytes(keyPath + PRIVATE_KEY_FILE);
+
+            X509EncodedKeySpec publicSpec = new X509EncodedKeySpec(publicKeyBytes);
+            PKCS8EncodedKeySpec privateSpec = new PKCS8EncodedKeySpec(privateKeyBytes);
+
+            KeyFactory factory = KeyFactory.getInstance(KEY_ALGORITHM);
+            PublicKey publicKey = factory.generatePublic(publicSpec);
+            PrivateKey privateKey = factory.generatePrivate(privateSpec);
+
+            return new KeyPair(publicKey, privateKey);
+        } catch (IOException | NoSuchAlgorithmException | InvalidKeySpecException e) {
+            LogUtils.e(TAG, "密钥文件读取失败：" + e.getMessage());
+            throw new Exception("密钥文件损坏或格式错误", e);
+        }
+    }
+
+    /**
+     * 保存密钥到文件（通用方法）
+     */
+    private void saveKey(String fileName, byte[] keyBytes) throws IOException {
+        Objects.requireNonNull(keyBytes, "密钥字节数据不可为空");
+        File dir = new File(keyPath);
+        if (!dir.exists() && !dir.mkdirs()) {
+            throw new IOException("创建密钥目录失败：" + keyPath);
+        }
+
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(keyPath + fileName);
+            fos.write(keyBytes);
+        } finally {
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch (IOException e) {
+                    LogUtils.e(TAG, "关闭文件流失败：" + e.getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * 读取文件为字节数组（Java 7 兼容）
+     */
+    private byte[] readFileToBytes(String filePath) throws IOException {
+        File file = new File(filePath);
+        if (!file.exists() || file.isDirectory()) {
+            throw new IOException("文件不存在或为目录：" + filePath);
+        }
+
+        FileInputStream fis = null;
+        try {
+            fis = new FileInputStream(file);
+            byte[] data = new byte[(int) file.length()];
+            int bytesRead = fis.read(data);
+            if (bytesRead != data.length) {
+                throw new IOException("文件读取不完整");
+            }
+            return data;
+        } finally {
+            if (fis != null) {
+                try {
+                    fis.close();
+                } catch (IOException e) {
+                    LogUtils.e(TAG, "关闭文件流失败：" + e.getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * 公钥加密（带参数校验）
+     */
+    public byte[] encryptWithPublicKey(String plainText, PublicKey publicKey) throws Exception {
+        Objects.requireNonNull(plainText, "明文不可为空");
+        Objects.requireNonNull(publicKey, "公钥不可为空");
+
+        Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+        cipher.init(Cipher.ENCRYPT_MODE, publicKey);
+
+        // 检查数据长度是否超过 RSA 限制（2048位密钥最大明文为 214字节，PKCS1Padding）
+        int maxPlainTextSize = cipher.getBlockSize() - 11; // PKCS1Padding 固定填充长度
+        if (plainText.getBytes("UTF-8").length > maxPlainTextSize) {
+            throw new IllegalArgumentException("明文过长，最大支持 " + maxPlainTextSize + " 字节");
+        }
+
+        return cipher.doFinal(plainText.getBytes("UTF-8"));
+    }
+
+    /**
+     * 私钥解密（带参数校验）
+     */
+    public String decryptWithPrivateKey(byte[] encryptedData, PrivateKey privateKey) throws Exception {
+        Objects.requireNonNull(encryptedData, "密文不可为空");
+        Objects.requireNonNull(privateKey, "私钥不可为空");
+
+        Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+        cipher.init(Cipher.DECRYPT_MODE, privateKey);
+        byte[] decryptedBytes = cipher.doFinal(encryptedData);
+        return new String(decryptedBytes, "UTF-8");
+    }
+    /**
+     * 将 HTTP 传输的 Base64 字符串还原为加密字节数组（Java 7 兼容）
+     * @param httpString Base64 字符串（非 null）
+     * @return 加密字节数组
+     * @throws IllegalArgumentException 解码失败时抛出
+     */
+    public byte[] httpStringToEncryptBytes(String httpString) {
+        Objects.requireNonNull(httpString, "HTTP 字符串不可为空");
+
+        // 计算缺失的填充符数量（Java 7 不支持 repeat()，手动拼接）
+        int pad = httpString.length() % 4;
+        StringBuilder paddedString = new StringBuilder(httpString);
+        if (pad != 0) {
+            for (int i = 0; i < pad; i++) {
+                paddedString.append('='); // 补全 '='
+            }
+        }
+
+        // 使用 Base64 解码（Android 原生 Base64 类兼容 Java 7）
+        return Base64.decode(paddedString.toString(), Base64.URL_SAFE);
+    }
+}
+

libappbase/src/main/java/cc/winboll/studio/libappbase/utils/YunUtils.java

@@ -0,0 +1,281 @@
+package cc.winboll.studio.libappbase.utils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@188.com>
+ * @Date 2025/06/04 17:21
+ * @Describe 应用登录与接口工具
+ */
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.models.ResponseData;
+import cc.winboll.studio.libappbase.models.UserInfoModel;
+import com.google.gson.Gson;
+import java.io.File;
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.util.concurrent.TimeUnit;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import java.io.UnsupportedEncodingException;
+
+public class YunUtils {
+    public static final String TAG = "YunUtils";
+    // 私有静态实例，类加载时创建
+    private static volatile YunUtils INSTANCE;
+    Context mContext;
+    UserInfoModel mUserInfoModel;
+    String token = "";
+    String mDataFolderPath = "";
+    String mUserInfoModelPath = "";
+
+    private static final int CONNECT_TIMEOUT = 15; // 连接超时时间（秒）
+    private static final int READ_TIMEOUT = 20;    // 读取超时时间（秒）
+    private static volatile YunUtils instance;
+    private OkHttpClient okHttpClient;
+    private Handler mainHandler; // 主线程 Handler
+
+    // 私有构造方法，防止外部实例化
+    private YunUtils(Context context) {
+        LogUtils.d(TAG, "YunUtils");
+        mContext = context;
+        mDataFolderPath = mContext.getExternalFilesDir(TAG).toString();
+        File fTest = new File(mDataFolderPath);
+        if (!fTest.exists()) {
+            fTest.mkdirs();
+        }
+        mUserInfoModelPath = mDataFolderPath + File.separator + "UserInfoModel.rsajson";
+
+        okHttpClient = new OkHttpClient.Builder()
+            .connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
+            .readTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
+            .build();
+        mainHandler = new Handler(Looper.getMainLooper()); // 获取主线程 Looper
+    }
+
+    // 公共静态方法，返回唯一实例
+    public static synchronized YunUtils getInstance(Context context) {
+        LogUtils.d(TAG, "getInstance");
+        if (INSTANCE == null) {
+            INSTANCE = new YunUtils(context);
+        }
+        return INSTANCE;
+    }
+
+    public void checkLoginStatus() {
+        String token = getLocalToken();
+        LogUtils.d(TAG, String.format("checkLoginStatus token is %s", token));
+    }
+
+    String getLocalToken() {
+        UserInfoModel userInfoModel = loadUserInfoModel();
+        return (userInfoModel == null) ?"": userInfoModel.getToken();
+    }
+
+    public void login(String host, UserInfoModel userInfoModel) {
+        LogUtils.d(TAG, "login");
+
+        // 发送 POST 请求
+        String apiUrl = host + "/login/index.php";
+        // 序列化对象为JSON
+        Gson gson = new Gson();
+        String jsonData = gson.toJson(userInfoModel); // 自动生成标准JSON
+        //String jsonData = userInfoModel.toString();
+        LogUtils.d(TAG, "要发送的数据 : " + jsonData);
+
+        sendPostRequest(apiUrl, jsonData, new OnResponseListener() {
+                // 成功回调（主线程）
+                @Override
+                public void onSuccess(String responseBody) {
+                    LogUtils.d(TAG, "onSuccess");
+                    LogUtils.d(TAG, String.format("responseBody %s", responseBody));
+                    Gson gson = new Gson();
+                    ResponseData result = gson.fromJson(responseBody, ResponseData.class); // 转为 Result 实例
+                    if(result.getStatus().equals(ResponseData.STATUS_SUCCESS)) {
+                        
+                            UserInfoModel userInfoModel = result.getData();
+                            if (userInfoModel != null) {
+                                LogUtils.d(TAG, "收到网站 UserInfoModel");
+                                String token = userInfoModel.getToken();
+                                saveLocalToken(token);
+                                checkLoginStatus();
+                            }
+                       
+                    } else if(result.getStatus().equals(ResponseData.STATUS_ERROR)) {
+                        try {
+                            String decodedMessage = URLDecoder.decode(result.getMessage(), "UTF-8");
+                            LogUtils.d(TAG, "服务器返回信息: " + decodedMessage);
+                        } catch (UnsupportedEncodingException e) {
+                            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                        }
+                    }
+                }
+
+                // 失败回调（主线程）
+                @Override
+                public void onFailure(String errorMsg) {
+                    LogUtils.d(TAG, errorMsg);
+                    // 处理错误
+                }
+            });
+    }
+
+    public void saveLocalToken(String token) {
+        UserInfoModel userInfoModel = new UserInfoModel();
+        userInfoModel.setToken(token);
+        saveUserInfoModel(userInfoModel);
+    }
+
+    UserInfoModel loadUserInfoModel() {
+        LogUtils.d(TAG, "loadUserInfoModel");
+        if (new File(mUserInfoModelPath).exists()) {
+            try {
+                // 加载加密后的模型数据
+                byte[] encryptedData = FileUtils.readFileToByteArray(mUserInfoModelPath);
+                // 加载 RSA 工具
+                RSAUtils utils = RSAUtils.getInstance(mContext);
+                KeyPair keyPair = utils.getOrGenerateKeys();
+                //PublicKey publicKey = keyPair.getPublic();
+                PrivateKey privateKey = keyPair.getPrivate();
+                // 私钥解密模型数据
+                String szInfo = utils.decryptWithPrivateKey(encryptedData, keyPair.getPrivate());
+                LogUtils.d(TAG, String.format("szInfo %s", szInfo));
+                mUserInfoModel = UserInfoModel.parseStringToBean(szInfo, UserInfoModel.class);
+                if (mUserInfoModel == null) {
+                    LogUtils.d(TAG, "模型数据解析为空数据。");
+                }
+                LogUtils.d(TAG, "UserInfoModel 解密加载结束。");
+            } catch (Exception e) {
+                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            }
+        } else {
+            LogUtils.d(TAG, "云服务登录信息不存在。");
+            mUserInfoModel = null;
+        }
+        return mUserInfoModel;
+    }
+
+    void saveUserInfoModel(UserInfoModel userInfoModel) {
+        LogUtils.d(TAG, "saveUserInfoModel");
+        try {
+            String szInfo = userInfoModel.toString();
+            LogUtils.d(TAG, "原始数据: " + szInfo);
+
+            RSAUtils utils = RSAUtils.getInstance(mContext);
+            KeyPair keyPair = utils.getOrGenerateKeys();
+            PublicKey publicKey = keyPair.getPublic();
+
+            // 公钥加密（传入字节数组，避免中间字符串转换）
+            byte[] encryptedData = utils.encryptWithPublicKey(szInfo, publicKey);
+
+            // 保存加密字节数组到文件（直接操作字节，无需转字符串）
+            FileUtils.writeByteArrayToFile(encryptedData, mUserInfoModelPath);
+            LogUtils.d(TAG, "加密数据已保存");
+
+            // 测试解密（仅调试用）
+            String szInfo2 = utils.decryptWithPrivateKey(encryptedData, keyPair.getPrivate());
+            LogUtils.d(TAG, "解密结果: " + szInfo2);
+
+            mUserInfoModel = UserInfoModel.parseStringToBean(szInfo2, UserInfoModel.class);
+            if (mUserInfoModel == null) {
+                LogUtils.d(TAG, "模型解析失败");
+            }
+        } catch (Exception e) {
+            LogUtils.d(TAG, "加密/解密失败: " + e.getMessage());
+        }
+    }
+
+    // 发送 POST 请求（JSON 数据）
+    public void sendPostRequest(String url, String data, OnResponseListener listener) {
+        RequestBody requestBody = RequestBody.create(
+            MediaType.parse("application/json; charset=utf-8"), // 关键头信息
+            data.getBytes(StandardCharsets.UTF_8)
+        );
+
+        Request request = new Request.Builder()
+            .url(url)
+            .post(requestBody)
+            .addHeader("Content-Type", "application/json") // 显式添加头
+            .build();
+
+        executeRequest(request, listener);
+    }
+
+    // 发送 GET 请求
+    public void sendGetRequest(String url, OnResponseListener listener) {
+        Request request = new Request.Builder()
+            .url(url)
+            .get()
+            .build();
+        executeRequest(request, listener);
+    }
+
+    // 执行请求（子线程处理）
+    private void executeRequest(final Request request, final OnResponseListener listener) {
+        okHttpClient.newCall(request).enqueue(new Callback() {
+                // 响应成功（子线程）
+                @Override
+                public void onResponse(Call call, Response response) throws IOException {
+                    try {
+                        if (!response.isSuccessful()) {
+                            postFailure(listener, "响应码错误：" + response.code());
+                            return;
+                        }
+                        String responseBody = response.body().string();
+                        postSuccess(listener, responseBody);
+                    } catch (Exception e) {
+                        postFailure(listener, "解析失败：" + e.getMessage());
+                    }
+                }
+
+                // 响应失败（子线程）
+                @Override
+                public void onFailure(Call call, IOException e) {
+                    postFailure(listener, "网络失败：" + e.getMessage());
+                }
+
+                // 主线程回调（使用 Handler）
+                private void postSuccess(final OnResponseListener listener, final String msg) {
+                    mainHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                listener.onSuccess(msg);
+                            }
+                        });
+                }
+
+                private void postFailure(final OnResponseListener listener, final String msg) {
+                    mainHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                listener.onFailure(msg);
+                            }
+                        });
+                }
+            });
+    }
+
+    public interface OnResponseListener {
+        /**
+         * 成功响应（主线程回调）
+         * @param responseBody 响应体字符串
+         */
+        void onSuccess(String responseBody);
+
+        /**
+         * 失败回调（包含错误信息）
+         * @param errorMsg 错误描述
+         */
+        void onFailure(String errorMsg);
+    }
+}

libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java

@@ -22,7 +22,9 @@ import java.util.Map;
 
 public class WinBoLLActivityManager {
 
-    public static final String TAG = "IWinBoLLActivityManager";
+    public static final String TAG = "WinBoLLActivityManager";
+
+    public static final String EXTRA_TAG = "EXTRA_TAG";
 
 
     public enum WinBoLLUI_TYPE { Aplication, Service }
@@ -39,14 +41,14 @@ public class WinBoLLActivityManager {
     public static WinBoLLUI_TYPE getWinBoLLUI_TYPE() {
         return _WinBoLLUI_TYPE;
     }
-    WinBoLLActivityManager(Context context) {
-        mContext = context;
+    WinBoLLActivityManager() {
+        mContext = GlobalApplication.getInstance();
         mActivityListMap = new HashMap<String, IWinBoLLActivity>();
     }
 
-    public static synchronized WinBoLLActivityManager getInstance(Context context) {
+    public static synchronized WinBoLLActivityManager getInstance() {
         if (_mIWinBoLLActivityManager == null) {
-            _mIWinBoLLActivityManager = new WinBoLLActivityManager(context);
+            _mIWinBoLLActivityManager = new WinBoLLActivityManager();
         }
         return _mIWinBoLLActivityManager;
     }
@@ -55,7 +57,7 @@ public class WinBoLLActivityManager {
      * 把Activity添加到管理中
      */
     public <T extends IWinBoLLActivity> void add(T activity) {
-        if (isActive(activity.getTag())) {
+        if (isActivityActive(activity.getTag())) {
             LogUtils.d(TAG, String.format("add(...) %s is active.", activity.getTag()));
         } else {
             mActivityListMap.put(activity.getTag(), activity);
@@ -70,106 +72,107 @@ public class WinBoLLActivityManager {
     // intent.putExtra 函数 "tag" 参数为 activity.getTag()
     //
     public <T extends IWinBoLLActivity> void startWinBoLLActivity(Context context, Class<T> clazz) {
-        try {
-            // 如果窗口已存在就重启窗口
-            String tag = clazz.newInstance().getTag();
-            if (isActive(tag)) {
-                resumeActivity(context, tag);
-                return;
-            }
-
+        // 如果窗口已存在就重启窗口
+        if (!resumeActivity(clazz)) {
             // 新建一个任务窗口
             Intent intent = new Intent(context, clazz);
             //打开多任务窗口 flags
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
             intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-            intent.putExtra("tag", tag);
-            mContext.startActivity(intent);
-        } catch (InstantiationException | IllegalAccessException e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            //intent.putExtra("tag", tag);
+            context.startActivity(intent);
         }
     }
 
     public <T extends IWinBoLLActivity> void startWinBoLLActivity(Context context, Intent intent, Class<T> clazz) {
-        try {
-            // 如果窗口已存在就重启窗口
-            String tag = clazz.newInstance().getTag();
-            if (isActive(tag)) {
-                resumeActivity(context, tag);
-                return;
-            }
-
+        // 如果窗口已存在就重启窗口
+        if (!resumeActivity(clazz)) {
             // 新建一个任务窗口
             //Intent intent = new Intent(context, clazz);
             //打开多任务窗口 flags
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
             intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-            intent.putExtra("tag", tag);
-            mContext.startActivity(intent);
+            //intent.putExtra("tag", tag);
+            context.startActivity(intent);
+        }
+    }
+
+    public <T extends IWinBoLLActivity> void startLogActivity(Context context) {
+        // 如果窗口已存在就重启窗口
+        //if (!resumeActivity(LogActivity.class)) {
+        // 新建一个任务窗口
+        Intent intent = new Intent(context, LogActivity.class);
+        //打开多任务窗口 flags
+        // Define the bounds.
+//        Rect bounds = new Rect(0, 0, 800, 200);
+//        // Set the bounds as an activity option.
+//        ActivityOptions options = ActivityOptions.makeBasic();
+//        options.setLaunchBounds(bounds);
+        intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+
+        //intent.putExtra(EXTRA_TAG, tag);
+
+        //context.startActivity(intent, options.toBundle());
+        context.startActivity(intent);
+        //}
+    }
+
+    //
+    // 判断 tag 绑定的 Activity 是否已经创建
+    //
+    public boolean isActivityActive(String tag) {
+        return mActivityListMap.get(tag) != null;
+    }
+
+    Activity getActivityByTag(String tag) {
+        return (mActivityListMap.get(tag) == null) ?null: mActivityListMap.get(tag).getActivity();
+    }
+
+
+    //
+    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
+    //
+    public <T extends IWinBoLLActivity> boolean resumeActivity(Class<T> clazz) {
+        try {
+            Activity activity = getActivityByTag(clazz.newInstance().getTag());
+            if (activity != null) {
+                return resumeActivity(activity);
+            }
         } catch (InstantiationException | IllegalAccessException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
+        return false;
     }
 
-    /**
-     * 判断 tag绑定的 MyActivity是否存在
-     */
-    public boolean isActive(String tag) {
-        //printAvtivityListInfo();
-        IWinBoLLActivity iWinBoLLActivity = getIWinBoLLActivity(tag);
-        if (iWinBoLLActivity != null) {
-            Activity activity = iWinBoLLActivity.getActivity();
-            if (activity != null) {
-                LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
-                //ToastUtils.show("activity != null tag " + tag);
-                //判断是否为 BaseActivity,如果已经销毁，则移除
-                if (activity.isFinishing() || activity.isDestroyed()) {
-                    mActivityListMap.remove(iWinBoLLActivity.getTag());
-                    //_mIWinBoLLActivityList.remove(activity);
-                    LogUtils.d(TAG, String.format("isActive(...) remove activity.\ntag : %s", tag));
-                    return false;
-                } else {
-                    LogUtils.d(TAG, String.format("isActive(...) activity is exist.\ntag : %s", tag));
-                    return true;
-                }
-            }
+    //
+    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
+    //
+    public <T extends IWinBoLLActivity> boolean resumeActivity(String tag) {
+        Activity activity = getActivityByTag(tag);
+        if (activity != null) {
+            return resumeActivity(activity);
         }
         return false;
-
     }
 
-    IWinBoLLActivity getIWinBoLLActivity(String tag) {
-        return mActivityListMap.get(tag);
-    }
-
-    /**
-     * 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-     */
-    public <T extends IWinBoLLActivity> void resumeActivity(Context context, String tag) {
-        LogUtils.d(TAG, "resumeActivty");
-        T iWinBoLLActivity = (T)getIWinBoLLActivity(tag);
-        LogUtils.d(TAG, "activity " + iWinBoLLActivity.getTag());
-        if (iWinBoLLActivity != null && iWinBoLLActivity.getActivity() != null && !iWinBoLLActivity.getActivity().isFinishing() && !iWinBoLLActivity.getActivity().isDestroyed()) {
-            resumeActivity(context, iWinBoLLActivity);
-        }
-    }
-
-    /**
-     * 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-     */
-    public <T extends IWinBoLLActivity> void resumeActivity(Context context, T activity) {
-        ActivityManager am = (ActivityManager) activity.getActivity().getSystemService(Context.ACTIVITY_SERVICE);
+    //
+    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
+    //
+    public <T extends IWinBoLLActivity> boolean resumeActivity(Activity activity) {
+        ActivityManager am = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
         //返回启动它的根任务（home 或者 MainActivity）
-        Intent intent = new Intent(context, activity.getClass());
-        TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
-        stackBuilder.addNextIntentWithParentStack(intent);
-        stackBuilder.startActivities();
-        //moveTaskToFront(YourTaskId, 0);
-        LogUtils.d(TAG, "am.moveTaskToFront");
-        //ToastUtils.show("resumeActivity am.moveTaskToFront");
-        am.moveTaskToFront(activity.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
+        //Intent intent = new Intent(mContext, activity.getClass());
+        //TaskStackBuilder stackBuilder = TaskStackBuilder.create(mContext);
+        //stackBuilder.addNextIntentWithParentStack(intent);
+        //stackBuilder.startActivities();
+        am.moveTaskToFront(activity.getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
+        //ToastUtils.show("resumeActivity");
+        return true;
     }
 
 
@@ -221,10 +224,10 @@ public class WinBoLLActivityManager {
                 // ★：0 1 2 [3] 4 >> 2
                 // ★：0 1 2 3 [4] >> 3
                 // ★：[0] >> 直接关闭当前窗口
-                IWinBoLLActivity preActivity = getPreActivity(iWinBoLLActivity);
+                Activity preActivity = getPreActivity(iWinBoLLActivity);
                 iWinBoLLActivity.getActivity().finish();
                 if (preActivity != null) {
-                    resumeActivity(mContext, preActivity);
+                    resumeActivity(preActivity);
                 }
             }
 
@@ -233,7 +236,7 @@ public class WinBoLLActivityManager {
         }
     }
 
-    IWinBoLLActivity getPreActivity(IWinBoLLActivity iWinBoLLActivity) {
+    Activity getPreActivity(IWinBoLLActivity iWinBoLLActivity) {
         try {
             boolean bingo = false;
             IWinBoLLActivity preIWinBoLLActivity = null;
@@ -247,7 +250,7 @@ public class WinBoLLActivityManager {
             }
 
             if (bingo) {
-                return preIWinBoLLActivity;
+                return preIWinBoLLActivity.getActivity();
             }
         } catch (Exception e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());

libappbase/src/main/res/layout/activity_logon.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:gravity="right"
+        android:padding="10dp"
+        android:id="@+id/ll_hostbar">
+
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="10.8.0.250:456"
+            android:id="@+id/rb_debughost"
+            android:onClick="onSwitchHost"/>
+
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="yun.winboll.cc"
+            android:id="@+id/rb_yunhost"
+            android:onClick="onSwitchHost"/>
+
+	</LinearLayout>
+    
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="right">
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Test RSA"
+            android:onClick="onTestRSA"/>
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Test Login"
+            android:onClick="onTestLogin"/>
+        
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<cc.winboll.studio.libappbase.LogView
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/logview"/>
+
+	</LinearLayout>
+
+</LinearLayout>
+

libappbase/src/main/res/layout/activity_yun.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="right"
+		android:gravity="right"
+		android:padding="10dp"
+		android:id="@+id/ll_hostbar">
+
+		<RadioButton
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="10.8.0.250:456"
+			android:id="@+id/rb_debughost"
+			android:onClick="onSwitchHost"/>
+
+		<RadioButton
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="yun.winboll.cc"
+			android:id="@+id/rb_yunhost"
+			android:onClick="onSwitchHost"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="right"
+		android:gravity="right">
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="TestYun"
+			android:onClick="onTestYun"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<cc.winboll.studio.libappbase.LogView
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/logview"/>
+
+	</LinearLayout>
+
+</LinearLayout>
+

libappbase/src/main/res/menu/toolbar_appbase.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/item_minimal"
-        android:title="MINIMAL"
-        android:icon="@drawable/ic_winboll_point"/>
-    <item
-        android:id="@+id/item_about"
-        android:title="ABOUT"
-        android:icon="@drawable/ic_winboll_logo"/>
-    <item
-        android:id="@+id/item_help"
-        android:title="HELP"
-        android:icon="@drawable/ic_winboll_help"/>
-
-    <item
-        android:id="@+id/item_log"
-        android:title="LOG"
-        android:icon="@drawable/ic_winboll_log"/>
-</menu>

libapputils/build.gradle

@@ -21,7 +21,7 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libappbase:15.8.0'
+    api 'cc.winboll.studio:libappbase:15.9.5'
     
     // 二维码类库
     api 'com.google.zxing:core:3.4.1'

libapputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 13 11:17:53 HKT 2025
-stageCount=2
+#Sun Aug 31 04:53:04 CST 2025
+stageCount=6
 libraryProject=libapputils
 baseVersion=15.8
-publishVersion=15.8.1
+publishVersion=15.8.5
 buildCount=0
-baseBetaVersion=15.8.2
+baseBetaVersion=15.8.6

libjc/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Jan 10 22:03:57 GMT 2025
+#Tue Jun 24 11:17:30 GMT 2025
 stageCount=0
 libraryProject=libjc
 baseVersion=1.0
 publishVersion=1.0.0
-buildCount=133
+buildCount=135
 baseBetaVersion=1.0.1

libjc/src/main/java/cc/winboll/studio/libjc/Main.java

@@ -21,7 +21,7 @@ public class Main {
     public final static int JAR_RUNNING_MODE_JCNDK_DEBUG = 4;
     public final static int JAR_RUNNING_MODE_JC = 5;
     public final static int JAR_RUNNING_MODE_JC_DEBUG = 6;
-    public enum JAR_RUNNING_MODE {
+    public static enum JAR_RUNNING_MODE {
         UNKNOWN(JAR_RUNNING_MODE_UNKNOWN),
         CONSOLE(JAR_RUNNING_MODE_CONSOLE),
         CONSOLE_DEBUG(JAR_RUNNING_MODE_CONSOLE_DEBUG),

mymessagemanager/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.2" 
+        versionName "15.3" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -45,15 +45,17 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libaes:15.8.0'
-    api 'cc.winboll.studio:libapputils:15.8.1'
-    api 'cc.winboll.studio:libappbase:15.8.1'
+    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 'io.github.medyo:android-about-page:2.0.0'
     api 'com.github.getActivity:ToastUtils:10.5'
     api 'com.jcraft:jsch:0.1.55'
     api 'org.jsoup:jsoup:1.13.1'
     api 'com.squareup.okhttp3:okhttp:4.4.1'
+	
+	api 'com.belerweb:pinyin4j:2.5.1'
     
     // 权限请求框架：https://github.com/getActivity/XXPermissions
     api 'com.github.getActivity:XXPermissions:18.63'

mymessagemanager/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue May 20 20:39:06 HKT 2025
-stageCount=6
+#Sun Aug 31 06:13:45 CST 2025
+stageCount=7
 libraryProject=
-baseVersion=15.2
-publishVersion=15.2.5
+baseVersion=15.3
+publishVersion=15.3.6
 buildCount=0
-baseBetaVersion=15.2.6
+baseBetaVersion=15.3.7

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java

@@ -17,7 +17,7 @@ import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import cc.winboll.studio.mymessagemanager.App;
 import cc.winboll.studio.mymessagemanager.R;
 
-public class AboutActivity extends WinBollActivity implements IWinBoLLActivity {
+public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
 
     public static final String TAG = "AboutActivity";
 
@@ -79,11 +79,11 @@ public class AboutActivity extends WinBollActivity implements IWinBoLLActivity {
         appInfo.setAppName(getString(R.string.app_name));
         appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
         appInfo.setAppDescription(getString(R.string.app_description));
-        appInfo.setAppGitName("APP");
+        appInfo.setAppGitName("APPBase");
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(szBranchName);
         appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=MyMessageManager");
+        appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=5&extra=page%3D1");
         appInfo.setAppAPKName("MyMessageManager");
         appInfo.setAppAPKFolderName("MyMessageManager");
         return new AboutView(mContext, appInfo);

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/BaseActivity.java

@@ -103,6 +103,9 @@ abstract public class BaseActivity extends AppCompatActivity {
         } else if (R.id.item_defaulttheme == item.getItemId()) {
             AESThemeUtil.saveThemeStyleID(this, R.style.MyAppTheme);
             recreate();
+        } else if (R.id.item_defaulttheme == item.getItemId()) {
+            AESThemeUtil.saveThemeStyleID(this, R.style.MyAppTheme);
+            recreate();
         }
         //ToastUtils.show("nThemeStyleID " + Integer.toString(nThemeStyleID));
 

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/ComposeSMSActivity.java

@@ -1,5 +1,10 @@
 package cc.winboll.studio.mymessagemanager.activitys;
 
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@188.com>
+ * @Date 2025/08/30 14:32
+ * @Describe 联系人查询与短信发送窗口
+ */
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -11,13 +16,17 @@ import android.widget.RelativeLayout;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 import android.widget.Toolbar;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+
 import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 import cc.winboll.studio.mymessagemanager.R;
-import cc.winboll.studio.mymessagemanager.activitys.ComposeSMSActivity;
 import cc.winboll.studio.mymessagemanager.beans.PhoneBean;
 import cc.winboll.studio.mymessagemanager.utils.PhoneUtil;
 import cc.winboll.studio.mymessagemanager.utils.SMSUtil;
 import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -26,166 +35,282 @@ import java.util.Map;
 public class ComposeSMSActivity extends BaseActivity {
 
     public static String TAG = "ComposeSMSActivity";
-
     public static String EXTRA_SMSBODY = "sms_body";
+    private static final String MAP_NAME = "NAME";
+    private static final String MAP_PHONE = "PHONE";
 
-    static String MAP_NAME = "NAME";
-    static String MAP_PHONE = "PHONE";
-
-    String mszSMSBody;
-    String mszScheme;
-    String mszPhoneTo;
-    EditText metTO;
-    EditText metSMSBody;
-    SimpleAdapter mSimpleAdapter;
-    List<Map<String,Object>> mAdapterData = new ArrayList<>();
-    ListView mlvContracts;
-    List<PhoneBean> mListPhoneBeanContracts;
-    Toolbar mToolbar;
-    AOHPCTCSeekBar mAOHPCTCSeekBar;
-    RelativeLayout mrlContracts;
+    private String mszSMSBody;
+    private String mszScheme;
+    private String mszPhoneTo;
+    private TextView mtvTOName;
+    private EditText metTONameSearch;
+    private EditText metTO;
+    private EditText metSMSBody;
+    private SimpleAdapter mSimpleAdapter;
+    private List<Map<String, Object>> mAdapterData = new ArrayList<Map<String, Object>>();
+    private ListView mlvContracts;
+    private List<PhoneBean> mListPhoneBeanContracts;
+    private Toolbar mToolbar;
+    private AOHPCTCSeekBar mAOHPCTCSeekBar;
+    private RelativeLayout mrlContracts;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_composesms);
-        mszSMSBody = getIntent().getStringExtra(EXTRA_SMSBODY);
-        mszScheme = getIntent().getData().getScheme();
-        mszPhoneTo = getIntent().getData().getSchemeSpecificPart();
-        if (!mszScheme.equals("smsto")) {
-            // 其他方式未支持就退出
-            finish();
+
+        // 初始化Intent数据（增加空判断，避免NullPointerException）
+        Intent intent = getIntent();
+        if (intent != null) {
+            mszSMSBody = intent.getStringExtra(EXTRA_SMSBODY);
+            if (intent.getData() != null) {
+                mszScheme = intent.getData().getScheme();
+                mszPhoneTo = intent.getData().getSchemeSpecificPart();
+            }
         }
-        // 初始化视图
+
+        // 校验启动方式，非smsto则退出
+        if (mszScheme == null || !"smsto".equals(mszScheme)) {
+            ToastUtils.show("不支持的启动方式");
+            finish();
+            return;
+        }
+
         initView();
-        // 设置适配器
-        initAdapter();
-        // 设置搜索到的匹配位置
-        setListViewPrePosition();
+        initAdapter(null); // 初始加载所有联系人
+        setListViewPrePositionByPhone();
     }
 
-    //
-    // 初始化视图
-    //
-    void initView() {
-        //Drawable drawableFrame = AppCompatResources.getDrawable(this, R.drawable.bg_frame);
-
+    private void initView() {
         // 初始化标题栏
-        mToolbar = findViewById(R.id.activitycomposesmsASupportToolbar1);
+        mToolbar = (Toolbar) findViewById(R.id.activitycomposesmsASupportToolbar1);
         mToolbar.setSubtitle(getString(R.string.activity_name_composesms));
         setActionBar(mToolbar);
 
-        // 初始化联系人栏目框
-        mrlContracts = findViewById(R.id.activitycomposesmsRelativeLayout1);
-        //mrlContracts.setBackground(drawableFrame);
+        // 初始化联系人姓名显示和搜索栏
+        mtvTOName = (TextView) findViewById(R.id.activitycomposesmsTextView2);
+        mrlContracts = (RelativeLayout) findViewById(R.id.activitycomposesmsRelativeLayout1);
+        metTONameSearch = (EditText) findViewById(R.id.activitycomposesmsEditText2);
 
-        // 初始化联系人列表
-        mlvContracts = findViewById(R.id.activitycomposesmsListView1);
+        // 姓名搜索框文本变化监听
+        metTONameSearch.addTextChangedListener(new TextWatcher() {
+				@Override
+				public void onTextChanged(CharSequence s, int start, int before, int count) {
+					metTO.setText(""); // 清空号码输入框，避免冲突
+					String input = s == null ? "" : s.toString().trim();
+					if (input.isEmpty()) {
+						initAdapter(null); // 空搜索时显示所有联系人
+					} else {
+						setListViewPrePositionByName(); // 按姓名搜索
+					}
+				}
 
-        // 初始化联系人输入框
-        metTO = findViewById(R.id.activitycomposesmsEditText1);
-        metTO.setText(mszPhoneTo);
-        metTO.addTextChangedListener(new TextWatcher() {           
-                @Override  
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                    setListViewPrePosition();
-                }
-                @Override  
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                }
+				@Override
+				public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+					// 无操作
+				}
 
-                @Override  
-                public void afterTextChanged(Editable s) {
-                }
-            });
-
-        // 初始化发送拉动控件
-        mAOHPCTCSeekBar = findViewById(R.id.viewsmssendpart1AOHPCTCSeekBar1);
-        mAOHPCTCSeekBar.setThumb(getDrawable(R.drawable.ic_message));
-        mAOHPCTCSeekBar.setThumbOffset(20);
-        mAOHPCTCSeekBar.setOnOHPCListener(new AOHPCTCSeekBar.OnOHPCListener() {
-                @Override
-                public void onOHPCommit() {
-                    // 空号码不发送
-                    mszPhoneTo = metTO.getText().toString();
-                    if (mszPhoneTo.trim().equals("")) {
-                        ToastUtils.show("没有设置接收号码。");
-                        return;
-                    }
-                    // 空消息不发送
-                    mszSMSBody = metSMSBody.getText().toString();
-                    if (mszSMSBody.equals("")) {
-                        ToastUtils.show("没有消息内容可发送。");
-                        return;
-                    }
-                    // 发送消息
-                    if (SMSUtil.sendMessageByInterface2(ComposeSMSActivity.this, mszPhoneTo, mszSMSBody)) {
-                        ComposeSMSActivity.this.finish();
-                    }
-                }
+				@Override
+				public void afterTextChanged(Editable s) {
+					// 无操作
+				}
 			});
 
-        // 初始化提示框
-        TextView tvAOHPCTCSeekBarMSG = findViewById(R.id.viewsmssendpart1TextView1);
+        // 初始化联系人列表
+        mlvContracts = (ListView) findViewById(R.id.activitycomposesmsListView1);
+
+        // 初始化号码输入框（核心：优化文本变化监听逻辑）
+        metTO = (EditText) findViewById(R.id.activitycomposesmsEditText1);
+        if (mszPhoneTo != null) {
+            metTO.setText(mszPhoneTo);
+        }
+        metTO.addTextChangedListener(new TextWatcher() {
+				@Override
+				public void onTextChanged(CharSequence s, int start, int before, int count) {
+					mtvTOName.setText(""); // 清空姓名显示
+					String inputPhone = s == null ? "" : s.toString().trim();
+
+					if (inputPhone.isEmpty()) {
+						// 输入为空时，显示所有联系人
+						initAdapter(null);
+					} else {
+						// 输入非空时，按号码搜索并更新列表（无结果则清空）
+						filterListByPhone(inputPhone);
+					}
+				}
+
+				@Override
+				public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+					// 无操作
+				}
+
+				@Override
+				public void afterTextChanged(Editable s) {
+					// 无操作
+				}
+			});
+
+        // 初始化发送控件
+        mAOHPCTCSeekBar = (AOHPCTCSeekBar) findViewById(R.id.viewsmssendpart1AOHPCTCSeekBar1);
+        Drawable thumbDrawable = getResources().getDrawable(R.drawable.ic_message); // Java 7兼容写法
+        mAOHPCTCSeekBar.setThumb(thumbDrawable);
+        mAOHPCTCSeekBar.setThumbOffset(20);
+        mAOHPCTCSeekBar.setOnOHPCListener(new AOHPCTCSeekBar.OnOHPCListener() {
+				@Override
+				public void onOHPCommit() {
+					sendSMS();
+				}
+			});
+
+        // 初始化短信内容输入框
+        TextView tvAOHPCTCSeekBarMSG = (TextView) findViewById(R.id.viewsmssendpart1TextView1);
         tvAOHPCTCSeekBarMSG.setText(R.string.msg_100sendmsg);
-
-        // 初始化发送消息框
-        metSMSBody = findViewById(R.id.viewsmssendpart1EditText1);
-        //metSMSBody.setBackground(drawableFrame);
-        metSMSBody.setText(mszSMSBody);
+        metSMSBody = (EditText) findViewById(R.id.viewsmssendpart1EditText1);
+        if (mszSMSBody != null) {
+            metSMSBody.setText(mszSMSBody);
+        }
     }
 
-    //
-    // 设置搜索到的匹配位置
-    //
-    void setListViewPrePosition() {
-        int nPrePosition = getContractsDataPrePosition(metTO.getText().toString());
-        mlvContracts.setSelected(false);
-        mlvContracts.setSelection(nPrePosition);
+    // 核心优化：根据输入号码筛选列表（无结果则显示空列表）
+    private void filterListByPhone(String inputPhone) {
+        PhoneUtil phoneUtil = new PhoneUtil(this);
+        List<PhoneBean> allContacts = phoneUtil.getPhoneList();
+        List<PhoneBean> matchedContacts = new ArrayList<PhoneBean>();
+
+        // 遍历所有联系人，匹配包含输入号码的联系人
+        for (PhoneBean contact : allContacts) {
+            if (contact.getTelPhone().contains(inputPhone) 
+                || phoneUtil.isTheSamePhoneNumber(contact.getTelPhone(), inputPhone)) {
+                matchedContacts.add(contact);
+            }
+        }
+
+        LogUtils.d(TAG, "号码搜索：输入'" + inputPhone + "', 匹配" + matchedContacts.size() + "个结果");
+
+        // 用筛选结果更新列表（无结果则传入空列表）
+        initAdapter(matchedContacts.isEmpty() ? new ArrayList<PhoneBean>() : matchedContacts);
+
+        // 定位到第一个匹配项（如果有）
+        if (!matchedContacts.isEmpty()) {
+            mlvContracts.setSelection(0);
+            mtvTOName.setText(matchedContacts.get(0).getName());
+        } else {
+            mtvTOName.setText(""); // 无结果时清空姓名显示
+        }
     }
 
-    //
-    // 返回搜索到的匹配位置
-    //
-    int getContractsDataPrePosition(String szPhone) {
+    // 根据姓名搜索联系人
+    private void setListViewPrePositionByName() {
+        String searchName = metTONameSearch.getText().toString().trim();
+        PhoneUtil phoneUtil = new PhoneUtil(this);
+        List<PhoneBean> matchedContacts = phoneUtil.getPhonesByName(searchName);
+        initAdapter(matchedContacts);
+        if (!matchedContacts.isEmpty()) {
+            mlvContracts.setSelection(0);
+        }
+    }
+
+    // 初始定位号码对应的联系人
+    private void setListViewPrePositionByPhone() {
+        String inputPhone = metTO.getText().toString().trim();
+        if (inputPhone.isEmpty()) {
+            return;
+        }
+        filterListByPhone(inputPhone); // 复用筛选逻辑
+    }
+
+    // 获取号码匹配的位置（兼容旧逻辑）
+    private int getContractsDataPrePositionByPhone(String szPhone) {
+        if (mListPhoneBeanContracts == null || mListPhoneBeanContracts.isEmpty()) {
+            return 0;
+        }
         for (int i = 0; i < mListPhoneBeanContracts.size(); i++) {
-            if (mListPhoneBeanContracts.get(i).getTelPhone().compareTo(szPhone) > -1) {
+            PhoneBean bean = mListPhoneBeanContracts.get(i);
+            if (bean.getTelPhone().compareTo(szPhone) >= 0) {
                 return i;
             }
-
         }
         return 0;
     }
 
-    //
-    // 初始化适配器
-    //
-    void initAdapter() {
-        // 初始化联系人数据适配器
-        mAdapterData = new ArrayList<>();
-        // 读取联系人数据
-        PhoneUtil phoneUtils = new PhoneUtil(this);
-        mListPhoneBeanContracts = phoneUtils.getPhoneList();
-        // 映射联系人数据给适配器数据对象
-        for (int i = 0;i < mListPhoneBeanContracts.size();i++) {
-            Map<String,Object> map =new HashMap<>();
-            map.put(MAP_NAME, mListPhoneBeanContracts.get(i).getName());
-            map.put(MAP_PHONE, mListPhoneBeanContracts.get(i).getTelPhone());
-            mAdapterData.add(map);
+    // 获取姓名匹配的位置（兼容旧逻辑）
+    private int getContractsDataPrePositionByName(String szName) {
+        if (mListPhoneBeanContracts == null || mListPhoneBeanContracts.isEmpty()) {
+            return 0;
         }
-        // 绑定适配器与数据
-        mSimpleAdapter = new SimpleAdapter(ComposeSMSActivity.this, mAdapterData, R.layout.listview_contracts
-                                           , new String[]{MAP_NAME, MAP_PHONE}
-                                           , new int[]{R.id.listviewcontractsTextView1, R.id.listviewcontractsTextView2});
-        mSimpleAdapter.setDropDownViewResource(R.layout.listview_contracts);
-        mlvContracts.setAdapter(mSimpleAdapter);
-        mlvContracts.setOnItemClickListener(new ListView.OnItemClickListener() {
+        for (int i = 0; i < mListPhoneBeanContracts.size(); i++) {
+            if (mListPhoneBeanContracts.get(i).getName().startsWith(szName)) {
+                return i;
+            }
+        }
+        return 0;
+    }
 
-                @Override
-                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                    metTO.setText(mAdapterData.get(position).get(MAP_PHONE).toString());
+    // 初始化或更新列表适配器
+    private void initAdapter(List<PhoneBean> initData) {
+        mAdapterData.clear(); // 清空旧数据
+        final PhoneUtil phoneUtil = new PhoneUtil(this);
 
-                }
-            });
+        // 确定数据源：传入的筛选数据或所有联系人
+        if (initData != null) {
+            mListPhoneBeanContracts = initData;
+        } else {
+            mListPhoneBeanContracts = phoneUtil.getPhoneList();
+        }
+
+        // 转换数据为SimpleAdapter所需格式
+        if (mListPhoneBeanContracts != null) {
+            for (PhoneBean bean : mListPhoneBeanContracts) {
+                Map<String, Object> map = new HashMap<String, Object>();
+                map.put(MAP_NAME, bean.getName());
+                map.put(MAP_PHONE, bean.getTelPhone());
+                mAdapterData.add(map);
+            }
+        }
+
+        // 初始化或更新适配器
+        if (mSimpleAdapter == null) {
+            mSimpleAdapter = new SimpleAdapter(
+                ComposeSMSActivity.this,
+                mAdapterData,
+                R.layout.listview_contracts,
+                new String[]{MAP_NAME, MAP_PHONE},
+                new int[]{R.id.listviewcontractsTextView1, R.id.listviewcontractsTextView2}
+            );
+            mSimpleAdapter.setDropDownViewResource(R.layout.listview_contracts);
+            mlvContracts.setAdapter(mSimpleAdapter);
+
+            // 列表项点击事件
+            mlvContracts.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+					@Override
+					public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+						if (position < mAdapterData.size()) {
+							String phone = mAdapterData.get(position).get(MAP_PHONE).toString();
+							metTO.setText(phone);
+							mtvTOName.setText(phoneUtil.getNameByPhone(phone));
+						}
+					}
+				});
+        } else {
+            mSimpleAdapter.notifyDataSetChanged(); // 数据更新时通知适配器
+        }
+    }
+
+    // 发送短信逻辑
+    private void sendSMS() {
+        String phoneTo = metTO.getText().toString().trim();
+        if (phoneTo.isEmpty()) {
+            ToastUtils.show("没有设置接收号码。");
+            return;
+        }
+        String smsBody = metSMSBody.getText().toString().trim();
+        if (smsBody.isEmpty()) {
+            ToastUtils.show("没有消息内容可发送。");
+            return;
+        }
+        if (SMSUtil.sendMessageByInterface2(ComposeSMSActivity.this, phoneTo, smsBody)) {
+            finish();
+        }
     }
 }
+

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java

@@ -128,7 +128,7 @@ public class MainActivity extends BaseActivity {
         mToolbar = findViewById(R.id.activitymainASupportToolbar1);
         mToolbar.setSubtitle(getString(R.string.activity_name_main));
         setSupportActionBar(mToolbar);
-        
+
         boolean isEnableService = mAppConfigUtil.mAppConfigBean.isEnableService();
         msvEnableService = findViewById(R.id.activitymainSwitchView1);
         msvEnableService.setChecked(isEnableService);
@@ -269,17 +269,9 @@ public class MainActivity extends BaseActivity {
     public boolean onCreateOptionsMenu(Menu menu) {
         //return super.onCreateOptionsMenu(menu);
         getMenuInflater().inflate(R.menu.toolbar_main, menu);
-
-        /*ThemeUtil.BaseTheme baseTheme = ThemeUtil.getTheme(mAppConfigUtil.mAppConfigBean.getAppThemeID());
-        if (baseTheme == ThemeUtil.BaseTheme.DEFAULT) {
-            menu.findItem(R.id.app_defaulttheme).setChecked(true);
-        } else if (baseTheme == ThemeUtil.BaseTheme.SKY) {
-            menu.findItem(R.id.app_skytheme).setChecked(true);
-        } else if (baseTheme == ThemeUtil.BaseTheme.GOLDEN) {
-            menu.findItem(R.id.app_goldentheme).setChecked(true);
-        }*/
-
-        return super.onCreateOptionsMenu(menu);
+        super.onCreateOptionsMenu(menu);
+		getMenuInflater().inflate(R.menu.toolbar_main2, menu);
+		return true;
     }
 
     public static void reloadSMS() {
@@ -306,7 +298,7 @@ public class MainActivity extends BaseActivity {
             i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(i);
 		} else if (nItemId ==  R.id.app_log) {
-            //App.getWinBoLLActivityManager().startLogActivity(this);
+            App.getWinBoLLActivityManager().startLogActivity(this);
         } else if (nItemId ==  R.id.app_unittest) {
             Intent i = new Intent(MainActivity.this, UnitTestActivity.class);
             i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -324,7 +316,7 @@ public class MainActivity extends BaseActivity {
             i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(i);
         }
-        
+
         return super.onOptionsItemSelected(item);
     }
 

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/SMSActivity.java

@@ -4,11 +4,16 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AbsListView;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -16,19 +21,17 @@ import android.widget.Toolbar;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 import cc.winboll.studio.mymessagemanager.R;
-import cc.winboll.studio.mymessagemanager.activitys.SMSActivity;
 import cc.winboll.studio.mymessagemanager.adapters.SMSArrayAdapter;
 import cc.winboll.studio.mymessagemanager.utils.AddressUtils;
 import cc.winboll.studio.mymessagemanager.utils.SMSUtil;
 import cc.winboll.studio.mymessagemanager.utils.ViewUtil;
+import cc.winboll.studio.mymessagemanager.views.BottomPositionFixedScrollView;
 import cc.winboll.studio.mymessagemanager.views.SMSListViewForScrollView;
 import java.lang.ref.WeakReference;
 
 public class SMSActivity extends BaseActivity {
     public static String TAG = "SMSActivity";
-
     public static final String ACTION_NOTIFY_SMS_CHANGED = "cc.winboll.studio.mymessagemanager.activitys.SMSActivity.ACTION_NOTIFY_SMS_CHANGED";
-
     public static final String EXTRA_PHONE = "Phone";
     final static int MSG_SET_FOCUS = 0;
 
@@ -36,10 +39,11 @@ public class SMSActivity extends BaseActivity {
     Toolbar mToolbar;
     String mszPhoneTo;
     SMSArrayAdapter mSMSArrayAdapter;
-    ScrollView mScrollView;
+    BottomPositionFixedScrollView mScrollView1;
     EditText metSMSBody;
     SMSActivityBroadcastReceiver mSMSActivityBroadcastReceiver;
     Handler mSetFocusHandler;
+    private boolean isImeVisible = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,45 +51,90 @@ public class SMSActivity extends BaseActivity {
         setContentView(R.layout.activity_sms);
 
         initView();
-		mSetFocusHandler = new MyHandler(SMSActivity.this);
         scrollScrollView();
+        setupImeStatusListener();
 
-        // 每隔一定时间设置输入框获得焦点
-        //
-        new Thread() {
-            @Override
-            public void run() {
-                while (true) {
-                    try {
-                        Thread.sleep(1500);
-                    } catch (InterruptedException e) {}
-                    Message message = mSetFocusHandler.obtainMessage(MSG_SET_FOCUS);
-                    mSetFocusHandler.sendMessage(message);
-                }
-            }}.start();
+        // 新增：监听窗口加载完成，触发mScrollView1滚动到底部
+        setupScrollToBottomAfterWindowLoaded();
     }
 
-    //
-    // 设置输入框获得焦点的类
-	//
-	static class MyHandler extends Handler {
-		WeakReference<SMSActivity> mActivity;  
-		MyHandler(SMSActivity activity) {  
-			mActivity = new WeakReference<SMSActivity>(activity);  
-		}
-        public void handleMessage(Message msg) {
-			SMSActivity theActivity = mActivity.get();
-            switch (msg.what) {
-                case MSG_SET_FOCUS:
-                    theActivity.metSMSBody.setFocusable(true);
-                    theActivity.metSMSBody.requestFocus();
-                    break;
-                default:
-                    break;
-            }
-            super.handleMessage(msg);
-        }
-	}
+    // 新增：窗口加载完成后让mScrollView1滚动到底部
+    private void setupScrollToBottomAfterWindowLoaded() {
+        final View rootView = findViewById(android.R.id.content);
+        // 监听根布局绘制完成（窗口加载完成的标志）
+        rootView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+				@Override
+				public void onGlobalLayout() {
+					// 滚动到底部
+					mScrollView1.post(new Runnable() {
+							@Override
+							public void run() {
+								mScrollView1.fullScroll(ScrollView.FOCUS_DOWN);
+							}
+						});
+
+					// 移除监听，避免重复触发
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+						rootView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+					} else {
+						rootView.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+					}
+				}
+			});
+    }
+
+    private void setupImeStatusListener() {
+        final View rootView = findViewById(android.R.id.content);
+        rootView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+				@Override
+				public void onGlobalLayout() {
+					int rootViewHeight = rootView.getHeight();
+					int screenHeight = getResources().getDisplayMetrics().heightPixels;
+					int imeThreshold = dp2px(200);
+
+					boolean currentImeVisible = (screenHeight - rootViewHeight) > imeThreshold;
+
+					if (currentImeVisible != isImeVisible) {
+						isImeVisible = currentImeVisible;
+						setupScrollView1Height();
+						if (!isImeVisible) {
+							metSMSBody.clearFocus();
+						}
+					}
+
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+						rootView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+					} else {
+						rootView.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+					}
+					setupImeStatusListener();
+				}
+			});
+    }
+
+    private int dp2px(int dp) {
+        return (int) (dp * getResources().getDisplayMetrics().density + 0.5f);
+    }
+
+    /*static class MyHandler extends Handler {
+	 WeakReference<SMSActivity> mActivity;
+	 MyHandler(SMSActivity activity) {
+	 mActivity = new WeakReference<SMSActivity>(activity);
+	 }
+	 public void handleMessage(Message msg) {
+	 SMSActivity theActivity = mActivity.get();
+	 switch (msg.what) {
+	 case MSG_SET_FOCUS:
+	 theActivity.metSMSBody.setFocusable(true);
+	 theActivity.metSMSBody.requestFocus();
+	 theActivity.setupScrollView1Height();
+	 break;
+	 default:
+	 break;
+	 }
+	 super.handleMessage(msg);
+	 }
+	 }*/
 
     @Override
     protected void onDestroy() {
@@ -94,135 +143,130 @@ public class SMSActivity extends BaseActivity {
     }
 
     void initView() {
-        // 发送端空号码退出
         mszPhoneTo = getIntent().getStringExtra(EXTRA_PHONE);
         if (mszPhoneTo == null || mszPhoneTo.trim().equals("")) {
             finish();
         }
 
-        // 初始化标题栏
-        mToolbar = findViewById(R.id.activitysmsASupportToolbar1);
+        mToolbar = (Toolbar) findViewById(R.id.activitysmsASupportToolbar1);
         mToolbar.setSubtitle(getString(R.string.activity_name_smsinphone) + " < Phone : " + AddressUtils.getFormattedAddress(mszPhoneTo) + " >");
         setActionBar(mToolbar);
 
-        // 初始化滚动窗口
-        mScrollView = findViewById(R.id.activitysmsinphoneScrollView1);
+        mScrollView1 = (BottomPositionFixedScrollView) findViewById(R.id.activitysmsScrollView1);
 
-        // 初始化发送消息框
-        //Drawable drawableFrame = AppCompatResources.getDrawable(this, R.drawable.bg_frame);
-        metSMSBody = findViewById(R.id.viewsmssendpart1EditText1);
-        //metSMSBody.setBackground(drawableFrame);
+        metSMSBody = (EditText) findViewById(R.id.viewsmssendpart1EditText1);
+        metSMSBody.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					setupScrollView1Height();
+				}
+			});
+        metSMSBody.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+				@Override
+				public void onFocusChange(View v, boolean hasFocus) {
+					setupScrollView1Height();
+				}
+			});
 
-        // 初始化发送拉动控件
-        final AOHPCTCSeekBar aOHPCTCSeekBar = findViewById(R.id.viewsmssendpart1AOHPCTCSeekBar1);
+        final AOHPCTCSeekBar aOHPCTCSeekBar = (AOHPCTCSeekBar) findViewById(R.id.viewsmssendpart1AOHPCTCSeekBar1);
         aOHPCTCSeekBar.setThumb(getDrawable(R.drawable.ic_message));
         aOHPCTCSeekBar.setThumbOffset(20);
-        aOHPCTCSeekBar.setOnOHPCListener(
-            new AOHPCTCSeekBar.OnOHPCListener(){
-                @Override
-                public void onOHPCommit() {
-                    //Toast.makeText(getApplication(), "Send", Toast.LENGTH_SHORT).show();
-                    sendSMS();
-                }
-            });
+        aOHPCTCSeekBar.setOnOHPCListener(new AOHPCTCSeekBar.OnOHPCListener() {
+				@Override
+				public void onOHPCommit() {
+					sendSMS();
+				}
+			});
 
-        // 初始化提示框
-        TextView tvAOHPCTCSeekBarMSG = findViewById(R.id.viewsmssendpart1TextView1);
+        TextView tvAOHPCTCSeekBarMSG = (TextView) findViewById(R.id.viewsmssendpart1TextView1);
         tvAOHPCTCSeekBarMSG.setText(R.string.msg_100sendmsg);
 
-        mlvSMS = (SMSListViewForScrollView) findViewById(R.id.activitysmsinphoneListView1);
-
-        // 准备数据
+        mlvSMS = (SMSListViewForScrollView) findViewById(R.id.activitysmsSMSListViewForScrollView1);
         mSMSArrayAdapter = new SMSArrayAdapter(SMSActivity.this, mszPhoneTo);
         mlvSMS.setAdapter(mSMSArrayAdapter);
 
-        // 设置短信列表滚动到底部就取消已发送的通知消息
-        //
         mlvSMS.setOnScrollListener(new AbsListView.OnScrollListener() {
-                @Override
-                public void onScrollStateChanged(AbsListView view, int scrollState) {
-                }
+				@Override
+				public void onScrollStateChanged(AbsListView view, int scrollState) {}
 
-                @Override
-                public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-                    if (firstVisibleItem + visibleItemCount == totalItemCount && totalItemCount > 0) {
-                        // 滑动到了底部
-                        mSMSArrayAdapter.cancelMessageNotification();
-                    }
-                }
-            });
+				@Override
+				public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+					if (firstVisibleItem + visibleItemCount == totalItemCount && totalItemCount > 0) {
+						mSMSArrayAdapter.cancelMessageNotification();
+					}
+				}
+			});
 
         mSMSActivityBroadcastReceiver = new SMSActivityBroadcastReceiver();
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(ACTION_NOTIFY_SMS_CHANGED);
+        IntentFilter intentFilter = new IntentFilter(ACTION_NOTIFY_SMS_CHANGED);
         LocalBroadcastManager.getInstance(this).registerReceiver(mSMSActivityBroadcastReceiver, intentFilter);
-
-        /*SMSView mSMSView = findViewById(R.id.viewsmssendSMSView1);
-        mSMSView.setSMSType(SMSView.SMSType.SEND);*/
     }
 
-    //
-    // 更新信息列表
-    //
+    private void setupScrollView1Height() {
+        mScrollView1.postDelayed(new Runnable() {
+				@Override
+				public void run() {
+					final ScrollView scrollView2 = (ScrollView) findViewById(R.id.activitysmsScrollView2);
+					final BottomPositionFixedScrollView scrollView1 = (BottomPositionFixedScrollView) findViewById(R.id.activitysmsScrollView1);
+					final View includeView = findViewById(R.id.activitysmsinclude1);
+
+					scrollView2.post(new Runnable() {
+							@Override
+							public void run() {
+								int scrollView2Height = scrollView2.getHeight();
+								int includeHeight = includeView.getHeight();
+								int targetHeight = Math.max(scrollView2Height - includeHeight, 0);
+
+								LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) scrollView1.getLayoutParams();
+								params.height = targetHeight;
+								scrollView1.setLayoutParams(params);
+							}
+						});
+				}
+			}, 100);
+    }
+
     public void updateSMSView() {
         mSMSArrayAdapter.reLoadSMSList(SMSActivity.this, mszPhoneTo);
         mSMSArrayAdapter.notifyDataSetChanged();
     }
 
-    //
-    // 滚动消息文本框
-    //
     void scrollScrollView() {
-
-        ViewUtil.scrollScrollView(mScrollView);
-
+        ViewUtil.scrollScrollView(mScrollView1);
     }
 
-    //
-    // 发送短信
-    //
     void sendSMS() {
-        // 空消息不发送
         String szSMSBody = metSMSBody.getText().toString();
         if (szSMSBody.equals("")) {
             Toast.makeText(getApplication(), "没有消息内容可发送。", Toast.LENGTH_SHORT).show();
             return;
         }
 
-        // 发送短信
         if (SMSUtil.sendMessageByInterface2(this, mszPhoneTo, szSMSBody)) {
             metSMSBody.setText("");
-            new Handler().postDelayed(new Runnable(){
-                    @Override
-                    public void run() {
-                        updateSMSView();
-                        ViewUtil.scrollScrollView(mScrollView);
-                    }
-                }, 1000);
+            metSMSBody.clearFocus();
+            new Handler().postDelayed(new Runnable() {
+					@Override
+					public void run() {
+						updateSMSView();
+						ViewUtil.scrollScrollView(mScrollView1);
+					}
+				}, 1000);
         }
     }
 
     class SMSActivityBroadcastReceiver extends BroadcastReceiver {
-
-        public SMSActivityBroadcastReceiver() {
-            //LogUtils.d(TAG, "SMSActivityBroadcastReceiver()");
-        }
+        public SMSActivityBroadcastReceiver() {}
 
         @Override
         public void onReceive(Context context, Intent intent) {
-            switch (intent.getAction()) {
-                case ACTION_NOTIFY_SMS_CHANGED :
-                    //Toast.makeText(context, "ACTION_NOTIFY_SMS_CHANGED", Toast.LENGTH_SHORT).show();
-                    updateSMSView();
-                    ViewUtil.scrollScrollView(mScrollView);
-                    //LogUtils.d(TAG, "ACTION_NOTIFY_SMS_CHANGED");
-                    break;
-                default:
-                    throw new IllegalStateException("Unexpected value: " + intent.getAction());
+            if (ACTION_NOTIFY_SMS_CHANGED.equals(intent.getAction())) {
+                updateSMSView();
+                ViewUtil.scrollScrollView(mScrollView1);
+            } else {
+                throw new IllegalStateException("Unexpected value: " + intent.getAction());
             }
-
         }
-
     }
-
 }
+

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBoLLActivity.java

@@ -13,9 +13,9 @@ import cc.winboll.studio.libaes.beans.AESThemeBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class WinBollActivity extends AppCompatActivity implements IWinBoLLActivity {
+public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
 
-    public static final String TAG = "WinBollActivity";
+    public static final String TAG = "WinBoLLActivity";
 
     protected volatile AESThemeBean.ThemeType mThemeType;
 

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/PhoneUtil.java

@@ -1,8 +1,8 @@
 package cc.winboll.studio.mymessagemanager.utils;
 
 /**
- * @Author ZhanGSKen<zhangsken@188.com>
- * @Date 2024/07/19 14:30:57
+ * @Author ZhanGSKen&豆包大模型<zhangsken@188.com>
+ * @Date 2025/08/30 14:32
  * @Describe 手机联系人工具类
  */
 import android.content.ContentResolver;
@@ -12,6 +12,12 @@ import android.net.Uri;
 import android.provider.ContactsContract;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.mymessagemanager.beans.PhoneBean;
+import net.sourceforge.pinyin4j.PinyinHelper;
+import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
+import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
+import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
+import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -38,28 +44,137 @@ public class PhoneUtil {
     }
 
     // 读取所有联系人
-    //
     public List<PhoneBean> getPhoneList() {
         List<PhoneBean> listPhoneBean = new ArrayList<>();
         ContentResolver cr = mContext.getContentResolver();
         Cursor cursor = cr.query(mUriPhoneContent, new String[]{NUMBER, DISPLAY_NAME}, null, null, null);
-        while (cursor.moveToNext()) {
-			PhoneBean phoneBean = new PhoneBean(cursor.getString(1), cursor.getString(0).replaceAll("\\s", ""));
-			listPhoneBean.add(phoneBean);
-
+        if (cursor != null) {
+            while (cursor.moveToNext()) {
+                // 去除号码中的空格
+                String phone = cursor.getString(0).replaceAll("\\s", "");
+                String name = cursor.getString(1);
+                PhoneBean phoneBean = new PhoneBean(name, phone);
+                listPhoneBean.add(phoneBean);
+            }
+            cursor.close();
         }
-		cursor.close();
 
+        // 按电话号码排序
         Collections.sort(listPhoneBean, new Comparator<PhoneBean>() {
-                @Override
-                public int compare(PhoneBean o1, PhoneBean o2) {
-                    return o1.getTelPhone().compareTo(o2.getTelPhone());
-                }
-            });
+				@Override
+				public int compare(PhoneBean o1, PhoneBean o2) {
+					return o1.getTelPhone().compareTo(o2.getTelPhone());
+				}
+			});
 
         return listPhoneBean;
     }
 
+    /**
+     * 根据联系人名称查询号码（兼容拼音查询）
+     * @param keyword 搜索关键词（支持汉字、拼音、拼音首字母）
+     * @return 匹配的联系人列表（包含姓名和号码）
+     */
+    public List<PhoneBean> getPhonesByName(String keyword) {
+        List<PhoneBean> result = new ArrayList<>();
+        if (keyword == null || keyword.trim().isEmpty()) {
+            return result; // 关键词为空，返回空列表
+        }
+
+        // 获取所有联系人
+        List<PhoneBean> allContacts = getPhoneList();
+        // 统一转为小写，忽略大小写
+        String keywordLower = keyword.trim().toLowerCase();
+
+        for (PhoneBean contact : allContacts) {
+            String name = contact.getName();
+            if (name == null || name.isEmpty()) {
+                continue;
+            }
+
+            // 1. 直接匹配姓名（包含关键词）
+            if (name.toLowerCase().contains(keywordLower)) {
+                result.add(contact);
+                continue;
+            }
+
+            // 2. 匹配姓名的全拼（包含关键词）
+            String namePinyin = getPinyin(name).toLowerCase();
+            if (namePinyin.contains(keywordLower)) {
+                result.add(contact);
+                continue;
+            }
+
+            // 3. 匹配姓名的拼音首字母（包含关键词）
+            String namePinyinFirstLetter = getPinyinFirstLetter(name).toLowerCase();
+            if (namePinyinFirstLetter.contains(keywordLower)) {
+                result.add(contact);
+                continue;
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 将汉字转为全拼（不带声调，小写）
+     * 例如："张三" → "zhangsan"
+     */
+    private String getPinyin(String chinese) {
+        StringBuilder pinyin = new StringBuilder();
+        HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();
+        format.setCaseType(HanyuPinyinCaseType.LOWERCASE); // 小写
+        format.setToneType(HanyuPinyinToneType.WITHOUT_TONE); // 不带声调
+
+        char[] chars = chinese.toCharArray();
+        for (char c : chars) {
+            // 如果是汉字，转换为拼音；否则直接拼接（如字母、数字、符号）
+            if (Character.toString(c).matches("[\\u4e00-\\u9fa5]")) {
+                try {
+                    String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(c, format);
+                    if (pinyinArray != null && pinyinArray.length > 0) {
+                        pinyin.append(pinyinArray[0]); // 取第一个拼音（多音字默认取第一个）
+                    }
+                } catch (BadHanyuPinyinOutputFormatCombination e) {
+                    LogUtils.e(TAG, "拼音转换失败：" + e.getMessage());
+                }
+            } else {
+                pinyin.append(c);
+            }
+        }
+        return pinyin.toString();
+    }
+
+    /**
+     * 将汉字转为拼音首字母（小写）
+     * 例如："张三" → "zs"
+     */
+    private String getPinyinFirstLetter(String chinese) {
+        StringBuilder firstLetters = new StringBuilder();
+        HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();
+        format.setCaseType(HanyuPinyinCaseType.LOWERCASE);
+        format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
+
+        char[] chars = chinese.toCharArray();
+        for (char c : chars) {
+            if (Character.toString(c).matches("[\\u4e00-\\u9fa5]")) {
+                try {
+                    String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(c, format);
+                    if (pinyinArray != null && pinyinArray.length > 0) {
+                        // 取拼音首字母（如"zhang" → "z"）
+                        firstLetters.append(pinyinArray[0].charAt(0));
+                    }
+                } catch (BadHanyuPinyinOutputFormatCombination e) {
+                    LogUtils.e(TAG, "拼音首字母转换失败：" + e.getMessage());
+                }
+            } else {
+                // 非汉字直接拼接首字符（如"李3" → "l3"）
+                firstLetters.append(c);
+            }
+        }
+        return firstLetters.toString();
+    }
+
     public boolean isPhoneInContacts(String szPhone) {
         List<PhoneBean> listPhoneDto = getPhoneList();
         LogUtils.d(TAG, String.format("isPhoneInContacts(...) listPhoneDto.size() %d", listPhoneDto.size()));
@@ -70,49 +185,56 @@ public class PhoneUtil {
         }
         return false;
     }
-    
-    boolean isTheSamePhoneNumber(String szNum1, String szNum2) {
-        //LogUtils.d(TAG, String.format("szNum1 %s\nszNum2 %s", szNum1, szNum2));
-        if(szNum1.equals(szNum2)) {
+
+    public String getNameByPhone(String szPhone) {
+        if (szPhone == null || szPhone.equals("")) {
+            return "";
+        }
+
+        List<PhoneBean> listPhoneDto = getPhoneList();
+        LogUtils.d(TAG, String.format("getNameByPhone(...) listPhoneDto.size() %d", listPhoneDto.size()));
+        for (int i = 0; i < listPhoneDto.size(); i++) {
+            if (isTheSamePhoneNumber(listPhoneDto.get(i).getTelPhone(), szPhone)) {
+                return listPhoneDto.get(i).getName();
+            }
+        }
+        return "";
+    }
+
+    public boolean isTheSamePhoneNumber(String szNum1, String szNum2) {
+        if (szNum1.equals(szNum2)) {
             LogUtils.d(TAG, "szNum1.equals(szNum2)");
             return true;
         }
-        
-        if(UnitAreaUtils.getInstance(mContext).isCurrentUnitAreaNumber(szNum1)) {
-            if(szNum1.equals(UnitAreaUtils.getInstance(mContext).genCurrentUnitAreaNumber(szNum2))) {
+
+        if (UnitAreaUtils.getInstance(mContext).isCurrentUnitAreaNumber(szNum1)) {
+            if (szNum1.equals(UnitAreaUtils.getInstance(mContext).genCurrentUnitAreaNumber(szNum2))) {
                 LogUtils.d(TAG, "szNum1.equals(UnitAreaUtils.genCurrentUnitAreaNumber(szNum2))");
                 return true;
             }
         }
-        
-        if(UnitAreaUtils.getInstance(mContext).isCurrentUnitAreaNumber(szNum2)) {
-            if(szNum2.equals(UnitAreaUtils.getInstance(mContext).genCurrentUnitAreaNumber(szNum1))) {
+
+        if (UnitAreaUtils.getInstance(mContext).isCurrentUnitAreaNumber(szNum2)) {
+            if (szNum2.equals(UnitAreaUtils.getInstance(mContext).genCurrentUnitAreaNumber(szNum1))) {
                 LogUtils.d(TAG, "szNum2.equals(UnitAreaUtils.genCurrentUnitAreaNumber(szNum1))");
                 return true;
             }
         }
-        
+
         LogUtils.d(TAG, "isTheSamePhoneNumber(...) return false;");
         return false;
     }
 
-    //
     // 检验电话号码是否是数字
-    //
     public static boolean isPhoneByDigit(String szPhone) {
-        if(!RegexPPiUtils.isPPiOK(szPhone)) {
+        if (!RegexPPiUtils.isPPiOK(szPhone)) {
             return false;
         }
-        //String text = "这里是一些任意的文本内容";
         String regex = "[+]?\\d+";
         Pattern pattern = Pattern.compile(regex);
         Matcher matcher = pattern.matcher(szPhone);
         LogUtils.d(TAG, String.format("matcher.matches() : %s", matcher.matches()));
-        /*if (matcher.matches()) {
-         System.out.println("文本满足该正则表达式模式");
-         } else {
-         System.out.println("文本不满足该正则表达式模式");
-         }*/
         return matcher.matches();
     }
 }
+

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/UnitAreaUtils.java

@@ -10,9 +10,9 @@ import cc.winboll.studio.mymessagemanager.beans.AppConfigBean;
 import android.content.Context;
 
 public class UnitAreaUtils {
-    
+
     public static final String TAG = "UnitAreaUtils";
-    
+
     static UnitAreaUtils _UnitAreaUtils;
     Context mContext;
 
@@ -26,19 +26,25 @@ public class UnitAreaUtils {
         }
         return _UnitAreaUtils;
     }
-    
+
     public boolean isCurrentUnitAreaNumber(String szPhoneNumer) {
         String szUnitArea = getUnitArea();
-        LogUtils.d(TAG, String.format("szPhoneNumer.substring(1,3) %s", szPhoneNumer.substring(1,3)));
-        return szPhoneNumer.substring(1,3).equals(szUnitArea);
+		try {
+			String szPhoneNumerUnitArea = szPhoneNumer.substring(1, 3);
+			LogUtils.d(TAG, String.format("szPhoneNumerUnitArea %s", szPhoneNumerUnitArea));
+			return szPhoneNumerUnitArea.equals(szUnitArea);
+		} catch (StringIndexOutOfBoundsException e) {
+			LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+		}
+        return false;
     }
-    
+
     public String genCurrentUnitAreaNumber(String szPhoneNumer) {
         String szUnitArea = getUnitArea();
         LogUtils.d(TAG, String.format("szUnitArea %s", szUnitArea));
         return "+" + szUnitArea + szPhoneNumer;
     }
-    
+
     String getUnitArea() {
         String szUnitArea = AppConfigUtil.getInstance(mContext).mAppConfigBean.getCountryCode();
         LogUtils.d(TAG, String.format("szUnitArea %s", szUnitArea));

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/views/BottomPositionFixedScrollView.java

@@ -0,0 +1,125 @@
+package cc.winboll.studio.mymessagemanager.views;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@188.com>
+ * @Date 2025/08/23 00:39
+ * @Describe 多级拉动响应自定义控件
+ */
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.ViewTreeObserver;
+import android.widget.ScrollView;
+
+public class BottomPositionFixedScrollView extends ScrollView {
+	public static final String TAG = "BottomPositionFixedScrollView";
+	// 记录底部对应的内容绝对位置（即底部位置在内容中的y坐标，该位置需始终保持在视图底部）
+	private int mBottomContentY = 0;
+	// 标记是否是首次布局（避免初始加载误触发）
+	private boolean isFirstLayout = true;
+
+	public BottomPositionFixedScrollView(Context context) {
+		super(context);
+		init();
+	}
+
+	public BottomPositionFixedScrollView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		init();
+	}
+
+	public BottomPositionFixedScrollView(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		init();
+	}
+
+	private void init() {
+		// 监听布局变化（高度改变时触发）
+		getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+				@Override
+				public void onGlobalLayout() {
+					if (isFirstLayout) {
+						isFirstLayout = false;
+						return;
+					}
+					// 布局变化后，恢复底部位置
+					restoreBottomPosition();
+				}
+			});
+	}
+
+	/**
+	 * 重写滚动事件，记录“底部对应的内容绝对位置”
+	 * （即当前视图底部边缘对应的内容y坐标，该坐标需始终保持在视图底部）
+	 */
+	@Override
+	protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+		super.onScrollChanged(l, t, oldl, oldt);
+		if (getChildCount() == 0) {
+			mBottomContentY = 0;
+			return;
+		}
+
+		// 内容总高度
+		int contentHeight = getChildAt(0).getMeasuredHeight();
+		// 视图可视高度（自身高度）
+		int scrollViewHeight = getMeasuredHeight();
+		// 当前视图底部边缘对应的内容y坐标 = 顶部滚动距离(t) + 可视高度
+		// （该坐标就是“底部内容的绝对位置”，需始终保持在视图底部）
+		mBottomContentY = t + scrollViewHeight;
+
+		// 避免超过内容总高度（比如内容不足一屏时，底部最多到内容底部）
+		if (mBottomContentY > contentHeight) {
+			mBottomContentY = contentHeight;
+		}
+	}
+
+	/**
+	 * 恢复底部位置：让原记录的“底部内容绝对位置”仍保持在视图底部
+	 */
+	private void restoreBottomPosition() {
+		if (getChildCount() == 0) {
+			return;
+		}
+
+		// 新的内容总高度
+		int newContentHeight = getChildAt(0).getMeasuredHeight();
+		// 新的视图可视高度
+		int newScrollViewHeight = getMeasuredHeight();
+
+		// 目标：让原mBottomContentY（底部内容绝对位置）仍位于视图底部
+		// 此时需要的顶部滚动距离 = mBottomContentY - 新的可视高度
+		int targetScrollY = mBottomContentY - newScrollViewHeight;
+
+		// 边界修正：
+		// 1. 不能小于0（避免滚动到负数位置）
+		// 2. 不能大于“最大可滚动距离”（内容高度 - 可视高度，避免超出内容范围）
+		int maxScrollY = Math.max(newContentHeight - newScrollViewHeight, 0);
+		targetScrollY = Math.max(targetScrollY, 0);
+		targetScrollY = Math.min(targetScrollY, maxScrollY);
+
+		// 滚动到目标位置，保持底部内容位置不变
+		smoothScrollTo(0, targetScrollY);
+	}
+
+	/**
+	 * 外部手动设置底部内容绝对位置（可选）
+	 */
+	public void setBottomContentY(int bottomContentY) {
+		if (getChildCount() == 0) {
+			mBottomContentY = bottomContentY;
+			return;
+		}
+		// 限制不超过内容总高度
+		int contentHeight = getChildAt(0).getMeasuredHeight();
+		mBottomContentY = Math.min(bottomContentY, contentHeight);
+		restoreBottomPosition();
+	}
+
+	/**
+	 * 获取当前底部内容绝对位置（可选）
+	 */
+	public int getBottomContentY() {
+		return mBottomContentY;
+	}
+}
+

mymessagemanager/src/main/res/layout/activity_composesms.xml

@@ -21,25 +21,63 @@
 			android:layout_height="wrap_content"
 			android:id="@+id/activitycomposesmsRelativeLayout1">
 
-			<TextView
+			<LinearLayout
+				android:orientation="horizontal"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="SMS TO : "
-				android:id="@+id/activitycomposesmsTextView1"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="10dp"
-				android:layout_centerVertical="true"/>
-
-			<EditText
-				android:layout_toRightOf="@id/activitycomposesmsTextView1"
-				android:layout_width="wrap_content"
-				android:inputType="phone"
-				android:layout_height="wrap_content"
-				android:ems="10"
-				android:id="@+id/activitycomposesmsEditText1"
+				android:id="@+id/activitycomposesmsLinearLayout1"
+				android:gravity="center_vertical"
 				android:layout_alignParentRight="true"
 				android:layout_marginRight="10dp"
-				android:layout_centerVertical="true"/>
+				android:layout_marginLeft="10dp"
+				android:layout_alignParentLeft="true">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="(拼音搜索):"/>
+
+				<EditText
+					android:layout_width="80dp"
+					android:ems="10"
+					android:layout_height="wrap_content"
+					android:id="@+id/activitycomposesmsEditText2"/>
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_alignParentTop="true"
+					android:layout_toRightOf="@id/activitycomposesmsEditText2"
+					android:id="@+id/activitycomposesmsTextView2"
+					android:layout_weight="1.0"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_below="@id/activitycomposesmsLinearLayout1"
+				android:layout_alignParentRight="true"
+				android:layout_marginRight="10dp"
+				android:layout_marginLeft="10dp"
+				android:layout_alignParentLeft="true"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="(SMS TO) :"
+					android:id="@+id/activitycomposesmsTextView1"/>
+
+				<EditText
+					android:layout_width="wrap_content"
+					android:inputType="phone"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:id="@+id/activitycomposesmsEditText1"/>
+
+			</LinearLayout>
 
 		</RelativeLayout>
 

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

@@ -27,7 +27,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="60dp"
 			android:padding="10dp"
-			android:text="@string/text_onlyreceivecontacts"
+			android:text="@string/text_norulesreceivecontacts"
 			android:id="@+id/activitymainSwitchView2"/>
 
 		<cc.winboll.studio.mymessagemanager.views.ConfirmSwitchView

mymessagemanager/src/main/res/layout/activity_sms.xml

@@ -10,36 +10,40 @@
 		android:layout_height="@dimen/toolbar_height"
 		android:id="@+id/activitysmsASupportToolbar1"/>
 
-	<RelativeLayout
-		android:orientation="vertical"
+	<ScrollView
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:paddingBottom="10dp">
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:id="@+id/activitysmsScrollView2">
 
-		<ScrollView
-			android:layout_alignParentTop="true"
-			android:layout_above="@+id/activitysmsinclude1"
+		<LinearLayout
+			android:orientation="vertical"
 			android:layout_width="match_parent"
-			android:layout_height="0dp"
-			android:id="@+id/activitysmsinphoneScrollView1"
-			android:layout_weight="1.0"
-			android:isScrollContainer="false">
+			android:layout_height="match_parent"
+			android:id="@+id/activitysmsLinearLayout1">
 
-			<cc.winboll.studio.mymessagemanager.views.SMSListViewForScrollView
+			<cc.winboll.studio.mymessagemanager.views.BottomPositionFixedScrollView
+				android:layout_width="match_parent"
+				android:layout_height="520dp"
+				android:isScrollContainer="false"
+				android:id="@+id/activitysmsScrollView1">
+
+				<cc.winboll.studio.mymessagemanager.views.SMSListViewForScrollView
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:id="@+id/activitysmsSMSListViewForScrollView1"/>
+
+			</cc.winboll.studio.mymessagemanager.views.BottomPositionFixedScrollView>
+
+			<include
+				layout="@layout/view_smssend"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:id="@+id/activitysmsinphoneListView1"/>
+				android:id="@+id/activitysmsinclude1"/>
+			
+		</LinearLayout>
 
-		</ScrollView>
-
-		<include
-			android:layout_alignParentBottom="true"
-			layout="@layout/view_smssend"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:id="@+id/activitysmsinclude1"/>
-
-	</RelativeLayout>
+	</ScrollView>
 
 </LinearLayout>
 

mymessagemanager/src/main/res/layout/activity_unittest.xml

@@ -34,7 +34,7 @@
 
 	</ScrollView>
 
-	<cc.winboll.studio.shared.log.LogView
+	<cc.winboll.studio.libappbase.LogView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1.0"

mymessagemanager/src/main/res/layout/view_smssend_part1.xml

@@ -7,6 +7,18 @@
 	android:layout_height="wrap_content"
 	android:padding="10dp">
 
+	<TextView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:textSize="20sp"
+		android:id="@+id/viewsmssendpart1TextView1"/>
+	
+	<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/viewsmssendpart1AOHPCTCSeekBar1"/>
+
 	<EditText
         android:scrollbars="vertical"
         android:maxHeight="150dp"
@@ -17,17 +29,6 @@
 		android:id="@+id/viewsmssendpart1EditText1"
 		android:background="@drawable/bg_frame"/>
 
-	<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:id="@+id/viewsmssendpart1AOHPCTCSeekBar1"/>
-
-	<TextView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:gravity="center"
-		android:textSize="20sp"
-		android:id="@+id/viewsmssendpart1TextView1"/>
-
+	
 </LinearLayout>
 

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

@@ -17,26 +17,4 @@
     <item
         android:id="@+id/app_smsrule"
         android:title="@string/text_smsrule"/>
-    <item android:title="@string/app_developoptions">
-        <menu>
-            <item
-                android:id="@+id/app_log"
-                android:title="@string/app_log"/>
-            <item
-                android:id="@+id/app_unittest"
-                android:title="@string/app_unittest"/>
-            <item
-                android:id="@+id/app_crashtest"
-                android:title="@string/app_crashtest"/>
-        </menu>
-    </item>
-    <item
-        android:id="@+id/app_appsettings"
-        android:title="@string/text_appsettings"/>
-    <item
-        android:id="@+id/app_about"
-        android:title="@string/app_about"/>
-    <item
-        android:id="@+id/app_smsrecycle"
-        android:title="@string/app_smsrecycle"/>
 </menu>

mymessagemanager/src/main/res/menu/toolbar_main2.xml

@@ -0,0 +1,26 @@
+<?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:title="@string/app_developoptions">
+        <menu>
+            <item
+                android:id="@+id/app_log"
+                android:title="@string/app_log"/>
+            <item
+                android:id="@+id/app_unittest"
+                android:title="@string/app_unittest"/>
+            <item
+                android:id="@+id/app_crashtest"
+                android:title="@string/app_crashtest"/>
+        </menu>
+    </item>
+    <item
+        android:id="@+id/app_appsettings"
+        android:title="@string/text_appsettings"/>
+    <item
+        android:id="@+id/app_about"
+        android:title="@string/app_about"/>
+    <item
+        android:id="@+id/app_smsrecycle"
+        android:title="@string/app_smsrecycle"/>
+</menu>