From 82e57df230ecb744af6c8865f80870ba03c86d89 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 25 七月 2023 22:18:27 +0800
Subject: [PATCH] 基本功能完成

---
 app/src/main/res/layout/item_growth_experience_holder_condition.xml |   63 +++++++++++++++++++------------
 1 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/layout/item_growth_experience_holder_condition.xml b/app/src/main/res/layout/item_growth_experience_holder_condition.xml
index 1e58bbd..6cab216 100644
--- a/app/src/main/res/layout/item_growth_experience_holder_condition.xml
+++ b/app/src/main/res/layout/item_growth_experience_holder_condition.xml
@@ -27,37 +27,56 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 >
-                <RelativeLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/layout_title"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_40"
+                    android:layout_height="40dp"
                     android:gravity="center_vertical"
                     >
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:layout_marginStart="24dp"
-                        android:textSize="@dimen/sp_16"
-                        android:textColor="@color/black"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:text="@{bean.cerName}"
-                        android:layout_weight="1"
                         tools:text="鎶ょ収"
-                        android:textStyle="bold"
+                        android:textColor="@color/black"
+                        android:textSize="16sp"
+                        android:layout_marginStart="24dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintWidth_percent="0.3"
                         />
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:textSize="@dimen/sp_16"
+                        android:textSize="16sp"
                         android:textColor="@color/black"
                         android:text="@{bean.validityDate}"
-                        android:textStyle="bold"
-                        android:layout_marginEnd="24dp"
-                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
                         tools:text="2010.01-2020.01"
+                        android:gravity="end"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintEnd_toStartOf="@id/iv_fold"
+                        app:layout_constraintWidth_percent="0.4"
+                        android:layout_marginEnd="10dp"
+                        android:maxLines="1"
+                        android:ellipsize="end"
                         />
-                </RelativeLayout>
+                    <ImageView
+                        android:id="@+id/iv_fold"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/ic_fold"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        android:layout_marginEnd="10dp"
+                        />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
                 <LinearLayout
                     android:id="@+id/layout_content"
                     android:layout_width="match_parent"
@@ -69,22 +88,20 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
-                        android:layout_marginBottom="@dimen/dp_6"
+                        android:layout_marginBottom="6dp"
                         >
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="鎸佹湁鎯呭喌锛�"
                             android:textColor="@color/black"
-                            android:textSize="@dimen/sp_12"
-                            android:textStyle="bold"
+                            android:textSize="12sp"
                             />
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textColor="@color/black"
-                            android:textSize="@dimen/sp_12"
-                            android:textStyle="bold"
+                            android:textSize="12sp"
                             android:text="@{bean.ownStatus}"
                             />
                     </LinearLayout>
@@ -99,16 +116,14 @@
                             android:layout_height="wrap_content"
                             android:text="璇佷欢鍙风爜锛�"
                             android:textColor="@color/black"
-                            android:textSize="@dimen/sp_12"
-                            android:textStyle="bold"
+                            android:textSize="12sp"
                             />
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textColor="@color/black"
                             android:text="@{bean.idNo}"
-                            android:textSize="@dimen/sp_12"
-                            android:textStyle="bold"
+                            android:textSize="12sp"
                             tools:text="123456789012345"
                             />
                     </LinearLayout>

--
Gitblit v1.9.1