From caead5ad019c24b9a7958f01fa663ea8159aee6c Mon Sep 17 00:00:00 2001
From: guoshen <3129367635@qq.com>
Date: 星期一, 01 七月 2024 16:16:04 +0800
Subject: [PATCH] 修复会议申请的闪退bgg（starttime,endtime字段的划分和修改）
---
app/src/main/res/layout/item_family_assets.xml | 117 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 76 insertions(+), 41 deletions(-)
diff --git a/app/src/main/res/layout/item_family_assets.xml b/app/src/main/res/layout/item_family_assets.xml
index d942d44..b5994e7 100644
--- a/app/src/main/res/layout/item_family_assets.xml
+++ b/app/src/main/res/layout/item_family_assets.xml
@@ -19,7 +19,8 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ tools:layout_height="wrap_content"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
>
<LinearLayout
android:layout_width="match_parent"
@@ -29,52 +30,86 @@
<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:id="@+id/textView2"
+ <ImageView
+ android:id="@+id/iv_flower"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="24dp"
+ android:layout_marginStart="3dp"
+ android:layout_centerVertical="true"
+ android:background="?attr/icIsOwnFamilyDataFlower"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ />
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/textView1"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="20dp"
android:text="@{bean.type}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_16"
-
+ android:textSize="16sp"
+ android:gravity="start|center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/textView2"
+ app:layout_constraintWidth_percent="0.2"
+ android:ellipsize="end"
+ android:maxLines="1"
+ app:autoSizeTextType="uniform"
+ app:autoSizeMaxTextSize="16sp"
+ app:autoSizeMinTextSize="12sp"
+ app:layout_constraintHorizontal_chainStyle="spread_inside"
tools:text="鎴夸骇璇�" />
- <TextView
- android:layout_width="wrap_content"
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/textView2"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
+ android:ellipsize="end"
+ android:maxLines="1"
android:gravity="center"
android:text="@{bean.holder}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_16"
-
+ android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.45"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/tv_time"
+ app:layout_constraintStart_toEndOf="@+id/textView1"
app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintWidth_percent="0.25"
tools:text="寮犱笁" />
- <TextView
+ <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_time"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:text="@{bean.createTime}"
+ android:text="@{bean.happenTime == null ? `鈥斺�斺�斺�擿 : bean.happenTime}"
android:textColor="@color/black"
android:textSize="16sp"
- android:layout_marginEnd="20dp"
-
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/iv_fold"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toEndOf="@id/textView2"
+ app:layout_constraintWidth_percent="0.3"
+ android:gravity="end"
+ android:maxLines="1"
+ android:layout_marginEnd="10dp"
+ android:ellipsize="end"
+ tools:text="2019-01-12" />
+ <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"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="2019-01-12" />
+ android:layout_marginEnd="10dp"
+ />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -89,14 +124,14 @@
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:textSize="12sp"
/>
<TextView
@@ -104,7 +139,7 @@
android:layout_height="wrap_content"
android:text="@{String.valueOf(bean.id)}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
+ android:textSize="12sp"
/>
</LinearLayout>
@@ -112,14 +147,14 @@
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:textSize="12sp"
/>
<TextView
@@ -127,7 +162,7 @@
android:layout_height="wrap_content"
android:text="@{bean.title}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
+ android:textSize="12sp"
/>
</LinearLayout>
@@ -135,14 +170,14 @@
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:textSize="12sp"
/>
<TextView
@@ -150,7 +185,7 @@
android:layout_height="wrap_content"
android:text="@{bean.location}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
+ android:textSize="12sp"
/>
</LinearLayout>
@@ -158,14 +193,14 @@
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:textSize="12sp"
/>
<TextView
@@ -173,7 +208,7 @@
android:layout_height="wrap_content"
android:text="@{bean.address}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
+ android:textSize="12sp"
/>
</LinearLayout>
@@ -182,14 +217,14 @@
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:textSize="12sp"
/>
<TextView
@@ -197,30 +232,30 @@
android:layout_height="wrap_content"
android:text="@{bean.remark}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
+ android:textSize="12sp"
/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="6dp"
android:text="鐢靛瓙鏂囦欢锛�"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
+ android:textSize="12sp"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_15"
+ android:layout_marginBottom="15dp"
>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- tools:listitem="@layout/item_image"
+ tools:listitem="@layout/item_electronic_file"
tools:itemCount="3"
/>
--
Gitblit v1.9.1