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_consume_record.xml | 113 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 25 deletions(-)
diff --git a/app/src/main/res/layout/item_consume_record.xml b/app/src/main/res/layout/item_consume_record.xml
index df008bd..5cf7b6a 100644
--- a/app/src/main/res/layout/item_consume_record.xml
+++ b/app/src/main/res/layout/item_consume_record.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<data>
+ <variable
+ name="viewModel"
+ type="com.application.zhangshi_app_android.ui.function.TourismDetailActivityViewModel" />
<variable
name="bean"
type="com.application.zhangshi_app_android.bean.ConsumeRecordBean" />
@@ -17,7 +21,7 @@
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="鎬婚噾棰�"
+ android:text="鍐呭"
android:textColor="#767375"
android:textSize="12sp" />
<LinearLayout
@@ -34,12 +38,17 @@
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:text="@={bean.content}"
- android:textSize="16sp" />
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ唴瀹筦:``}"
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
<ImageView
+ android:id="@+id/iv_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_delete_tourism"
android:layout_marginHorizontal="16dp"
+ android:visibility="@{viewModel.typeLiveData}"
/>
</LinearLayout>
<LinearLayout
@@ -60,14 +69,38 @@
android:textColor="#767375"
android:textSize="12sp" />
- <EditText
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:text="@={bean.totalMoney}"
- android:textSize="16sp" />
+ >
+
+ <EditText
+ android:id="@+id/et_total_cost"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:text="@={bean.totalCost}"
+ android:textColor="#DE000000"
+ android:textColorHint="#6b000000"
+ android:textSize="16sp"
+ android:enabled="false"
+ android:backgroundTint="#6B000000"
+ tools:text="1490"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ />
+ <View
+ android:id="@+id/view_mask"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_total_cost"
+ app:layout_constraintStart_toStartOf="@id/et_total_cost"
+ app:layout_constraintBottom_toBottomOf="@id/et_total_cost"
+ app:layout_constraintEnd_toEndOf="@id/et_total_cost"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
@@ -85,14 +118,20 @@
android:textColor="#767375"
android:textSize="12sp" />
- <EditText
+ <androidx.appcompat.widget.AppCompatEditText
+ android:id="@+id/et_eat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
+ android:inputType="numberDecimal"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={bean.mealMoney}"
- android:textSize="16sp" />
+ android:text="@={bean.eat}"
+ android:hint="0"
+ android:textSize="16sp"
+ android:maxLines="1"
+ android:enabled="@{viewModel.typeLiveData}"
+ app:need_modify_null="@{true}"
+ />
</LinearLayout>
</LinearLayout>
@@ -114,15 +153,21 @@
android:textColor="#767375"
android:textSize="12sp"
/>
- <EditText
+ <androidx.appcompat.widget.AppCompatEditText
+ android:id="@+id/et_stay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
+ android:inputType="numberDecimal"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
tools:text="aaa"
- android:text="@={bean.hotelMoney}"
- android:textSize="16sp" />
+ android:text="@={bean.stay}"
+ android:hint="0"
+ app:need_modify_null="@{true}"
+ android:textSize="16sp"
+ android:maxLines="1"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
</LinearLayout>
<LinearLayout
@@ -140,13 +185,19 @@
android:textSize="12sp"
/>
<EditText
+ android:id="@+id/et_traffic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
+ android:inputType="numberDecimal"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={bean.trafficMoney}"
- android:textSize="16sp" />
+ android:text="@={bean.traffic}"
+ android:hint="0"
+ app:need_modify_null="@{true}"
+ android:textSize="16sp"
+ android:maxLines="1"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
</LinearLayout>
</LinearLayout>
@@ -169,14 +220,20 @@
android:textSize="12sp"
/>
<EditText
+ android:id="@+id/et_entrance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
+ android:inputType="numberDecimal"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
tools:text="aaa"
- android:text="@={bean.ticketMoney}"
- android:textSize="16sp" />
+ android:text="@={bean.entrance}"
+ android:hint="0"
+ app:need_modify_null="@{true}"
+ android:textSize="16sp"
+ android:maxLines="1"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
</LinearLayout>
<LinearLayout
@@ -194,13 +251,19 @@
android:textSize="12sp"
/>
<EditText
+ android:id="@+id/et_shopping"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
+ android:inputType="numberDecimal"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={bean.shoppingMoney}"
- android:textSize="16sp" />
+ android:text="@={bean.shopping}"
+ android:hint="0"
+ app:need_modify_null="@{true}"
+ android:textSize="16sp"
+ android:maxLines="1"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
</LinearLayout>
</LinearLayout>
--
Gitblit v1.9.1