Browse Source

1.添加已购买问诊详情UI

王鹏鹏 2 years ago
parent
commit
ca9210a9f7

+ 5 - 1
.idea/misc.xml

@@ -36,10 +36,13 @@
         <entry key="..\:/workspace/hcp-pad/common/src/main/res/layout/common_content_loading_dialog.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/common/src/main/res/layout/ugckit_fragment_dialog_permission_introduction.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_button_submitl.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_cancel_order.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_condition_describe.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_consult.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_consultation_record.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_contact_doctor.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_continue_consultation.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_doctor_details.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_doctor_status.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_go_consultation.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_home_page_content.xml" value="0.155" />
@@ -47,6 +50,7 @@
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_home_page_title.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_image_upload_selector.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_selected.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_status.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_timing.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_unselected.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_recommended_doctor.xml" value="0.155" />
@@ -70,7 +74,7 @@
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_evaluate.xml" value="0.264" />
         <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" />
-        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_paid.xml" value="0.264" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_paid.xml" value="0.5371900826446281" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/activity_payment.xml" value="0.31773743016759776" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/dialog_select_pic.xml" value="0.4421768707482993" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/fragment_evaluate.xml" value="0.22239583333333332" />

+ 2 - 2
baselib/build.gradle

@@ -40,7 +40,7 @@ android {
             buildConfigField "String", "BAIDU_SECRETKEY", "\"41Fzb2ZIuKRGNtrVcQOHxEI3vFM4Rkxi\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"d400f20398\""
-            buildConfigField "String", "API_URL", "\"http://192.168.0.117:8110\""
+            buildConfigField "String", "API_URL", "\"http://60.205.201.7:8110\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
 
@@ -54,7 +54,7 @@ android {
             buildConfigField "String", "BAIDU_SECRETKEY", "\"41Fzb2ZIuKRGNtrVcQOHxEI3vFM4Rkxi\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"ad3db4d529\""
-            buildConfigField "String", "API_URL", "\"http://192.168.0.117:8110\""
+            buildConfigField "String", "API_URL", "\"http://60.205.201.7:8110\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

+ 4 - 0
baselib/src/main/java/com/yingyangfly/baselib/router/RouterUrlCommon.kt

@@ -160,5 +160,9 @@ object RouterUrlCommon {
      */
     const val payment = "/payment/payment"
 
+    /**
+     * 订单详情
+     */
+    const val paid = "/paid/paid"
 
 }

+ 6 - 0
healthconsultation/src/main/AndroidManifest.xml

@@ -44,5 +44,11 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
+
+        <activity
+            android:name="com.yingyang.healthconsultation.paid.PaidActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
     </application>
 </manifest>

+ 3 - 0
healthconsultation/src/main/java/com/yingyang/healthconsultation/paid/PaidActivity.kt

@@ -1,11 +1,14 @@
 package com.yingyang.healthconsultation.paid
 
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyang.healthconsultation.databinding.ActivityPaidBinding
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
+import com.yingyangfly.baselib.router.RouterUrlCommon
 
 /**
  * 已支付
  */
+@Route(path = RouterUrlCommon.paid)
 class PaidActivity : BaseMVVMActivity<ActivityPaidBinding, PaidViewModel>() {
 
     override fun initViews() {

+ 6 - 0
healthconsultation/src/main/manifest/AndroidManifest.xml

@@ -43,5 +43,11 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
+
+        <activity
+            android:name="com.yingyang.healthconsultation.paid.PaidActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
     </application>
 </manifest>

+ 8 - 0
healthconsultation/src/main/res/drawable/bg_cancel_order.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_13px" />
+    <stroke android:color="@color/color_FF4A76FF" android:width="@dimen/divider_1px"/>
+    <solid android:color="@android:color/white" />
+</shape>

+ 8 - 0
healthconsultation/src/main/res/drawable/bg_contact_doctor.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_13px" />
+    <stroke android:color="@color/color_FF4A76FF" android:width="@dimen/divider_1px"/>
+    <solid android:color="@color/color_FF4A76FF" />
+</shape>

+ 10 - 0
healthconsultation/src/main/res/drawable/bg_doctor_details.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_20px" />
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FFCFCFCF" />
+    <solid android:color="@android:color/white" />
+</shape>

+ 7 - 0
healthconsultation/src/main/res/drawable/bg_payment_status.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_27px" />
+    <solid android:color="@color/color_FF352FFF" />
+</shape>

+ 336 - 1
healthconsultation/src/main/res/layout/activity_paid.xml

@@ -16,7 +16,7 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="wrap_content">
 
                 <LinearLayout
                     android:id="@+id/backLayout"
@@ -59,7 +59,342 @@
                     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">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:paddingBottom="@dimen/divider_26px">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvStatus"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/divider_54px"
+                        android:layout_marginStart="@dimen/divider_36px"
+                        android:layout_marginTop="@dimen/divider_17px"
+                        android:layout_marginEnd="@dimen/divider_36px"
+                        android:background="@drawable/bg_payment_status"
+                        android:gravity="center"
+                        android:text="@string/the_order_has_been_paid_waiting_for_the_doctor_reply"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_24px"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvOrderType"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_34px"
+                        android:text="@string/order_type"
+                        android:textColor="@color/color_FF000000"
+                        android:textSize="@dimen/divider_28px"
+                        android:textStyle="bold"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvStatus" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/divider_34px"
+                        android:layout_marginEnd="@dimen/divider_20px"
+                        android:text="@string/inquiries_consultation"
+                        android:textColor="@color/color_FF000000"
+                        android:textSize="@dimen/divider_28px"
+                        android:textStyle="bold"
+                        app:layout_constraintEnd_toStartOf="@+id/tvOrderMoney"
+                        app:layout_constraintTop_toBottomOf="@+id/tvStatus"
+                        tools:text="图文问诊  ¥ 69.00" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvOrderMoney"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/divider_32px"
+                        android:layout_marginEnd="@dimen/divider_36px"
+                        android:textColor="@color/color_FF000000"
+                        android:textSize="@dimen/divider_32px"
+                        android:textStyle="bold"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvStatus"
+                        tools:text="图文问诊  ¥ 69.00" />
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/doctorLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/divider_151px"
+                        android:layout_marginStart="@dimen/divider_36px"
+                        android:layout_marginTop="@dimen/divider_16px"
+                        android:layout_marginEnd="@dimen/divider_36px"
+                        android:background="@drawable/bg_doctor_details"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvOrderType">
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:id="@+id/imageHead"
+                            android:layout_width="@dimen/divider_100px"
+                            android:layout_height="@dimen/divider_100px"
+                            android:layout_marginStart="@dimen/divider_32px"
+                            android:layout_marginTop="@dimen/divider_25px"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvName"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_32px"
+                            android:layout_marginTop="@dimen/divider_40px"
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_28px"
+                            android:textStyle="bold"
+                            app:layout_constraintStart_toEndOf="@+id/imageHead"
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:text="@string/app_name" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvDuties"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_32px"
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_24px"
+                            app:layout_constraintStart_toEndOf="@+id/imageHead"
+                            app:layout_constraintTop_toBottomOf="@+id/tvName"
+                            tools:text="@string/app_name" />
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:layout_width="@dimen/divider_15px"
+                            android:layout_height="@dimen/divider_30px"
+                            android:layout_marginEnd="@dimen/divider_32px"
+                            android:background="@mipmap/icon_arrow"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvConsultationContent"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_29px"
+                        android:text="@string/consultation_content"
+                        android:textColor="@color/color_FF333333"
+                        android:textSize="@dimen/divider_28px"
+                        android:textStyle="bold"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/doctorLayout" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvPatientInformation"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_12px"
+                        android:text="@string/patient_information"
+                        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/tvConsultationContent" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvTimeIllness"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_8px"
+                        android:text="@string/time_illness"
+                        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/tvPatientInformation" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvSeenDoctor"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_8px"
+                        android:text="@string/have_you_ever_seen_a_doctor"
+                        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/tvTimeIllness" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvConditionDescription"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_8px"
+                        android:text="@string/description_of_the_condition"
+                        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/tvSeenDoctor" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvUploadData"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_8px"
+                        android:text="@string/upload_data"
+                        android:textColor="@color/color_FF333333"
+                        android:textSize="@dimen/divider_24px"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvConditionDescription" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rvUploadData"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/divider_8px"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/tvUploadData"
+                        app:layout_constraintTop_toBottomOf="@+id/tvConditionDescription" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvOrderDetails"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_36px"
+                        android:layout_marginTop="@dimen/divider_32px"
+                        android:text="@string/order_details"
+                        android:textColor="@color/color_FF333333"
+                        android:textSize="@dimen/divider_24px"
+                        android:textStyle="bold"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/rvUploadData" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvOrderNumber"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_8px"
+                        android:text="@string/order_number"
+                        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/tvOrderDetails" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvOrderTime"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_8px"
+                        android:text="@string/order_time"
+                        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/tvOrderNumber" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvPayableAmount"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_8px"
+                        android:text="@string/payable_amount"
+                        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/tvOrderTime" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvPaidInAmount"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_8px"
+                        android:text="@string/paid_in_amount"
+                        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/tvPayableAmount" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvPaymentMethod"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_8px"
+                        android:text="@string/payment_method"
+                        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/tvPaidInAmount" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvPaymentTime"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_38px"
+                        android:layout_marginTop="@dimen/divider_8px"
+                        android:text="@string/payment_time"
+                        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/tvPaymentMethod" />
+
+                    <androidx.appcompat.widget.AppCompatButton
+                        android:id="@+id/btnCancleOrder"
+                        android:layout_width="@dimen/divider_240px"
+                        android:layout_height="@dimen/divider_68px"
+                        android:layout_marginStart="@dimen/divider_328px"
+                        android:layout_marginTop="@dimen/divider_78px"
+                        android:background="@drawable/bg_cancel_order"
+                        android:gravity="center"
+                        android:text="@string/cancellation_of_order"
+                        android:textColor="@color/color_FF4A76FF"
+                        android:textSize="@dimen/divider_28px"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tvPaymentTime" />
+
+                    <androidx.appcompat.widget.AppCompatButton
+                        android:id="@+id/btnContactDoctor"
+                        android:layout_width="@dimen/divider_240px"
+                        android:layout_height="@dimen/divider_68px"
+                        android:layout_marginStart="@dimen/divider_58px"
+                        android:layout_marginTop="@dimen/divider_78px"
+                        android:background="@drawable/bg_contact_doctor"
+                        android:gravity="center"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_28px"
+                        android:text="@string/contact_doctor"
+                        app:layout_constraintStart_toEndOf="@+id/btnCancleOrder"
+                        app:layout_constraintTop_toBottomOf="@+id/tvPaymentTime" />
 
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </com.google.android.material.card.MaterialCardView>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </layout>

BIN
healthconsultation/src/main/res/mipmap-xxhdpi/icon_arrow.png


+ 2 - 0
healthconsultation/src/main/res/values/colors.xml

@@ -23,4 +23,6 @@
     <color name="color_FFFF922F" tools:ignore="ResourceName">#FFFF922F</color>
     <color name="color_FF2A55FF" tools:ignore="ResourceName">#FF2A55FF</color>
     <color name="color_1890FF" tools:ignore="ResourceName">#1890FF</color>
+    <color name="color_FF352FFF" tools:ignore="ResourceName">#FF352FFF</color>
+    <color name="color_FFCFCFCF" tools:ignore="ResourceName">#FFCFCFCF</color>
 </resources>

+ 3 - 0
healthconsultation/src/main/res/values/dimens.xml

@@ -36,6 +36,7 @@
     <dimen name="divider_331px" tools:ignore="ResourceName">331px</dimen>
     <dimen name="divider_330px" tools:ignore="ResourceName">330px</dimen>
     <dimen name="divider_329px" tools:ignore="ResourceName">329px</dimen>
+    <dimen name="divider_328px" tools:ignore="ResourceName">328px</dimen>
     <dimen name="divider_327px" tools:ignore="ResourceName">327px</dimen>
     <dimen name="divider_320px" tools:ignore="ResourceName">320px</dimen>
     <dimen name="divider_313px" tools:ignore="ResourceName">313px</dimen>
@@ -53,6 +54,7 @@
     <dimen name="divider_250px" tools:ignore="ResourceName">250px</dimen>
     <dimen name="divider_249px" tools:ignore="ResourceName">249px</dimen>
     <dimen name="divider_245px" tools:ignore="ResourceName">245px</dimen>
+    <dimen name="divider_240px" tools:ignore="ResourceName">240px</dimen>
     <dimen name="divider_237px" tools:ignore="ResourceName">237px</dimen>
     <dimen name="divider_234px" tools:ignore="ResourceName">234px</dimen>
     <dimen name="divider_230px" tools:ignore="ResourceName">230px</dimen>
@@ -80,6 +82,7 @@
     <dimen name="divider_163px" tools:ignore="ResourceName">163px</dimen>
     <dimen name="divider_160px" tools:ignore="ResourceName">160px</dimen>
     <dimen name="divider_158px" tools:ignore="ResourceName">158px</dimen>
+    <dimen name="divider_151px" tools:ignore="ResourceName">151px</dimen>
     <dimen name="divider_142px" tools:ignore="ResourceName">142px</dimen>
     <dimen name="divider_141px" tools:ignore="ResourceName">141px</dimen>
     <dimen name="divider_140px" tools:ignore="ResourceName">140px</dimen>

+ 17 - 0
healthconsultation/src/main/res/values/strings.xml

@@ -34,4 +34,21 @@
     <string name="please_select_payment_method" tools:ignore="ResourceName">请选择支付方式</string>
     <string name="wechat_payment" tools:ignore="ResourceName">微信支付</string>
     <string name="alipay_payment" tools:ignore="ResourceName">支付宝支付</string>
+    <string name="the_order_has_been_paid_waiting_for_the_doctor_reply" tools:ignore="ResourceName">订单已支付,等待医生回复。医生会在24小时内回复您</string>
+    <string name="order_type" tools:ignore="ResourceName">订单类型</string>
+    <string name="consultation_content" tools:ignore="ResourceName">咨询内容</string>
+    <string name="patient_information" tools:ignore="ResourceName">患者信息: </string>
+    <string name="time_illness" tools:ignore="ResourceName">患病时间: </string>
+    <string name="have_you_ever_seen_a_doctor" tools:ignore="ResourceName">是否就诊过: </string>
+    <string name="description_of_the_condition" tools:ignore="ResourceName">病情描述: </string>
+    <string name="upload_data" tools:ignore="ResourceName">上传资料</string>
+    <string name="order_details" tools:ignore="ResourceName">订单详情</string>
+    <string name="order_number" tools:ignore="ResourceName">订单编号</string>
+    <string name="order_time" tools:ignore="ResourceName">下单时间</string>
+    <string name="payable_amount" tools:ignore="ResourceName">应付金额</string>
+    <string name="paid_in_amount" tools:ignore="ResourceName">实付金额</string>
+    <string name="payment_method" tools:ignore="ResourceName">支付方式</string>
+    <string name="payment_time" tools:ignore="ResourceName">支付时间</string>
+    <string name="contact_doctor" tools:ignore="ResourceName">联系医生</string>
+    <string name="cancellation_of_order" tools:ignore="ResourceName">取消订单</string>
 </resources>