From 47cb393f763cb89f5558cb624a66065ea946138d Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 1 Mar 2025 14:01:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9F=AD=E4=BF=A1=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E8=A7=84=E5=88=99=E8=AE=BE=E5=AE=9A=EF=BC=9A=201.?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E4=BA=86=E5=8F=AA=E6=8E=A5=E5=8F=97=E9=80=9A?= =?UTF-8?q?=E8=AE=AF=E5=BD=95=EF=BC=8C=E9=80=9A=E8=AE=AF=E5=BD=95=E9=87=8C?= =?UTF-8?q?=E6=9C=89=E8=AE=B0=E5=BD=95=202.=E5=A6=82=E6=9E=9C=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E6=95=B0=E5=AD=97=E9=80=9A=E8=AE=AF=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E5=9C=A8=E9=80=9A=E8=AE=AF=E5=BD=95?= =?UTF-8?q?=E5=86=85=203.=E9=80=9A=E8=AE=AF=E5=9C=B0=E5=9D=80=E6=98=AF?= =?UTF-8?q?=E6=95=B0=E5=AD=97=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=9C=A8=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E6=8E=A5=E6=94=B6=E8=A7=84=E5=88=99=E5=86=85=E3=80=82?= =?UTF-8?q?=20=E4=BB=A5=E4=B8=8A3=E7=A7=8D=E6=83=85=E5=86=B5=E5=B0=B1?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=EF=BC=8C=E5=85=B6=E4=BB=96=E4=B8=80=E5=BE=8B?= =?UTF-8?q?=E6=94=BE=E5=88=B0=E5=9B=9E=E6=94=B6=E7=AB=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mymessagemanager/build.properties | 4 ++-- .../receivers/SMSRecevier.java | 21 +++++++++++++------ .../unittest/SMSRecevier_Test.java | 4 ++++ .../unittest/UnitTestActivity.java | 8 ++++--- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/mymessagemanager/build.properties b/mymessagemanager/build.properties index cdc8b10..4239e2d 100644 --- a/mymessagemanager/build.properties +++ b/mymessagemanager/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 01 05:35:38 GMT 2025 +#Sat Mar 01 05:57:52 GMT 2025 stageCount=17 libraryProject= baseVersion=4.1 publishVersion=4.1.16 -buildCount=3 +buildCount=9 baseBetaVersion=4.1.17 diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/receivers/SMSRecevier.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/receivers/SMSRecevier.java index ae53231..48c1e52 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/receivers/SMSRecevier.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/receivers/SMSRecevier.java @@ -77,21 +77,30 @@ public class SMSRecevier extends BroadcastReceiver { PhoneUtil phoneUtil = new PhoneUtil(context); boolean isPhoneInContacts = phoneUtil.isPhoneInContacts(szSmsAddress); LogUtils.d(TAG, String.format("isPhoneInContacts %s", isPhoneInContacts)); - + boolean isPhoneByDigit = phoneUtil.isPhoneByDigit(szSmsAddress); LogUtils.d(TAG, String.format("isPhoneByDigit %s", isPhoneByDigit)); - + AppConfigUtil configUtil = AppConfigUtil.getInstance(context); boolean isOnlyReceiveContacts = configUtil.mAppConfigBean.isEnableOnlyReceiveContacts(); LogUtils.d(TAG, String.format("isOnlyReceiveContacts %s", isOnlyReceiveContacts)); - + boolean isInSMSAcceptRule = SMSReceiveRuleUtil.getInstance(context, false).checkIsSMSAcceptInRule(context, szSmsBody); LogUtils.d(TAG, String.format("isInSMSAcceptRule %s", isInSMSAcceptRule)); - - if (isPhoneByDigit - && (!isOnlyReceiveContacts || isPhoneInContacts || isInSMSAcceptRule)) { + + // 启用了只接受通讯录，通讯录里有记录 + if (isOnlyReceiveContacts && isPhoneInContacts) { return true; } + // 如果不是数字通讯地址，但是在通讯录内 + if (!isPhoneByDigit && isPhoneInContacts) { + return true; + } + // 通讯地址是数字，并且在短信接收规则内。 + if (isPhoneByDigit && isInSMSAcceptRule) { + return true; + } + return false; } } diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/SMSRecevier_Test.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/SMSRecevier_Test.java index d1f1b9a..c26d1f4 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/SMSRecevier_Test.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/SMSRecevier_Test.java @@ -19,6 +19,10 @@ public class SMSRecevier_Test { String szSmsAddress = "无名小辈"; test1(context, szSmsBody, szSmsAddress); + szSmsBody = "无影无迹"; + szSmsAddress = "淘宝物流"; + test1(context, szSmsBody, szSmsAddress); + szSmsBody = "无影无迹"; szSmsAddress = "1?0"; test1(context, szSmsBody, szSmsAddress); diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/UnitTestActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/UnitTestActivity.java index ebc1f43..1a3c4dc 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/UnitTestActivity.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/UnitTestActivity.java @@ -5,11 +5,11 @@ package cc.winboll.studio.mymessagemanager.unittest; * @Date 2025/02/25 19:00:10 * @Describe 应用单元测试窗口 */ -import cc.winboll.studio.mymessagemanager.unittest.*; import android.app.Activity; import android.os.Bundle; -import cc.winboll.studio.mymessagemanager.R; import android.view.View; +import cc.winboll.studio.mymessagemanager.R; +import cc.winboll.studio.shared.log.LogUtils; import cc.winboll.studio.shared.log.LogView; public class UnitTestActivity extends Activity { @@ -28,7 +28,9 @@ public class UnitTestActivity extends Activity { } public void onMain(View view) { - //SMSRecevier_Test.main(this); + LogUtils.d(TAG, "SMSRecevier_Test"); + SMSRecevier_Test.main(this); + LogUtils.d(TAG, "AddressUtils_Test"); AddressUtils_Test.main(this); } }