From e1b30870200c8daf50e0f2017d37dee3d15f5cb8 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Sat, 1 Mar 2025 13:25:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=80=9A=E8=AE=AF?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mymessagemanager/build.properties             |  4 +--
 .../adapters/PhoneArrayAdapter.java           |  3 +-
 .../adapters/SMSRecycleAdapter.java           |  5 ++--
 .../unittest/AddressUtils_Test.java           | 28 +++++++++++++++++++
 .../unittest/UnitTestActivity.java            |  3 +-
 .../mymessagemanager/utils/AddressUtils.java  | 20 +++++++++++++
 6 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/AddressUtils_Test.java
 create mode 100644 mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/AddressUtils.java

diff --git a/mymessagemanager/build.properties b/mymessagemanager/build.properties
index e78a1be..20b1272 100644
--- a/mymessagemanager/build.properties
+++ b/mymessagemanager/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Feb 25 20:51:01 HKT 2025
+#Sat Mar 01 05:24:02 GMT 2025
 stageCount=16
 libraryProject=
 baseVersion=4.1
 publishVersion=4.1.15
-buildCount=0
+buildCount=4
 baseBetaVersion=4.1.16
diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/PhoneArrayAdapter.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/PhoneArrayAdapter.java
index b8b9454..b3d8505 100644
--- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/PhoneArrayAdapter.java
+++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/PhoneArrayAdapter.java
@@ -13,6 +13,7 @@ import cc.winboll.studio.mymessagemanager.R;
 import cc.winboll.studio.mymessagemanager.activitys.SMSActivity;
 import cc.winboll.studio.mymessagemanager.beans.PhoneBean;
 import cc.winboll.studio.mymessagemanager.beans.SMSBean;
+import cc.winboll.studio.mymessagemanager.utils.AddressUtils;
 import cc.winboll.studio.mymessagemanager.utils.PhoneUtil;
 import cc.winboll.studio.mymessagemanager.utils.SMSUtil;
 import cc.winboll.studio.shared.log.LogUtils;
@@ -76,7 +77,7 @@ public class PhoneArrayAdapter extends BaseAdapter {
 
 		String szAddress = ((SMSBean)getItem(position)).getAddress();
 
-		viewHolder.tvAddress.setText(szAddress);
+		viewHolder.tvAddress.setText(AddressUtils.getFormattedAddress(szAddress));
 		viewHolder.tvName.setText(getName(szAddress));
 
         //Drawable drawableFrame = AppCompatResources.getDrawable(mContext, R.drawable.bg_frame);
diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/SMSRecycleAdapter.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/SMSRecycleAdapter.java
index 1f6e71d..4e60370 100644
--- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/SMSRecycleAdapter.java
+++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/SMSRecycleAdapter.java
@@ -34,6 +34,7 @@ import cc.winboll.studio.mymessagemanager.views.DateAgoTextView;
 import cc.winboll.studio.mymessagemanager.views.SMSView;
 import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
+import cc.winboll.studio.mymessagemanager.utils.AddressUtils;
 
 public class SMSRecycleAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -154,7 +155,7 @@ public class SMSRecycleAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         final SMSRecycleBean item = mDataList.get(position);
         if (holder.getItemViewType() == 0) {
             SimpleViewHolder viewHolder = (SimpleViewHolder) holder;
-            viewHolder.mtvAddress.setText(item.getAddress());
+            viewHolder.mtvAddress.setText(AddressUtils.getFormattedAddress(item.getAddress()));
             viewHolder.mbtnViewBody.setOnClickListener(new View.OnClickListener(){
                     @Override
                     public void onClick(View v) {
@@ -179,7 +180,7 @@ public class SMSRecycleAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                 viewHolder.mvRight.setVisibility(View.GONE);
                 viewHolder.mSMSView.setSMSType(SMSView.SMSType.SEND);
             }
-            viewHolder.mtvAddress.setText(item.getAddress());
+            viewHolder.mtvAddress.setText(AddressUtils.getFormattedAddress(item.getAddress()));
             viewHolder.mdatvDeleteDate.setDate(item.getDeleteDate());
             viewHolder.mdatvDate.setDate(item.getDate());
             if(mAppConfigUtil.mAppConfigBean.isSMSRecycleProtectMode()) {
diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/AddressUtils_Test.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/AddressUtils_Test.java
new file mode 100644
index 0000000..1d58783
--- /dev/null
+++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/AddressUtils_Test.java
@@ -0,0 +1,28 @@
+package cc.winboll.studio.mymessagemanager.unittest;
+import cc.winboll.studio.shared.log.LogUtils;
+import android.content.Context;
+import cc.winboll.studio.mymessagemanager.utils.AddressUtils;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/01 13:07:32
+ * @Describe AddressUtils Test
+ */
+public class AddressUtils_Test {
+
+    public static final String TAG = "AddressUtils_Test";
+
+    public static void main(Context context) {
+        String szSmsBody = "无影无迹";
+        String szSmsAddress = "无名小辈";
+        LogUtils.d(TAG, String.format("szSmsAddress %s\n getFormattedAddress : %s", szSmsAddress, AddressUtils.getFormattedAddress(szSmsAddress)));
+        szSmsAddress = "13172887736";
+        LogUtils.d(TAG, String.format("szSmsAddress %s\n getFormattedAddress : %s", szSmsAddress, AddressUtils.getFormattedAddress(szSmsAddress)));
+        szSmsAddress = "+8613172887736";
+        LogUtils.d(TAG, String.format("szSmsAddress %s\n getFormattedAddress : %s", szSmsAddress, AddressUtils.getFormattedAddress(szSmsAddress)));
+        szSmsAddress = "8613172887736";
+        LogUtils.d(TAG, String.format("szSmsAddress %s\n getFormattedAddress : %s", szSmsAddress, AddressUtils.getFormattedAddress(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 fb32133..ebc1f43 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
@@ -28,6 +28,7 @@ public class UnitTestActivity extends Activity {
     }
 
     public void onMain(View view) {
-        SMSRecevier_Test.main(this);
+        //SMSRecevier_Test.main(this);
+        AddressUtils_Test.main(this);
     }
 }
diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/AddressUtils.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/AddressUtils.java
new file mode 100644
index 0000000..fd1566d
--- /dev/null
+++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/AddressUtils.java
@@ -0,0 +1,20 @@
+package cc.winboll.studio.mymessagemanager.utils;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/01 13:03:16
+ * @Describe 通信录地址工具
+ */
+public class AddressUtils {
+    
+    public static final String TAG = "AddressUtils";
+    
+    public static String getFormattedAddress(String address) {
+        if (address != null && address.matches("[+]?\\d+")) {
+            return address;
+        } else {
+            return "【" + address + "】";
+        }
+    }
+    
+}