From f278edbd3f0f809e4a3b59bf16d24c624a43f98d Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期四, 12 九月 2024 14:38:08 +0800
Subject: [PATCH] 修改了国籍和民族字段反转的问题
---
app/src/main/res/layout/activity_health_care.xml | 97 ++++++++++++++++++++++++++++++++----------------
1 files changed, 65 insertions(+), 32 deletions(-)
diff --git a/app/src/main/res/layout/activity_health_care.xml b/app/src/main/res/layout/activity_health_care.xml
index 6346ca2..91c9696 100644
--- a/app/src/main/res/layout/activity_health_care.xml
+++ b/app/src/main/res/layout/activity_health_care.xml
@@ -13,7 +13,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
@@ -24,6 +24,7 @@
app:layout_constraintTop_toTopOf="parent"
app:title="鍋ュ悍淇濆仴"
app:titleGravity="left"
+ app:leftIcon="@drawable/ic_back"
>
<FrameLayout
@@ -65,7 +66,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{viewModel.healthCareBaseInfoBeanLiveData.name +`鐜扮姸鍋ュ悍鎯呭喌淇℃伅`}"
+ android:text="@{viewModel.healthCareBaseInfoBeanLiveData.name!=null?viewModel.healthCareBaseInfoBeanLiveData.name+`鐜扮姸鍋ュ悍鎯呭喌淇℃伅`:`鐜扮姸鍋ュ悍鎯呭喌淇℃伅`}"
android:textColor="@color/black"
android:textSize="20sp"
tools:text="xxx鐜扮姸鍋ュ悍鎯呭喌淇℃伅"
@@ -98,13 +99,14 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareBaseInfoBeanLiveData.name}"
android:background="@null"
android:enabled="@{viewModel.typeLiveData}"
- android:textColor="#DE000000"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ鍚峘:``}"
android:textSize="14sp"
+ android:textColor="#DE000000"
android:layout_marginTop="5dp"
android:inputType="textMultiLine"
/>
@@ -132,11 +134,12 @@
/>
<TextView
android:id="@+id/tv_sex"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareBaseInfoBeanLiveData.sexStr}"
android:background="@null"
android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ�у埆`:``}"
android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
@@ -169,11 +172,13 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareBaseInfoBeanLiveData.educationLevel}"
android:background="@null"
- android:enabled="@{viewModel.typeLiveData}" android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ枃鍖栫▼搴:``}"
+ android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
android:inputType="textMultiLine"
@@ -201,11 +206,13 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareBaseInfoBeanLiveData.work}"
android:background="@null"
- android:enabled="@{viewModel.typeLiveData}" android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヨ亴涓歚:``}"
+ android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
android:inputType="textMultiLine"
@@ -238,11 +245,13 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareBaseInfoBeanLiveData.phone}"
android:background="@null"
- android:enabled="@{viewModel.typeLiveData}" android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ數璇漙:``}"
+ android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
android:inputType="phone"
@@ -270,11 +279,13 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareBaseInfoBeanLiveData.email}"
android:background="@null"
- android:enabled="@{viewModel.typeLiveData}" android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ數瀛愰偖浠禶:``}"
+ android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
android:inputType="textMultiLine"
@@ -307,11 +318,13 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareBaseInfoBeanLiveData.address}"
android:background="@null"
- android:enabled="@{viewModel.typeLiveData}" android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヤ綇鍧�`:``}"
+ android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
android:inputType="textMultiLine"
@@ -712,11 +725,13 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareBaseInfoBeanLiveData.medicine}"
android:background="@null"
- android:enabled="@{viewModel.typeLiveData}" android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ父鐢ㄨ嵂鐗ー:``}"
+ android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
android:inputType="textMultiLine"
@@ -744,11 +759,13 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareBaseInfoBeanLiveData.baseDisease}"
android:background="@null"
- android:enabled="@{viewModel.typeLiveData}" android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ洰鍓嶅熀纭�鐥卄:``}"
+ android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
android:inputType="textMultiLine"
@@ -825,11 +842,13 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareLifeHabitsBeanLiveData.eatGood}"
android:background="@null"
- android:enabled="@{viewModel.typeLiveData}" android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ラギ椋燂紙鍠滐級`:``}"
+ android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
android:inputType="textMultiLine"
@@ -858,11 +877,13 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareLifeHabitsBeanLiveData.eatBad}"
android:background="@null"
- android:enabled="@{viewModel.typeLiveData}" android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ラギ椋燂紙蹇岋級`:``}"
+ android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
android:inputType="textMultiLine"
@@ -896,11 +917,12 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareLifeHabitsBeanLiveData.hobby}"
android:background="@null"
android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ョ埍濂絗:``}"
android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
@@ -930,11 +952,13 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareLifeHabitsBeanLiveData.addition}"
android:background="@null"
- android:enabled="@{viewModel.typeLiveData}" android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ棞濂絗:``}"
+ android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
android:inputType="textMultiLine"
@@ -1148,11 +1172,12 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareLifeHabitsBeanLiveData.eatGood}"
android:background="@null"
android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュぇ渚块鐜嘸:``}"
android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
@@ -1182,11 +1207,13 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareLifeHabitsBeanLiveData.eatGood}"
android:background="@null"
- android:enabled="@{viewModel.typeLiveData}" android:textColor="#DE000000"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ皬渚块鐜嘸:``}"
+ android:textColor="#DE000000"
android:textSize="14sp"
android:layout_marginTop="5dp"
android:inputType="textMultiLine"
@@ -1738,6 +1765,7 @@
android:layout_marginTop="10dp"
app:cardCornerRadius="10dp"
app:cardElevation="2dp"
+ app:cardBackgroundColor="@color/white"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -1800,6 +1828,7 @@
android:text="@={viewModel.healthCareNursingExaminationBeanLiveData.temperature}"
android:background="@null"
android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヤ綋娓╁害鏁癭:``}"
android:textColor="#B3000000"
android:textSize="16sp"
android:layout_marginTop="5dp"
@@ -1829,11 +1858,12 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareNursingExaminationBeanLiveData.pulse}"
android:background="@null"
android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヨ剦鎼忛鐜嘸:``}"
android:textColor="#B3000000"
android:textSize="16sp"
android:layout_marginTop="5dp"
@@ -1868,11 +1898,12 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareNursingExaminationBeanLiveData.bloodPressure}"
android:background="@null"
android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヨ鍘媊:``}"
android:textColor="#B3000000"
android:textSize="16sp"
android:layout_marginTop="5dp"
@@ -1902,11 +1933,12 @@
android:alpha="0.54"
/>
<EditText
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@={viewModel.healthCareNursingExaminationBeanLiveData.weight}"
android:background="@null"
android:enabled="@{viewModel.typeLiveData}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヤ綋閲峘:``}"
android:textColor="#B3000000"
android:textSize="16sp"
android:layout_marginTop="5dp"
@@ -2575,6 +2607,7 @@
android:layout_marginTop="10dp"
app:cardCornerRadius="10dp"
app:cardElevation="2dp"
+ app:cardBackgroundColor="@color/white"
tools:layout_height="wrap_content"
>
<LinearLayout
--
Gitblit v1.9.1