zhangshi_app_android.git

			@@ -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