From 322e1426d77ba7fb2c2c4a04c8c924d0e652aac9 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Sun, 9 Mar 2025 20:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=89=E5=8A=A8=E6=8B=A8?=
 =?UTF-8?q?=E5=8F=B7=E6=8E=A7=E4=BB=B6=E5=9C=A8=E5=88=97=E8=A1=A8=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=97=B6=E5=9B=BE=E6=A0=87=E4=BD=8D=E7=BD=AE=E4=B8=8D?=
 =?UTF-8?q?=E7=A8=B3=E5=AE=9A=E7=9A=84BUG.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contacts/build.properties                     |  4 +-
 .../contacts/adapters/CallLogAdapter.java     |  4 +-
 .../contacts/adapters/ContactAdapter.java     |  1 +
 .../src/main/res/layout/item_call_log.xml     | 83 ++++++++++++++-----
 contacts/src/main/res/layout/item_contact.xml | 67 +++++++++++----
 5 files changed, 119 insertions(+), 40 deletions(-)

diff --git a/contacts/build.properties b/contacts/build.properties
index 05f4f9a..5de8ceb 100644
--- a/contacts/build.properties
+++ b/contacts/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Mar 09 17:42:52 HKT 2025
+#Sun Mar 09 12:03:36 GMT 2025
 stageCount=18
 libraryProject=
 baseVersion=1.0
 publishVersion=1.0.17
-buildCount=0
+buildCount=17
 baseBetaVersion=1.0.18
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
index 7ebc7a8..a986ad8 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
@@ -46,7 +46,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() + " ☎ " + mContactUtils.getContactsName(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()));
@@ -54,7 +54,7 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
         // 初始化拉动后拨号控件 
         holder.dialAOHPCTCSeekBar.setThumb(holder.itemView.getContext().getDrawable(R.drawable.ic_call));
         holder.dialAOHPCTCSeekBar.setBlurRightDP(80);
-        //holder.dialAOHPCTCSeekBar.setThumbOffset(10);
+        holder.dialAOHPCTCSeekBar.setThumbOffset(0);
         holder.dialAOHPCTCSeekBar.setOnOHPCListener(
             new AOHPCTCSeekBar.OnOHPCListener(){
                 @Override
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java
index cc09491..ea5cc77 100644
--- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java
@@ -47,6 +47,7 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
         // 初始化拉动后拨号控件 
         holder.dialAOHPCTCSeekBar.setThumb(holder.itemView.getContext().getDrawable(R.drawable.ic_call));
         holder.dialAOHPCTCSeekBar.setBlurRightDP(80);
+        holder.dialAOHPCTCSeekBar.setThumbOffset(0);
         holder.dialAOHPCTCSeekBar.setOnOHPCListener(
             new AOHPCTCSeekBar.OnOHPCListener(){
                 @Override
diff --git a/contacts/src/main/res/layout/item_call_log.xml b/contacts/src/main/res/layout/item_call_log.xml
index 619e2a2..0f19546 100644
--- a/contacts/src/main/res/layout/item_call_log.xml
+++ b/contacts/src/main/res/layout/item_call_log.xml
@@ -6,32 +6,73 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
 
-	<TextView
-		android:id="@+id/phone_number"
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/phone_number"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:textStyle="bold"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/call_status"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="14sp"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/call_date"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="14sp"/>
+
+	</LinearLayout>
+
+	<RelativeLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:textSize="16sp"
-		android:textStyle="bold"/>
+		android:padding="10dp">
 
-	<TextView
-		android:id="@+id/call_status"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textSize="14sp"
-		android:layout_marginTop="4dp"/>
+		<View
+			android:layout_width="20dp"
+			android:layout_height="20dp"
+			android:background="#FFE7E7E7"
+			android:id="@+id/itemcalllogView1"
+			android:layout_alignParentLeft="true"/>
 
-	<TextView
-		android:id="@+id/call_date"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textSize="14sp"
-		android:layout_marginTop="4dp"/>
+		<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
+			android:layout_toRightOf="@id/itemcalllogView1"
+			android:layout_toLeftOf="@id/itemcalllogView2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:id="@+id/aohpctcseekbar_dial"/>
 
-	<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:id="@+id/aohpctcseekbar_dial"
-		android:padding="10dp"/>
+		<View
+			android:layout_width="20dp"
+			android:layout_height="20dp"
+			android:background="#FFE7E7E7"
+			android:id="@+id/itemcalllogView2"
+			android:layout_alignParentRight="true"/>
+
+	</RelativeLayout>
 
 </LinearLayout>
 
diff --git a/contacts/src/main/res/layout/item_contact.xml b/contacts/src/main/res/layout/item_contact.xml
index 719f9aa..5b3fd98 100644
--- a/contacts/src/main/res/layout/item_contact.xml
+++ b/contacts/src/main/res/layout/item_contact.xml
@@ -6,25 +6,62 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
-	<TextView
-		android:id="@+id/contact_name"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textSize="16sp"
-		android:textStyle="bold"/>
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
 
-	<TextView
-		android:id="@+id/contact_number"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textSize="14sp"
-		android:layout_marginTop="4dp"/>
+		<TextView
+			android:id="@+id/contact_number"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:textStyle="bold"/>
 
-	<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
+		<TextView
+			android:id="@+id/contact_number"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:text="☎"
+			android:textStyle="bold"/>
+
+		<TextView
+			android:id="@+id/contact_name"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:textStyle="bold"/>
+
+	</LinearLayout>
+
+	<RelativeLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/aohpctcseekbar_dial"
-		android:padding="10dp"/>
+		android:padding="10dp">
+
+		<View
+			android:layout_width="20dp"
+			android:layout_height="20dp"
+			android:background="#FFE7E7E7"
+			android:id="@+id/itemcalllogView1"
+			android:layout_alignParentLeft="true"/>
+
+		<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
+			android:layout_toRightOf="@id/itemcalllogView1"
+			android:layout_toLeftOf="@id/itemcalllogView2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:id="@+id/aohpctcseekbar_dial"/>
+
+		<View
+			android:layout_width="20dp"
+			android:layout_height="20dp"
+			android:background="#FFE7E7E7"
+			android:id="@+id/itemcalllogView2"
+			android:layout_alignParentRight="true"/>
+
+	</RelativeLayout>
 
 </LinearLayout>