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_home_devices_detail.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/layout/activity_home_devices_detail.xml b/app/src/main/res/layout/activity_home_devices_detail.xml
index af40a90..3f7ce69 100644
--- a/app/src/main/res/layout/activity_home_devices_detail.xml
+++ b/app/src/main/res/layout/activity_home_devices_detail.xml
@@ -13,14 +13,14 @@
<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
android:id="@+id/titleBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="@{viewModel.beanLiveData.id!=0?viewModel.beanLiveData.name:`娣诲姞璁惧`}"
+ app:title="@{viewModel.beanLiveData.id!=0?viewModel.beanLiveData.name:`娣诲姞瀹跺涵璁惧`}"
app:titleGravity="left"
>
<FrameLayout
@@ -28,6 +28,7 @@
android:layout_height="24dp"
android:layout_marginHorizontal="16dp"
android:layout_gravity="center_vertical|end"
+ android:visibility="@{viewModel.beanLiveData.ownData==1}"
>
<ImageView
android:id="@+id/iv_operate"
@@ -94,7 +95,7 @@
android:textColor="#DE000000"
android:text="@={viewModel.beanLiveData.happenTime}"
android:textSize="16sp"
- android:clickable="@{viewModel.typeLiveData}"
+ android:enabled="@{viewModel.typeLiveData}"
app:isEditable="@{false}"
/>
<TextView
--
Gitblit v1.9.1