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/activity_annual_health_status_detail.xml | 105 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 82 insertions(+), 23 deletions(-)
diff --git a/app/src/main/res/layout/activity_annual_health_status_detail.xml b/app/src/main/res/layout/activity_annual_health_status_detail.xml
index 53366db..b89fb34 100644
--- a/app/src/main/res/layout/activity_annual_health_status_detail.xml
+++ b/app/src/main/res/layout/activity_annual_health_status_detail.xml
@@ -12,22 +12,38 @@
<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:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="骞村害鍋ュ悍鐘跺喌"
+ app:title="@{viewModel.beanLiveData.id==-1?`鏂板缓灏卞尰淇℃伅`:viewModel.beanLiveData.title}"
app:titleGravity="left"
- />
+ app:leftIcon="@drawable/ic_back"
+ >
+ <FrameLayout
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center_vertical|end"
+ >
+
+ <ImageView
+ android:id="@+id/iv_operate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@{viewModel.typeLiveData?@drawable/ic_operate_finish:@drawable/ic_operate}" />
+ </FrameLayout>
+ </com.android.app_base.widget.ExtendTitleBar>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="20dp"
android:paddingBottom="20dp"
@@ -39,19 +55,40 @@
android:text="搴忓彿"
android:textColor="#767375"
android:textSize="12sp"
+ android:visibility="@{viewModel.beanLiveData.id!=-1?true:false}"
/>
-
- <EditText
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
- android:autofillHints="creditCardNumber"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:textSize="16sp"
- android:text="@{String.valueOf(viewModel.beanLiveData.id)}"
- />
+ android:visibility="@{viewModel.beanLiveData.id!=-1?true:false}"
+ >
+ <EditText
+ android:id="@+id/et_id"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:text="@{viewModel.beanLiveData.id==0?`-1`:viewModel.beanLiveData.id+``}"
+ android:enabled="false"
+ android:src="@color/color_non_editable"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_id"
+ app:layout_constraintStart_toStartOf="@id/et_id"
+ app:layout_constraintBottom_toBottomOf="@id/et_id"
+ app:layout_constraintEnd_toEndOf="@id/et_id"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
<TextView
android:layout_width="wrap_content"
@@ -63,13 +100,20 @@
/>
<EditText
+ android:id="@+id/et_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鏃堕棿`:``}"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.time}"
- android:textSize="16sp" />
+ android:text="@={viewModel.beanLiveData.checkTime}"
+ android:textSize="16sp"
+ app:isEditable="@{false}"
+ android:enabled="@{viewModel.typeLiveData}"
+
+ />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
@@ -84,9 +128,12 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ被鍒玚:``}"
android:text="@={viewModel.beanLiveData.type}"
android:textColor="#DE000000"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
@@ -101,14 +148,17 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ氨鐥呭尰闄:``}"
android:textColor="#DE000000"
android:text="@={viewModel.beanLiveData.hospital}"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="鎻愬悕"
+ android:text="棰樺悕"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -118,9 +168,12 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ラ鍚峘:``}"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.name}"
- android:textSize="16sp" />
+ android:text="@={viewModel.beanLiveData.title}"
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
@@ -135,9 +188,12 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ敞鎰忎簨椤筦:``}"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.attention}"
- android:textSize="16sp" />
+ android:text="@={viewModel.beanLiveData.notice}"
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
@@ -152,9 +208,12 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ娉╜:``}"
android:textColor="#DE000000"
android:text="@={viewModel.beanLiveData.remark}"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
--
Gitblit v1.9.1