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.9.2'
+    api 'cc.winboll.studio:libaes:15.8.0'
-    api 'cc.winboll.studio:libapputils:15.8.4'
+    api 'cc.winboll.studio:libapputils:15.8.1'
-    api 'cc.winboll.studio:libappbase:15.8.4'
+    api 'cc.winboll.studio:libappbase:15.8.1'
     
     // 权限请求框架：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
-#Sat Jun 28 13:20:38 HKT 2025
+#Tue May 20 13:02:18 HKT 2025
-stageCount=7
+stageCount=3
 libraryProject=
 baseVersion=15.3
-publishVersion=15.3.6
+publishVersion=15.3.2
 buildCount=0
-baseBetaVersion=15.3.7
+baseBetaVersion=15.3.3

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.setAppDescription("通讯录与拨号");
-        appInfo.setAppGitName("APPBase");
+        appInfo.setAppGitName("APP");
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(szBranchName);
         appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=4&extra=page%3D1");
+        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=Contacts");
         appInfo.setAppAPKName("Contacts");
         appInfo.setAppAPKFolderName("Contacts");
         return new AboutView(mContext, appInfo);

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

@@ -145,14 +145,6 @@ public class Rules {
             LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
         }
 
-        // 检验拨不通号码群
-        if (!isDefend && MainService.isPhoneInBoBullToon(phoneNumber)) {
-            LogUtils.d(TAG, String.format("PhoneNumber %s\n Is In BoBullToon", phoneNumber));
-            isDefend = true;
-            isConnect = false;
-            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
-        }
-
         // 查询通讯录是否有该联系人
         boolean isPhoneInContacts = ContactUtils.getInstance(mContext).isPhoneInContacts(mContext, phoneNumber);
         if (!isDefend) {
@@ -166,6 +158,14 @@ public class Rules {
             }
         }
 
+        // 检验拨不通号码群
+        if (!isDefend && MainService.isPhoneInBoBullToon(phoneNumber)) {
+            LogUtils.d(TAG, String.format("PhoneNumber %s\n Is In BoBullToon", phoneNumber));
+            isDefend = true;
+            isConnect = false;
+            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
+        }
+
         // 正则匹配规则名单校验
         if (!isDefend) {
             for (int i = 0; i < _PhoneConnectRuleModelList.size(); i++) {

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

@@ -269,19 +269,6 @@
 
 			</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"

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

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