<contacts>APK 1.0.12 release Publish.

contacts/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 05 17:21:57 HKT 2025
-stageCount=10
+#Thu Mar 06 21:44:44 HKT 2025
+stageCount=13
 libraryProject=
 baseVersion=1.0
-publishVersion=1.0.9
+publishVersion=1.0.12
 buildCount=0
-baseBetaVersion=1.0.10
+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/adapters/PhoneConnectRuleAdapter.java

@@ -25,6 +25,8 @@ import android.widget.LinearLayout;
 import android.view.MotionEvent;
 import android.widget.HorizontalScrollView;
 import cc.winboll.studio.contacts.views.LeftScrollView;
+import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libapputils.view.YesNoAlertDialog;
 
 public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -59,9 +61,46 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.V
         final PhoneConnectRuleModel model = ruleList.get(position);
         if (holder instanceof SimpleViewHolder) {
             final SimpleViewHolder simpleViewHolder = (SimpleViewHolder) holder;
-            String szView = model.getRuleText().trim().equals("")?"[NULL]":model.getRuleText();
+            String szView = model.getRuleText().trim().equals("") ?"[NULL]": model.getRuleText();
             simpleViewHolder.tvRuleText.setText(szView);
             simpleViewHolder.scrollView.setOnActionListener(new LeftScrollView.OnActionListener(){
+
+                    @Override
+                    public void onUp() {
+                        ArrayList<PhoneConnectRuleModel> list = Rules.getInstance(context).getPhoneBlacRuleBeanList();
+                        if (position > 0) {
+                            ToastUtils.show("onUp");
+                            simpleViewHolder.scrollView.smoothScrollTo(0, 0);
+//                            PhoneConnectRuleModel newBean = new PhoneConnectRuleModel();
+//                            newBean.setRuleText(list.get(position).getRuleText());
+//                            newBean.setIsAllowConnection(list.get(position).isAllowConnection());
+//                            newBean.setIsEnable(list.get(position).isEnable());
+//                            newBean.setIsSimpleView(list.get(position).isSimpleView());
+                            list.add(position - 1, list.get(position));
+                            list.remove(position + 1);
+                            Rules.getInstance(context).saveRules();
+                            notifyDataSetChanged();
+                        }
+                    }
+
+                    @Override
+                    public void onDown() {
+                        ArrayList<PhoneConnectRuleModel> list = Rules.getInstance(context).getPhoneBlacRuleBeanList();
+                        if (position < list.size() - 1) {
+                            ToastUtils.show("onDown");
+                            simpleViewHolder.scrollView.smoothScrollTo(0, 0);
+//                            PhoneConnectRuleModel newBean = new PhoneConnectRuleModel();
+//                            newBean.setRuleText(list.get(position).getRuleText());
+//                            newBean.setIsAllowConnection(list.get(position).isAllowConnection());
+//                            newBean.setIsEnable(list.get(position).isEnable());
+//                            newBean.setIsSimpleView(list.get(position).isSimpleView());
+                            list.add(position + 2, list.get(position));
+                            list.remove(position);
+                            Rules.getInstance(context).saveRules();
+                            notifyDataSetChanged();
+                        }
+                    }
+
                     @Override
                     public void onEdit() {
                         simpleViewHolder.scrollView.smoothScrollTo(0, 0);
@@ -72,13 +111,24 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.V
 
                     @Override
                     public void onDelete() {
-                        simpleViewHolder.scrollView.smoothScrollTo(0, 0);
-                        model.setIsSimpleView(true);
-                        ArrayList<PhoneConnectRuleModel> list = Rules.getInstance(context).getPhoneBlacRuleBeanList();
-                        list.remove(position);
-                        Rules.getInstance(context).saveRules();
-                        notifyDataSetChanged();
-                        //notifyItemChanged(position);
+                        YesNoAlertDialog.show(simpleViewHolder.scrollView.getContext(), "删除确认", "是否删除该通话规则？", new YesNoAlertDialog.OnDialogResultListener(){
+
+                                @Override
+                                public void onYes() {
+                                    simpleViewHolder.scrollView.smoothScrollTo(0, 0);
+                                    model.setIsSimpleView(true);
+                                    ArrayList<PhoneConnectRuleModel> list = Rules.getInstance(context).getPhoneBlacRuleBeanList();
+                                    list.remove(position);
+                                    Rules.getInstance(context).saveRules();
+                                    notifyDataSetChanged();
+                                    //notifyItemChanged(position);
+                                }
+
+                                @Override
+                                public void onNo() {
+                                }
+                            });
+
                     }
                 });
 //            simpleViewHolder.editButton.setOnClickListener(new View.OnClickListener() {

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/java/cc/winboll/studio/contacts/views/LeftScrollView.java

@@ -15,7 +15,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.libappbase.LogUtils;
-import android.util.TypedValue;
 
 public class LeftScrollView extends HorizontalScrollView {
 
@@ -26,8 +25,12 @@ public class LeftScrollView extends HorizontalScrollView {
     private TextView textView;
     private Button editButton;
     private Button deleteButton;
-    private float mLastX;
+    private Button upButton;
+    private Button downButton;
+    private float mStartX;
+    private float mEndX;
     private boolean isScrolling = false;
+    private int nScrollAcceptSize;
 
     public LeftScrollView(Context context) {
         super(context);
@@ -52,6 +55,7 @@ public class LeftScrollView extends HorizontalScrollView {
         LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) contentLayout.getLayoutParams();
         layoutParams.width = contentWidth;
         contentLayout.setLayoutParams(layoutParams);
+
     }
 
     private void init() {
@@ -69,6 +73,10 @@ public class LeftScrollView extends HorizontalScrollView {
         editButton = viewMain.findViewById(R.id.edit_btn);
         // 创建删除按钮
         deleteButton = viewMain.findViewById(R.id.delete_btn);
+        // 向上按钮
+        upButton = viewMain.findViewById(R.id.up_btn);
+        // 向下按钮
+        downButton = viewMain.findViewById(R.id.down_btn);
 
         // 编辑按钮点击事件
         editButton.setOnClickListener(new OnClickListener() {
@@ -89,6 +97,25 @@ public class LeftScrollView extends HorizontalScrollView {
                     }
                 }
             });
+        // 编辑按钮点击事件
+        upButton.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onActionListener != null) {
+                        onActionListener.onUp();
+                    }
+                }
+            });
+
+        // 删除按钮点击事件
+        downButton.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onActionListener != null) {
+                        onActionListener.onDown();
+                    }
+                }
+            });
     }
 
     @Override
@@ -96,53 +123,40 @@ public class LeftScrollView extends HorizontalScrollView {
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
                 LogUtils.d(TAG, "ACTION_DOWN");
-                mLastX = event.getX();
-                isScrolling = false;
+                mStartX = event.getX();
+//                isScrolling = false;
                 break;
             case MotionEvent.ACTION_MOVE:
                 //LogUtils.d(TAG, "ACTION_MOVE");
-                float currentX = event.getX();
-                float deltaX = mLastX - currentX;
-                mLastX = currentX;
-                if (Math.abs(deltaX) > 0) {
-                    isScrolling = true;
-                }
+//                float currentX = event.getX();
+//                float deltaX = mStartX - currentX;
+//                //mLastX = currentX;
+//                if (Math.abs(deltaX) > 0) {
+//                    isScrolling = true;
+//                }
                 break;
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_CANCEL:
-                LogUtils.d(TAG, "ACTION_UP");
-                if (isScrolling) {
-                    LogUtils.d(TAG, String.format("isScrolling \ngetScrollX() %d\neditButton.getWidth() %d", getScrollX(), editButton.getWidth()));
-                    int scrollX = getScrollX();
-                    if (scrollX > editButton.getWidth()) {
-                        // 获取HorizontalScrollView的子视图
-                        View childView = getChildAt(0);
-                        if (childView != null) {
-                            // 计算需要滑动到最右边的距离
-                            int scrollToX = childView.getWidth() - getWidth();
-                            // 确保滑动距离不小于0
-                            final int scrollToX2 = Math.max(0, scrollToX);
-                            // 平滑滑动到最右边
-                            post(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        smoothScrollTo(scrollToX2, 0);
-                                        LogUtils.d(TAG, "smoothScrollTo(0, 0);");
-                                    }
-                                });
-                            LogUtils.d(TAG, "smoothScrollTo(scrollToX, 0);");
+                if (getScrollX() > 0) {
+                    LogUtils.d(TAG, "ACTION_UP");
+                    mEndX = event.getX();
+                    LogUtils.d(TAG, String.format("mStartX %f, mEndX %f", mStartX, mEndX));
+                    if (mEndX < mStartX) {
+                        LogUtils.d(TAG, String.format("mEndX >= mStartX \ngetScrollX() %d", getScrollX()));
+                        //if (getScrollX() > editButton.getWidth()) {
+                        if (Math.abs(mStartX - mEndX) > editButton.getWidth()) {
+                            smoothScrollToRight();
+                        } else {
+                            smoothScrollToLeft();
                         }
                     } else {
-                        // 恢复原状
-                        // 在手指抬起时，使用 post 方法调用 smoothScrollTo(0, 0)
-                        post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    smoothScrollTo(0, 0);
-                                    LogUtils.d(TAG, "smoothScrollTo(0, 0);");
-                                }
-                            });
-                        //toolLayout.setTranslationX(0);
+                        LogUtils.d(TAG, String.format("mEndX >= mStartX \ngetScrollX() %d", getScrollX()));
+                        //if (getScrollX() > deleteButton.getWidth()) {
+                        if (Math.abs(mEndX - mStartX) > deleteButton.getWidth()) {
+                            smoothScrollToLeft();
+                        } else {
+                            smoothScrollToRight();
+                        }
                     }
                 }
                 break;
@@ -150,6 +164,40 @@ public class LeftScrollView extends HorizontalScrollView {
         return super.onTouchEvent(event);
     }
 
+    void smoothScrollToRight() {
+        mEndX = 0;
+        mStartX = 0;
+        View childView = getChildAt(0);
+        if (childView != null) {
+            // 计算需要滑动到最右边的距离
+            int scrollToX = childView.getWidth() - getWidth();
+            // 确保滑动距离不小于0
+            final int scrollToX2 = Math.max(0, scrollToX);
+            // 平滑滑动到最右边
+            post(new Runnable() {
+                    @Override
+                    public void run() {
+                        smoothScrollTo(scrollToX2, 0);
+                        LogUtils.d(TAG, "smoothScrollTo(0, 0);");
+                    }
+                });
+            LogUtils.d(TAG, "smoothScrollTo(scrollToX, 0);");
+        }
+    }
+
+    void smoothScrollToLeft() {
+        mEndX = 0;
+        mStartX = 0;
+        // 在手指抬起时，使用 post 方法调用 smoothScrollTo(0, 0)
+        post(new Runnable() {
+                @Override
+                public void run() {
+                    smoothScrollTo(0, 0);
+                    LogUtils.d(TAG, "smoothScrollTo(0, 0);");
+                }
+            });
+    }
+
     // 设置文本内容
     public void setText(CharSequence text) {
         textView.setText(text);
@@ -159,6 +207,8 @@ public class LeftScrollView extends HorizontalScrollView {
     public interface OnActionListener {
         void onEdit();
         void onDelete();
+        void onUp();
+        void onDown();
     }
 
     private OnActionListener onActionListener;

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"

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

@@ -30,7 +30,18 @@
             android:layout_height="wrap_content"
             android:text="编辑"
             android:background="@color/blue" />
-
+        <Button
+            android:id="@+id/up_btn"
+            android:layout_width="40dp"
+            android:layout_height="wrap_content"
+            android:text="△"
+            android:background="@color/green" />
+        <Button
+            android:id="@+id/down_btn"
+            android:layout_width="40dp"
+            android:layout_height="wrap_content"
+            android:text="▽"
+            android:background="@color/green" />
         <Button
             android:id="@+id/delete_btn"
             android:layout_width="80dp"

contacts/src/main/res/values/colors.xml

@@ -5,6 +5,7 @@
     <color name="colorPrimaryDark">#FF002B57</color>
     <color name="colorAccent">#FF80BFFF</color>
     <color name="blue">#FF379AFF</color>
+    <color name="green">#FF69E551</color>
     <color name="red">#FFE55151</color>
     <color name="white">#FFFFFFFF</color>
     <color name="lightgray">#FFE0E0E0</color>