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/activity_family_memorabilia_detail.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/layout/activity_family_memorabilia_detail.xml b/app/src/main/res/layout/activity_family_memorabilia_detail.xml
index 36d0157..4f038a2 100644
--- a/app/src/main/res/layout/activity_family_memorabilia_detail.xml
+++ b/app/src/main/res/layout/activity_family_memorabilia_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
@@ -89,13 +89,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ椂闂�(鏍煎紡锛�2001-01-01)`:``}"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鏃堕棿`:``}"
android:inputType="text"
android:text="@={viewModel.beanLiveData.happenTime}"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="16sp"
- android:clickable="@{viewModel.typeLiveData}"
+ android:enabled="@{viewModel.typeLiveData}"
app:isEditable="@{false}"
/>
--
Gitblit v1.9.1