1.添加问诊申请UI

.idea/misc.xml

@@ -49,9 +49,11 @@
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_sick_unselected.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_submit.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_unselected_item.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/selector_agreement _checkbox.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/selector_agreement_checkbox.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/selector_bean_hospital.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_consultation_request.xml" value="0.4421768707482993" />
-        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_consultation_sheet.xml" value="0.4744525547445255" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_consultation_sheet.xml" value="0.72" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_doctor_details.xml" value="0.42051756007393715" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_health_consultation.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_main.xml" value="0.23697916666666666" />

healthconsultation/src/main/res/drawable/selector_agreement_checkbox.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingDefaultResource,ResourceName">
+    <item android:drawable="@mipmap/icon_agree_select" android:state_checked="true" />
+    <item android:drawable="@mipmap/icon_disagree_select" android:state_checked="false" />
+</selector>

healthconsultation/src/main/res/layout/activity_consultation_sheet.xml

@@ -4,188 +4,268 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@mipmap/icon_uniform_background">
 
         <LinearLayout
-            android:id="@+id/backLayout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/divider_65px"
-            android:layout_marginTop="@dimen/divider_35px"
-            android:gravity="center"
-            android:orientation="horizontal"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="@dimen/divider_48px"
-                android:layout_height="@dimen/divider_48px"
-                android:background="@mipmap/icon_back" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/divider_14px"
-                android:text="@string/back_pager"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_28px"
-                android:textStyle="bold" />
-
-        </LinearLayout>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/divider_32px"
-            android:text="@string/consultation_request"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/divider_38px"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginStart="@dimen/divider_21px"
-            android:layout_marginTop="@dimen/divider_24px"
-            android:layout_marginEnd="@dimen/divider_22px"
-            android:layout_marginBottom="@dimen/divider_21px"
-            android:theme="@style/Theme.MaterialComponents.NoActionBar"
-            app:cardBackgroundColor="@android:color/white"
-            app:cardCornerRadius="@dimen/divider_28px"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvTitle">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="wrap_content">
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tvConditionInfo"
+                <LinearLayout
+                    android:id="@+id/backLayout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/divider_36px"
-                    android:layout_marginTop="@dimen/divider_33px"
-                    android:text="@string/please_describe_your_condition"
-                    android:textColor="@android:color/black"
-                    android:textSize="@dimen/divider_28px"
-                    android:textStyle="bold"
+                    android:layout_marginStart="@dimen/divider_65px"
+                    android:layout_marginTop="@dimen/divider_35px"
+                    android:gravity="center"
+                    android:orientation="horizontal"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent">
 
-                <androidx.appcompat.widget.AppCompatEditText
-                    android:id="@+id/editCondition"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/divider_38px"
-                    android:layout_marginTop="@dimen/divider_16px"
-                    android:layout_marginEnd="@dimen/divider_38px"
-                    android:background="@drawable/bg_condition_describe"
-                    android:gravity="top|start"
-                    android:inputType="text"
-                    android:minHeight="@dimen/divider_138px"
-                    android:padding="@dimen/divider_8px"
-                    android:textColor="@android:color/black"
-                    android:textSize="@dimen/divider_24px"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvConditionInfo" />
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="@dimen/divider_48px"
+                        android:layout_height="@dimen/divider_48px"
+                        android:background="@mipmap/icon_back" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tvSickTime"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/divider_36px"
-                    android:layout_marginTop="@dimen/divider_32px"
-                    android:text="@string/how_long_have_you_been_sick"
-                    android:textColor="@android:color/black"
-                    android:textSize="@dimen/divider_28px"
-                    android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/editCondition" />
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_14px"
+                        android:text="@string/back_pager"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_28px"
+                        android:textStyle="bold" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rvSickTime"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/divider_12px"
-                    android:layout_marginTop="@dimen/divider_16px"
-                    android:layout_marginEnd="@dimen/divider_12px"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvSickTime" />
+                </LinearLayout>
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tvBeenHospital"
+                    android:id="@+id/tvTitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/divider_36px"
                     android:layout_marginTop="@dimen/divider_32px"
-                    android:text="@string/have_you_ever_been_to_a_hospital"
-                    android:textColor="@android:color/black"
-                    android:textSize="@dimen/divider_28px"
+                    android:text="@string/consultation_request"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_38px"
                     android:textStyle="bold"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/rvSickTime" />
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginStart="@dimen/divider_21px"
+                android:layout_marginTop="@dimen/divider_24px"
+                android:layout_marginEnd="@dimen/divider_22px"
+                android:layout_marginBottom="@dimen/divider_21px"
+                android:theme="@style/Theme.MaterialComponents.NoActionBar"
+                app:cardBackgroundColor="@android:color/white"
+                app:cardCornerRadius="@dimen/divider_28px">
 
-                <RadioGroup
-                    android:id="@+id/radioBeenHospital"
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/divider_37px"
-                    android:layout_marginTop="@dimen/divider_16px"
-                    android:orientation="horizontal"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvBeenHospital">
+                    android:layout_height="match_parent"
+                    android:paddingBottom="@dimen/divider_26px">
 
-                    <RadioButton
-                        android:layout_width="@dimen/divider_196px"
-                        android:layout_height="@dimen/divider_58px"
-                        android:background="@drawable/selector_bean_hospital"
-                        android:button="@null"
-                        android:gravity="center"
-                        android:text="@string/correct"
-                        android:textColor="@color/selector_radio_color"
-                        android:textSize="@dimen/divider_24px" />
-
-                    <RadioButton
-                        android:layout_width="@dimen/divider_196px"
-                        android:layout_height="@dimen/divider_58px"
-                        android:layout_marginStart="@dimen/divider_25px"
-                        android:background="@drawable/selector_bean_hospital"
-                        android:button="@null"
-                        android:gravity="center"
-                        android:text="@string/deny"
-                        android:textColor="@color/selector_radio_color"
-                        android:textSize="@dimen/divider_24px" />
-                </RadioGroup>
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvConditionInfo"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_36px"
+                        android:layout_marginTop="@dimen/divider_33px"
+                        android:text="@string/please_describe_your_condition"
+                        android:textColor="@color/color_FF000000"
+                        android:textSize="@dimen/divider_28px"
+                        android:textStyle="bold"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tvUploadRecordInfo"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/divider_36px"
-                    android:layout_marginTop="@dimen/divider_32px"
-                    android:text="@string/upload_medical_record_information"
-                    android:textColor="@android:color/black"
-                    android:textSize="@dimen/divider_28px"
-                    android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/radioBeenHospital" />
+                    <androidx.appcompat.widget.AppCompatEditText
+                        android:id="@+id/editCondition"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_16px"
+                        android:layout_marginEnd="@dimen/divider_38px"
+                        android:background="@drawable/bg_condition_describe"
+                        android:gravity="top|start"
+                        android:inputType="text"
+                        android:minHeight="@dimen/divider_138px"
+                        android:padding="@dimen/divider_8px"
+                        android:textColor="@color/color_FF000000"
+                        android:textSize="@dimen/divider_24px"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvConditionInfo" />
 
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvSickTime"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_36px"
+                        android:layout_marginTop="@dimen/divider_32px"
+                        android:text="@string/how_long_have_you_been_sick"
+                        android:textColor="@color/color_FF000000"
+                        android:textSize="@dimen/divider_28px"
+                        android:textStyle="bold"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/editCondition" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rvSickTime"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_12px"
+                        android:layout_marginTop="@dimen/divider_16px"
+                        android:layout_marginEnd="@dimen/divider_12px"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvSickTime" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvBeenHospital"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_36px"
+                        android:layout_marginTop="@dimen/divider_32px"
+                        android:text="@string/have_you_ever_been_to_a_hospital"
+                        android:textColor="@color/color_FF000000"
+                        android:textSize="@dimen/divider_28px"
+                        android:textStyle="bold"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/rvSickTime" />
+
+                    <RadioGroup
+                        android:id="@+id/radioBeenHospital"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_37px"
+                        android:layout_marginTop="@dimen/divider_16px"
+                        android:orientation="horizontal"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvBeenHospital">
+
+                        <RadioButton
+                            android:layout_width="@dimen/divider_196px"
+                            android:layout_height="@dimen/divider_58px"
+                            android:background="@drawable/selector_bean_hospital"
+                            android:button="@null"
+                            android:gravity="center"
+                            android:text="@string/correct"
+                            android:textColor="@color/selector_radio_color"
+                            android:textSize="@dimen/divider_24px" />
+
+                        <RadioButton
+                            android:layout_width="@dimen/divider_196px"
+                            android:layout_height="@dimen/divider_58px"
+                            android:layout_marginStart="@dimen/divider_25px"
+                            android:background="@drawable/selector_bean_hospital"
+                            android:button="@null"
+                            android:gravity="center"
+                            android:text="@string/deny"
+                            android:textColor="@color/selector_radio_color"
+                            android:textSize="@dimen/divider_24px" />
+                    </RadioGroup>
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvUploadRecordInfo"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_36px"
+                        android:layout_marginTop="@dimen/divider_32px"
+                        android:text="@string/upload_medical_record_information"
+                        android:textColor="@color/color_FF000000"
+                        android:textSize="@dimen/divider_28px"
+                        android:textStyle="bold"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/radioBeenHospital" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rvPic"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_37px"
+                        android:layout_marginTop="@dimen/divider_28px"
+                        android:layout_marginEnd="@dimen/divider_37px"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvUploadRecordInfo" />
 
-        </com.google.android.material.card.MaterialCardView>
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvTipsOne"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_36px"
+                        android:layout_marginTop="@dimen/divider_13px"
+                        android:text="@string/upload_disease_description_related_medical_record_data"
+                        android:textColor="@color/color_FF666666"
+                        android:textSize="@dimen/divider_28px"
+                        android:textStyle="bold"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/rvPic" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvTipsTwo"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_26px"
+                        android:layout_marginTop="@dimen/divider_6px"
+                        android:text="@string/photos_only_visible_doctors_themselves"
+                        android:textColor="@color/color_FF666666"
+                        android:textSize="@dimen/divider_28px"
+                        android:textStyle="bold"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvTipsOne" />
+
+                    <CheckBox
+                        android:id="@+id/agreementBox"
+                        android:layout_width="@dimen/divider_32px"
+                        android:layout_height="@dimen/divider_32px"
+                        android:layout_marginStart="@dimen/divider_37px"
+                        android:layout_marginTop="@dimen/divider_21px"
+                        android:background="@drawable/selector_agreement_checkbox"
+                        android:button="@null"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvTipsTwo" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_12px"
+                        android:layout_marginTop="@dimen/divider_17px"
+                        android:text="@string/i_have_read_relevant_agreements_privacy_policies"
+                        android:textColor="@color/color_FF333333"
+                        android:textSize="@dimen/divider_28px"
+                        app:layout_constraintStart_toEndOf="@+id/agreementBox"
+                        app:layout_constraintTop_toBottomOf="@+id/tvTipsTwo" />
+
+                    <androidx.appcompat.widget.AppCompatButton
+                        android:id="@+id/btnSubmit"
+                        android:layout_width="@dimen/divider_290px"
+                        android:layout_height="@dimen/divider_75px"
+                        android:layout_marginTop="@dimen/divider_68px"
+                        android:layout_marginBottom="@dimen/divider_26px"
+                        android:background="@drawable/bg_submit"
+                        android:gravity="center"
+                        android:text="@string/submit"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_32px"
+                        android:textStyle="bold"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="@+id/agreementBox" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </com.google.android.material.card.MaterialCardView>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 </layout>

healthconsultation/src/main/res/values/colors.xml

@@ -16,4 +16,5 @@
     <color name="color_FF979797" tools:ignore="ResourceName">#FF979797</color>
     <color name="color_FFFFFFFF" tools:ignore="ResourceName">#FFFFFFFF</color>
     <color name="color_FF000000" tools:ignore="ResourceName">#FF000000</color>
+    <color name="color_FF666666" tools:ignore="ResourceName">#FF666666</color>
 </resources>

healthconsultation/src/main/res/values/strings.xml

@@ -20,4 +20,7 @@
     <string name="correct" tools:ignore="ResourceName">是</string>
     <string name="deny" tools:ignore="ResourceName">否</string>
     <string name="upload_medical_record_information" tools:ignore="ResourceName">上传病历资料</string>
+    <string name="upload_disease_description_related_medical_record_data" tools:ignore="ResourceName">上传疾病描述相关病历资料（最多上传9张）</string>
+    <string name="photos_only_visible_doctors_themselves" tools:ignore="ResourceName">（照片仅医生及自己可见）</string>
+    <string name="i_have_read_relevant_agreements_privacy_policies" tools:ignore="ResourceName">我已阅读相关协议及隐私政策</string>
 </resources>