From 8aa3165449dd2757e016bdc43cfd5d111cd4c7a6 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期四, 12 九月 2024 14:54:06 +0800
Subject: [PATCH] 修改了家庭资产的显示问题
---
app/src/main/res/layout/item_tourism_experience.xml | 416 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 264 insertions(+), 152 deletions(-)
diff --git a/app/src/main/res/layout/item_tourism_experience.xml b/app/src/main/res/layout/item_tourism_experience.xml
index adeadf5..41289c5 100644
--- a/app/src/main/res/layout/item_tourism_experience.xml
+++ b/app/src/main/res/layout/item_tourism_experience.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
@@ -30,38 +30,63 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_title"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_40"
- android:gravity="center_vertical">
+ android:layout_height="40dp"
+ android:gravity="center_vertical"
+ >
+ <CheckBox
+ android:id="@+id/checkbox"
+ android:layout_width="18dp"
+ android:layout_height="18dp"
+ android:layout_marginStart="3dp"
+ android:layout_centerVertical="true"
+ android:button="?attr/checkboxSelector"
+ android:background="?selectableItemBackgroundBorderless"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ />
<TextView
- android:id="@+id/textView2"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginStart="25dp"
- android:text="@{bean.title}"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="28dp"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text="@{bean.address}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_16"
- android:textStyle="bold"
+ android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- tools:text="娓镐簯鍗�" />
-
-
+ app:layout_constraintVertical_bias="0.437"
+ app:layout_constraintWidth_percent="0.5"
+ tools:text="寮犳皬App绔嬮」" />
<TextView
- android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.time}"
- android:textColor="@color/black"
android:textSize="16sp"
- android:layout_marginEnd="25dp"
- android:textStyle="bold"
+ android:textColor="@color/black"
+ android:text="@{bean.happenDate}"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ tools:text="2023-05-16"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/iv_fold"
+ android:layout_marginEnd="10dp"
+ />
+ <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>
@@ -70,196 +95,283 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingHorizontal="35dp"
+ android:paddingHorizontal="40dp"
>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
- >
- <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"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{bean.address}"
- android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
- >
- <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"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{bean.person}"
- android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
- >
- <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"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{bean.travelTime}"
- android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
- >
- <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"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{bean.certificate}"
- android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
- />
- </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"
+ android:orientation="horizontal">
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="璐圭敤锛�"
+ 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.cost}"
+ android:text="@{bean.scenic}"
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: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.free==1?`鍏垂`:`鑷垂`}"
+ android:text="@{bean.hotel}"
android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+ android:textSize="12sp"
/>
</LinearLayout>
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="6dp"
>
- <TextView
+ <LinearLayout
+ android:id="@+id/layout_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="澶囨敞锛�"
- android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
- />
- <TextView
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/layout_2"
+ app:layout_constraintHorizontal_chainStyle="spread_inside"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="闂ㄧエ璐癸細"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.entrance}"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.remark}"
- android:textColor="@color/black"
- android:textSize="@dimen/sp_12"
- android:textStyle="bold"
- />
- </LinearLayout>
+ app:layout_constraintEnd_toStartOf="@id/layout_3"
+ app:layout_constraintStart_toEndOf="@id/layout_1"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浣忓璐癸細"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.stay}"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/layout_2"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text=""
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_4"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/layout_1"
+ app:layout_constraintStart_toStartOf="@id/layout_1"
+ android:layout_marginTop="6dp"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="椁愯垂锛�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.eat}"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_5"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="@id/layout_4"
+ app:layout_constraintStart_toStartOf="@id/layout_2"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浜ら�氳垂锛�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.travel}"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_6"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/layout_4"
+ app:layout_constraintStart_toStartOf="@id/layout_4"
+ android:layout_marginTop="6dp"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍏朵粬璐圭敤锛�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.otherCost}"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+ </LinearLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
<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:textStyle="bold"
+ 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:itemCount="3"
+ tools:listitem="@layout/item_electronic_file"
+ tools:itemCount="1"
/>
</LinearLayout>
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginBottom="@dimen/dp_12"
+ android:visibility="gone"
+ >
+ <LinearLayout
+ android:id="@+id/layout_modify"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_modify"
+ android:layout_gravity="center"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="淇敼"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_14"
+
+ android:layout_marginStart="@dimen/dp_4"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_delete"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_marginStart="@dimen/dp_52"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_delete"
+ android:layout_gravity="center"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍒犻櫎"
+ android:textColor="#FFE86F72"
+ android:textSize="@dimen/sp_14"
+
+ android:layout_marginStart="@dimen/dp_4"
+ />
+ </LinearLayout>
+ </LinearLayout>
</LinearLayout>
</LinearLayout>
--
Gitblit v1.9.1