<contacts>APK 1.0.12 release Publish.

contacts/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 05 20:51:08 HKT 2025
-stageCount=11
+#Thu Mar 06 21:44:44 HKT 2025
+stageCount=13
 libraryProject=
 baseVersion=1.0
-publishVersion=1.0.10
+publishVersion=1.0.12
 buildCount=0
-baseBetaVersion=1.0.11
+baseBetaVersion=1.0.13

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

@@ -7,6 +7,7 @@ import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
+import android.widget.EditText;
 
 /**
  * @Author ZhanGSKen@AliYun.Com
@@ -26,6 +27,15 @@ public class UnitTestActivity extends Activity {
         logView.start();
     }
 
+    public void onTestPhone(View view) {
+        // 开始测试数据
+        EditText etPhone = findViewById(R.id.phone_et);
+        Rules rules = Rules.getInstance(this);
+        String phone = etPhone.getText().toString().trim();
+        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
+
+    }
+
     public void onTestMain(View view) {
         Rules rules = Rules.getInstance(this);
 

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

@@ -5,7 +5,10 @@ package cc.winboll.studio.contacts.adapters;
  * @Date 2025/02/26 13:09:32
  * @Describe CallLogAdapter
  */
+import android.content.ContentResolver;
 import android.content.Intent;
+import android.database.Cursor;
+import android.provider.ContactsContract;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,15 +20,24 @@ import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.beans.CallLogModel;
 import com.hjq.toast.ToastUtils;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+import cc.winboll.studio.contacts.utils.ContactUtils;
+import android.content.Context;
 
 public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogViewHolder> {
     public static final String TAG = "CallLogAdapter";
 
     private List<CallLogModel> callLogList;
-
-    public CallLogAdapter(List<CallLogModel> callLogList) {
+    ContactUtils mContactUtils;
+    Context mContext;
+    
+    public CallLogAdapter(Context context, List<CallLogModel> callLogList) {
+        mContext = context;
+        this.mContactUtils = ContactUtils.getInstance(mContext);
         this.callLogList = callLogList;
     }
 
@@ -39,7 +51,7 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
     @Override
     public void onBindViewHolder(@NonNull CallLogViewHolder holder, int position) {
         final CallLogModel callLog = callLogList.get(position);
-        holder.phoneNumber.setText(callLog.getPhoneNumber());
+        holder.phoneNumber.setText(callLog.getPhoneNumber() + " ☎ " + mContactUtils.getContactsName(callLog.getPhoneNumber()));
         holder.callStatus.setText(callLog.getCallStatus());
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
         holder.callDate.setText(dateFormat.format(callLog.getCallDate()));
@@ -75,5 +87,6 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
             dialButton = itemView.findViewById(R.id.dial_button);
         }
     }
+    
 }
 

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

@@ -65,7 +65,7 @@ public class CallLogFragment extends Fragment {
         super.onViewCreated(view, savedInstanceState);
         recyclerView = view.findViewById(R.id.recyclerView);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        callLogAdapter = new CallLogAdapter(callLogList);
+        callLogAdapter = new CallLogAdapter(getContext(), callLogList);
         recyclerView.setAdapter(callLogAdapter);
 
         if (ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_CALL_LOG)!= PackageManager.PERMISSION_GRANTED) {

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

@@ -0,0 +1,62 @@
+package cc.winboll.studio.contacts.utils;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.Cursor;
+import android.provider.ContactsContract;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/06 21:08:16
+ * @Describe ContactUtils
+ */
+public class ContactUtils {
+
+    public static final String TAG = "ContactUtils";
+
+    Map<String, String> contactMap = new HashMap<>();
+
+    static volatile ContactUtils _ContactUtils;
+    Context mContext;
+    ContactUtils(Context context) {
+        mContext = context;
+        relaodContacts();
+    }
+    public synchronized static ContactUtils getInstance(Context context) {
+        if (_ContactUtils == null) {
+            _ContactUtils = new ContactUtils(context);
+        }
+        return _ContactUtils;
+    }
+
+    public void relaodContacts() {
+        readContacts();
+    }
+
+    private void readContacts() {
+        contactMap.clear();
+        ContentResolver contentResolver = mContext.getContentResolver();
+        Cursor cursor = contentResolver.query(ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
+                                              null, null, null, null);
+        if (cursor != null) {
+            while (cursor.moveToNext()) {
+                String displayName = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
+                String phoneNumber = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER));
+                //Map<String, String> contactMap = new HashMap<>();
+                contactMap.put(getSimplePhone(phoneNumber), displayName);
+            }
+            cursor.close();
+        }
+        // 此时 contactList 就是存储联系人信息的 Map 列表
+    }
+
+    public String getContactsName(String phone) {
+        String result = contactMap.get(getSimplePhone(phone));
+        return result == null ? "[NoInContacts]" : result;
+    }
+
+    static String getSimplePhone(String phone) {
+        return phone.replaceAll("[+\\s]", "");
+    }
+}

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

@@ -6,9 +6,11 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<HorizontalScrollView
+	<LinearLayout
+		android:orientation="horizontal"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_height="wrap_content"
+		android:gravity="right">
 
 		<Button
 			android:layout_width="wrap_content"
@@ -16,7 +18,34 @@
 			android:text="Test Main"
 			android:onClick="onTestMain"/>
 
-	</HorizontalScrollView>
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center_vertical">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="测试号码："/>
+
+		<EditText
+			android:layout_width="0dp"
+			android:inputType="phone"
+			android:layout_height="wrap_content"
+			android:ems="10"
+			android:layout_weight="1.0"
+			android:id="@+id/phone_et"/>
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Test Phone"
+			android:onClick="onTestPhone"/>
+
+	</LinearLayout>
 
 	<cc.winboll.studio.libappbase.LogView
 		android:layout_width="match_parent"