From b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期三, 28 二月 2024 17:26:58 +0800
Subject: [PATCH] 1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段
---
app/src/main/res/layout/item_growth_experience_relationship.xml | 74 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/app/src/main/res/layout/item_growth_experience_relationship.xml b/app/src/main/res/layout/item_growth_experience_relationship.xml
index ceb086f..62ea91f 100644
--- a/app/src/main/res/layout/item_growth_experience_relationship.xml
+++ b/app/src/main/res/layout/item_growth_experience_relationship.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -27,37 +27,57 @@
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.relation}"
- 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.nickName}"
- android:textStyle="bold"
- android:layout_marginEnd="24dp"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
tools:text="寮犱笁"
+ 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,46 +89,42 @@
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:text="@{bean.unit}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
</LinearLayout>
<LinearLayout
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:text="@{bean.position}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
</LinearLayout>
<LinearLayout
@@ -122,16 +138,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.politicalOutlook}"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
</LinearLayout>
</LinearLayout>
--
Gitblit v1.9.1