From 3809c1bcaba2c72cc42904c7f280051b5fbff69d Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 4 Jun 2025 00:04:20 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contacts/build.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contacts/build.properties b/contacts/build.properties index a2f12cd..86a283b 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue May 20 13:02:18 HKT 2025 +#Tue Jun 03 15:43:10 GMT 2025 stageCount=3 libraryProject= baseVersion=15.3 publishVersion=15.3.2 -buildCount=0 +buildCount=4 baseBetaVersion=15.3.3 From 89dac91cc6b202a474b66ce8a0640ae3d5b1f47d Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 4 Jun 2025 00:08:54 +0800 Subject: [PATCH 02/24] APK 15.3.3 release Publish. --- contacts/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contacts/build.properties b/contacts/build.properties index 86a283b..0f13307 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jun 03 15:43:10 GMT 2025 -stageCount=3 +#Wed Jun 04 00:08:54 HKT 2025 +stageCount=4 libraryProject= baseVersion=15.3 -publishVersion=15.3.2 -buildCount=4 -baseBetaVersion=15.3.3 +publishVersion=15.3.3 +buildCount=0 +baseBetaVersion=15.3.4 From 17de0832a676ef6d423d62715fcc0e261b5bd52f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 14 Jun 2025 17:49:16 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8B=A8=E4=B8=8D?= =?UTF-8?q?=E9=80=9A=E5=8F=B7=E7=A0=81=E7=BE=A4=E6=8E=92=E5=9C=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=80=9A=E8=AE=AF=E5=BD=95=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E5=89=8D=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contacts/build.properties | 4 ++-- .../cc/winboll/studio/contacts/dun/Rules.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contacts/build.properties b/contacts/build.properties index 0f13307..b68bb79 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Jun 04 00:08:54 HKT 2025 +#Sat Jun 14 09:46:47 GMT 2025 stageCount=4 libraryProject= baseVersion=15.3 publishVersion=15.3.3 -buildCount=0 +buildCount=3 baseBetaVersion=15.3.4 diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java b/contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java index 9907a35..80a16e4 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java +++ b/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++) { From 9621d35f79fee76f8a37cd249d42828be58ae65c Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 14 Jun 2025 17:58:55 +0800 Subject: [PATCH 04/24] APK 15.3.4 release Publish. --- contacts/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contacts/build.properties b/contacts/build.properties index b68bb79..b3c78fc 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jun 14 09:46:47 GMT 2025 -stageCount=4 +#Sat Jun 14 17:58:55 HKT 2025 +stageCount=5 libraryProject= baseVersion=15.3 -publishVersion=15.3.3 -buildCount=3 -baseBetaVersion=15.3.4 +publishVersion=15.3.4 +buildCount=0 +baseBetaVersion=15.3.5 From ac1c0080356d4a7833a1876eeb9070a75dadcfe9 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 14 Jun 2025 18:43:41 +0800 Subject: [PATCH 05/24] APK 15.3.5 release Publish. --- contacts/build.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contacts/build.properties b/contacts/build.properties index b3c78fc..378df78 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jun 14 17:58:55 HKT 2025 -stageCount=5 +#Sat Jun 14 18:43:41 HKT 2025 +stageCount=6 libraryProject= baseVersion=15.3 -publishVersion=15.3.4 +publishVersion=15.3.5 buildCount=0 -baseBetaVersion=15.3.5 +baseBetaVersion=15.3.6 From eb253b374f79e89e351c07d780ba43dc861e7661 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 28 Jun 2025 01:03:45 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contacts/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contacts/README.md b/contacts/README.md index d48aa8b..6d44ed1 100644 --- a/contacts/README.md +++ b/contacts/README.md @@ -3,7 +3,7 @@ https://github.com/aJIEw/PhoneCallApp.git #### 介绍 -通讯录与拨号 +手机拨号软件 #### 软件架构 适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。 From 42c4978b448df7806aecc5d55937ad8133e735de Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 28 Jun 2025 12:11:12 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=96=B9=E6=B3=95=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contacts/build.properties | 4 ++-- contacts/src/main/res/layout/activity_settings.xml | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/contacts/build.properties b/contacts/build.properties index 378df78..fb4f89c 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jun 14 18:43:41 HKT 2025 +#Sat Jun 28 04:10:05 GMT 2025 stageCount=6 libraryProject= baseVersion=15.3 publishVersion=15.3.5 -buildCount=0 +buildCount=1 baseBetaVersion=15.3.6 diff --git a/contacts/src/main/res/layout/activity_settings.xml b/contacts/src/main/res/layout/activity_settings.xml index c0afc54..bf9f20e 100644 --- a/contacts/src/main/res/layout/activity_settings.xml +++ b/contacts/src/main/res/layout/activity_settings.xml @@ -269,6 +269,19 @@ + + + + + + Date: Sat, 28 Jun 2025 12:21:42 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contacts/build.properties | 4 ++-- contacts/src/main/res/layout/activity_unittest.xml | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/contacts/build.properties b/contacts/build.properties index fb4f89c..26fd873 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jun 28 04:10:05 GMT 2025 +#Sat Jun 28 04:18:29 GMT 2025 stageCount=6 libraryProject= baseVersion=15.3 publishVersion=15.3.5 -buildCount=1 +buildCount=2 baseBetaVersion=15.3.6 diff --git a/contacts/src/main/res/layout/activity_unittest.xml b/contacts/src/main/res/layout/activity_unittest.xml index f5ff9b2..c2e50cd 100644 --- a/contacts/src/main/res/layout/activity_unittest.xml +++ b/contacts/src/main/res/layout/activity_unittest.xml @@ -15,8 +15,10 @@