|
|
@@ -90,7 +90,7 @@
|
|
|
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
|
|
- <androidx.constraintlayout.widget.ConstraintLayout
|
|
|
+ <androidx.core.widget.NestedScrollView
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="0dp"
|
|
|
android:layout_marginStart="@dimen/divider_60px"
|
|
|
@@ -99,104 +99,110 @@
|
|
|
android:layout_weight="1"
|
|
|
android:background="@drawable/bg_personal_center">
|
|
|
|
|
|
- <TextView
|
|
|
- android:id="@+id/tvName"
|
|
|
- style="@style/text_personal_center"
|
|
|
- android:layout_marginStart="@dimen/divider_33px"
|
|
|
- android:layout_marginTop="@dimen/divider_57px"
|
|
|
- android:text='@{"姓名:"+data.getUserNameInfo()}'
|
|
|
- app:layout_constraintEnd_toStartOf="@id/tvBirthday"
|
|
|
- app:layout_constraintStart_toStartOf="parent"
|
|
|
- app:layout_constraintTop_toTopOf="parent"
|
|
|
- tools:ignore="HardcodedText" />
|
|
|
+ <androidx.constraintlayout.widget.ConstraintLayout
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="match_parent">
|
|
|
|
|
|
- <TextView
|
|
|
- android:id="@+id/tvBirthday"
|
|
|
- style="@style/text_personal_center"
|
|
|
- android:text='@{"出生日期:"+data.getBirthDateInfo()}'
|
|
|
- app:layout_constraintBaseline_toBaselineOf="@+id/tvName"
|
|
|
- app:layout_constraintEnd_toEndOf="parent"
|
|
|
- app:layout_constraintStart_toEndOf="@id/tvName"
|
|
|
- app:layout_constraintTop_toTopOf="parent"
|
|
|
- tools:ignore="HardcodedText" />
|
|
|
|
|
|
- <TextView
|
|
|
- android:id="@+id/tvOpeningTrainingDate"
|
|
|
- style="@style/text_personal_center"
|
|
|
- android:layout_marginStart="@dimen/divider_33px"
|
|
|
- android:layout_marginTop="@dimen/divider_28px"
|
|
|
- android:text='@{"开通训练日期:"+data.getStartTime()}'
|
|
|
- app:layout_constraintEnd_toStartOf="@id/tvOrderDeadline"
|
|
|
- app:layout_constraintStart_toStartOf="parent"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/tvName"
|
|
|
- tools:ignore="HardcodedText" />
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tvName"
|
|
|
+ style="@style/text_personal_center"
|
|
|
+ android:layout_marginStart="@dimen/divider_33px"
|
|
|
+ android:layout_marginTop="@dimen/divider_57px"
|
|
|
+ android:text='@{"姓名:"+data.getUserNameInfo()}'
|
|
|
+ app:layout_constraintEnd_toStartOf="@id/tvBirthday"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="parent"
|
|
|
+ tools:ignore="HardcodedText" />
|
|
|
|
|
|
- <TextView
|
|
|
- android:id="@+id/tvOrderDeadline"
|
|
|
- style="@style/text_personal_center"
|
|
|
- android:text='@{"订单截止日期:"+data.getEndTime()}'
|
|
|
- app:layout_constraintBaseline_toBaselineOf="@+id/tvOpeningTrainingDate"
|
|
|
- app:layout_constraintEnd_toEndOf="parent"
|
|
|
- app:layout_constraintStart_toEndOf="@id/tvOpeningTrainingDate"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/tvBirthday"
|
|
|
- tools:ignore="HardcodedText" />
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tvBirthday"
|
|
|
+ style="@style/text_personal_center"
|
|
|
+ android:text='@{"出生日期:"+data.getBirthDateInfo()}'
|
|
|
+ app:layout_constraintBaseline_toBaselineOf="@+id/tvName"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toEndOf="@id/tvName"
|
|
|
+ app:layout_constraintTop_toTopOf="parent"
|
|
|
+ tools:ignore="HardcodedText" />
|
|
|
|
|
|
- <TextView
|
|
|
- android:id="@+id/tvDoctor"
|
|
|
- style="@style/text_personal_center"
|
|
|
- android:layout_marginStart="@dimen/divider_33px"
|
|
|
- android:layout_marginTop="@dimen/divider_25px"
|
|
|
- android:text='@{"医生:"+data.getDoctorNameInfo()}'
|
|
|
- app:layout_constraintEnd_toStartOf="@id/tvMedicineDepartment"
|
|
|
- app:layout_constraintStart_toStartOf="parent"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/tvOpeningTrainingDate"
|
|
|
- tools:ignore="HardcodedText" />
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tvOpeningTrainingDate"
|
|
|
+ style="@style/text_personal_center"
|
|
|
+ android:layout_marginStart="@dimen/divider_33px"
|
|
|
+ android:layout_marginTop="@dimen/divider_28px"
|
|
|
+ android:text='@{"开通训练日期:"+data.getStartTime()}'
|
|
|
+ app:layout_constraintEnd_toStartOf="@id/tvOrderDeadline"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tvName"
|
|
|
+ tools:ignore="HardcodedText" />
|
|
|
|
|
|
- <TextView
|
|
|
- android:id="@+id/tvMedicineDepartment"
|
|
|
- style="@style/text_personal_center"
|
|
|
- android:text='@{"院内科室:"+data.getHospitalDepartmentInfo()}'
|
|
|
- app:layout_constraintBaseline_toBaselineOf="@+id/tvDoctor"
|
|
|
- app:layout_constraintEnd_toEndOf="parent"
|
|
|
- app:layout_constraintStart_toEndOf="@id/tvDoctor"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/tvOpeningTrainingDate"
|
|
|
- tools:ignore="HardcodedText" />
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tvOrderDeadline"
|
|
|
+ style="@style/text_personal_center"
|
|
|
+ android:text='@{"订单截止日期:"+data.getEndTime()}'
|
|
|
+ app:layout_constraintBaseline_toBaselineOf="@+id/tvOpeningTrainingDate"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toEndOf="@id/tvOpeningTrainingDate"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tvBirthday"
|
|
|
+ tools:ignore="HardcodedText" />
|
|
|
|
|
|
- <TextView
|
|
|
- android:id="@+id/tvHospital"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:layout_marginStart="@dimen/divider_33px"
|
|
|
- android:layout_marginTop="@dimen/divider_25px"
|
|
|
- android:text='@{"就诊医院:"+data.getOrgNameInfo()}'
|
|
|
- android:textColor="@color/color_FF333333"
|
|
|
- android:textSize="@dimen/divider_24px"
|
|
|
- app:layout_constraintEnd_toEndOf="parent"
|
|
|
- app:layout_constraintStart_toStartOf="parent"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/tvDoctor"
|
|
|
- tools:ignore="HardcodedText" />
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tvDoctor"
|
|
|
+ style="@style/text_personal_center"
|
|
|
+ android:layout_marginStart="@dimen/divider_33px"
|
|
|
+ android:layout_marginTop="@dimen/divider_25px"
|
|
|
+ android:text='@{"医生:"+data.getDoctorNameInfo()}'
|
|
|
+ app:layout_constraintEnd_toStartOf="@id/tvMedicineDepartment"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tvOpeningTrainingDate"
|
|
|
+ tools:ignore="HardcodedText" />
|
|
|
|
|
|
- <TextView
|
|
|
- android:id="@+id/tvDiagnosis"
|
|
|
- style="@style/layout_properties_self_adaption"
|
|
|
- android:layout_marginStart="@dimen/divider_31px"
|
|
|
- android:layout_marginTop="@dimen/divider_38px"
|
|
|
- android:text="@string/diagnosis"
|
|
|
- android:textColor="@color/color_FF333333"
|
|
|
- android:textSize="@dimen/divider_24px"
|
|
|
- app:layout_constraintStart_toStartOf="parent"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/tvHospital" />
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tvMedicineDepartment"
|
|
|
+ style="@style/text_personal_center"
|
|
|
+ android:text='@{"院内科室:"+data.getHospitalDepartmentInfo()}'
|
|
|
+ app:layout_constraintBaseline_toBaselineOf="@+id/tvDoctor"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toEndOf="@id/tvDoctor"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tvOpeningTrainingDate"
|
|
|
+ tools:ignore="HardcodedText" />
|
|
|
|
|
|
- <androidx.recyclerview.widget.RecyclerView
|
|
|
- android:id="@+id/rvDiagnosis"
|
|
|
- android:layout_width="0dp"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:layout_marginTop="@dimen/divider_24px"
|
|
|
- app:layout_constraintEnd_toEndOf="parent"
|
|
|
- app:layout_constraintStart_toEndOf="@id/tvDiagnosis"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/tvHospital"
|
|
|
- tools:listitem="@layout/item_diagnosis" />
|
|
|
- </androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tvHospital"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginStart="@dimen/divider_33px"
|
|
|
+ android:layout_marginTop="@dimen/divider_25px"
|
|
|
+ android:text='@{"就诊医院:"+data.getOrgNameInfo()}'
|
|
|
+ android:textColor="@color/color_FF333333"
|
|
|
+ android:textSize="@dimen/divider_24px"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tvDoctor"
|
|
|
+ tools:ignore="HardcodedText" />
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tvDiagnosis"
|
|
|
+ style="@style/layout_properties_self_adaption"
|
|
|
+ android:layout_marginStart="@dimen/divider_31px"
|
|
|
+ android:layout_marginTop="@dimen/divider_38px"
|
|
|
+ android:text="@string/diagnosis"
|
|
|
+ android:textColor="@color/color_FF333333"
|
|
|
+ android:textSize="@dimen/divider_24px"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tvHospital" />
|
|
|
+
|
|
|
+ <androidx.recyclerview.widget.RecyclerView
|
|
|
+ android:id="@+id/rvDiagnosis"
|
|
|
+ android:layout_width="0dp"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginTop="@dimen/divider_24px"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toEndOf="@id/tvDiagnosis"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tvHospital"
|
|
|
+ tools:listitem="@layout/item_diagnosis" />
|
|
|
+ </androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
+ </androidx.core.widget.NestedScrollView>
|
|
|
|
|
|
<androidx.appcompat.widget.AppCompatButton
|
|
|
android:id="@+id/btnLoginOut"
|