Pārlūkot izejas kodu

1.添加评价记录功能

王鹏鹏 2 gadi atpakaļ
vecāks
revīzija
02f76484d1
23 mainītis faili ar 403 papildinājumiem un 9 dzēšanām
  1. 6 0
      .idea/misc.xml
  2. 6 0
      baselib/src/main/java/com/yingyangfly/baselib/router/RouterUrlCommon.kt
  3. 6 0
      healthconsultation/src/main/AndroidManifest.xml
  4. 0 1
      healthconsultation/src/main/java/com/yingyang/healthconsultation/activity/HealthConsultationActivity.kt
  5. 0 4
      healthconsultation/src/main/java/com/yingyang/healthconsultation/consultationsheet/ConsultationSheetActivity.kt
  6. 0 1
      healthconsultation/src/main/java/com/yingyang/healthconsultation/consultationsheet/ConsultationSheetViewModel.kt
  7. 0 1
      healthconsultation/src/main/java/com/yingyang/healthconsultation/evaluate/EvaluateViewModel.kt
  8. 0 1
      healthconsultation/src/main/java/com/yingyang/healthconsultation/net/HealthConsultationApiService.kt
  9. 79 0
      healthconsultation/src/main/java/com/yingyang/healthconsultation/payment/PaymentActivity.kt
  10. 11 0
      healthconsultation/src/main/java/com/yingyang/healthconsultation/payment/PaymentViewModel.kt
  11. 0 1
      healthconsultation/src/main/java/com/yingyang/healthconsultation/record/ConsultationRecordViewModel.kt
  12. 6 0
      healthconsultation/src/main/manifest/AndroidManifest.xml
  13. 7 0
      healthconsultation/src/main/res/drawable/bg_button_submit.xml
  14. 10 0
      healthconsultation/src/main/res/drawable/bg_payment_selected.xml
  15. 7 0
      healthconsultation/src/main/res/drawable/bg_payment_timing.xml
  16. 10 0
      healthconsultation/src/main/res/drawable/bg_payment_unselected.xml
  17. 246 0
      healthconsultation/src/main/res/layout/activity_payment.xml
  18. BIN
      healthconsultation/src/main/res/mipmap-xxhdpi/icon_alipay_ment.png
  19. BIN
      healthconsultation/src/main/res/mipmap-xxhdpi/icon_payment_selected.png
  20. BIN
      healthconsultation/src/main/res/mipmap-xxhdpi/icon_wechat_ment.png
  21. 2 0
      healthconsultation/src/main/res/values/colors.xml
  22. 2 0
      healthconsultation/src/main/res/values/dimens.xml
  23. 5 0
      healthconsultation/src/main/res/values/strings.xml

+ 6 - 0
.idea/misc.xml

@@ -34,6 +34,7 @@
         <entry key="..\:/workspace/hcp-pad/common/src/main/res/layout/common_activity_qr_code_scan.xml" value="0.23697916666666666" />
         <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_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" />
@@ -43,9 +44,13 @@
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_home_page_content.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_home_page_search.xml" value="0.155" />
         <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_payment_selected.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" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_select_pic.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_select_pic_item.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_selected__hospital.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_selected_item.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_sick_item.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_sick_selected.xml" value="0.155" />
@@ -62,6 +67,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_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" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/item_consultation.xml" value="0.3953084274543875" />

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

@@ -155,4 +155,10 @@ object RouterUrlCommon {
      */
     const val evaluate = "/evaluate/evaluate"
 
+    /**
+     * 订单支付
+     */
+    const val payment = "/payment/payment"
+
+
 }

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

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

+ 0 - 1
healthconsultation/src/main/java/com/yingyang/healthconsultation/activity/HealthConsultationActivity.kt

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.view.MotionEvent
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.alibaba.android.arouter.launcher.ARouter
 import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.adapter.ConsultationAdapter
 import com.yingyang.healthconsultation.adapter.RecommendDoctorAdapter

+ 0 - 4
healthconsultation/src/main/java/com/yingyang/healthconsultation/consultationsheet/ConsultationSheetActivity.kt

@@ -8,8 +8,6 @@ import android.text.TextUtils
 import android.view.MotionEvent
 import android.view.View
 import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.ProgressBar
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -25,10 +23,8 @@ import com.yingyangfly.baselib.adapter.XBaseAdapter
 import com.yingyangfly.baselib.ext.*
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
-import com.yingyangfly.baselib.utils.FileMultipartBuilder
 import com.yingyangfly.baselib.utils.GlideImgUtil
 import com.yingyangfly.baselib.utils.LogUtil
-import okhttp3.internal.notify
 import top.zibin.luban.Luban
 import top.zibin.luban.OnCompressListener
 import java.io.File

+ 0 - 1
healthconsultation/src/main/java/com/yingyang/healthconsultation/consultationsheet/ConsultationSheetViewModel.kt

@@ -4,7 +4,6 @@ import com.yingyang.healthconsultation.entity.UserInfoBean
 import com.yingyang.healthconsultation.net.HEALTHCONSULTATION_API
 import com.yingyangfly.baselib.mvvm.BaseViewModel
 import com.yingyangfly.baselib.utils.FileMultipartBuilder
-import okhttp3.MultipartBody
 import java.io.File
 
 /**

+ 0 - 1
healthconsultation/src/main/java/com/yingyang/healthconsultation/evaluate/EvaluateViewModel.kt

@@ -1,7 +1,6 @@
 package com.yingyang.healthconsultation.evaluate
 
 import com.yingyang.healthconsultation.entity.EvaluateRecordListBean
-import com.yingyang.healthconsultation.entity.EvaluateRecordsBean
 import com.yingyang.healthconsultation.entity.GetPatientReviewBean
 import com.yingyang.healthconsultation.net.HEALTHCONSULTATION_API
 import com.yingyangfly.baselib.mvvm.BaseViewModel

+ 0 - 1
healthconsultation/src/main/java/com/yingyang/healthconsultation/net/HealthConsultationApiService.kt

@@ -1,7 +1,6 @@
 package com.yingyang.healthconsultation.net
 
 import com.yingyang.healthconsultation.entity.EvaluateRecordListBean
-import com.yingyang.healthconsultation.entity.EvaluateRecordsBean
 import com.yingyang.healthconsultation.entity.UserInfoBean
 import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.net.BaseResp

+ 79 - 0
healthconsultation/src/main/java/com/yingyang/healthconsultation/payment/PaymentActivity.kt

@@ -0,0 +1,79 @@
+package com.yingyang.healthconsultation.payment
+
+import android.annotation.SuppressLint
+import android.view.MotionEvent
+import android.view.View
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.yingyang.healthconsultation.R
+import com.yingyang.healthconsultation.databinding.ActivityPaymentBinding
+import com.yingyangfly.baselib.ext.getEndAnimation
+import com.yingyangfly.baselib.ext.getScaleAnimation
+import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
+import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.RxTimer
+
+/**
+ * 订单支付
+ */
+@Route(path = RouterUrlCommon.payment)
+class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewModel>(),
+    View.OnTouchListener {
+
+    lateinit var rxTimer: RxTimer
+    var time: Long = 0
+
+    override fun initViews() {
+        rxTimer = RxTimer()
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun initListener() {
+        binding.backLayout.setOnTouchListener(this)
+    }
+
+    override fun initData() {
+        val m: Long = 1000
+        rxTimer.interval(m) {
+            time = 60 * 15 - it - 1
+            val minutes = time / 60
+            val seconds = time % 60
+            binding.tvTime.text = if (minutes > 0) {
+                if (seconds > 0) {
+                    "请在 $minutes 分钟 $seconds 秒内完成支付,超时将取消"
+                } else {
+                    "请在 $minutes 分钟 内完成支付,超时将取消"
+                }
+            } else {
+                "请在 $seconds 秒内完成支付,超时将取消"
+            }
+            if (it == time - 1) {
+                rxTimer.cancel()
+
+            }
+        }
+    }
+
+    override fun onTouch(v: View, event: MotionEvent): Boolean {
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> {
+                if (v.id == R.id.backLayout) {
+                    v.startAnimation(getScaleAnimation())
+                }
+            }
+            MotionEvent.ACTION_UP -> {
+                v.startAnimation(getEndAnimation())
+                when (v.id) {
+                    R.id.backLayout -> {
+                        finish()
+                    }
+                }
+            }
+            MotionEvent.ACTION_CANCEL -> {
+                if (v.id == R.id.backLayout) {
+                    v.startAnimation(getEndAnimation())
+                }
+            }
+        }
+        return true
+    }
+}

+ 11 - 0
healthconsultation/src/main/java/com/yingyang/healthconsultation/payment/PaymentViewModel.kt

@@ -0,0 +1,11 @@
+package com.yingyang.healthconsultation.payment
+
+import com.yingyangfly.baselib.mvvm.BaseViewModel
+
+/**
+ * @author 王鹏鹏
+ */
+class PaymentViewModel : BaseViewModel() {
+
+
+}

+ 0 - 1
healthconsultation/src/main/java/com/yingyang/healthconsultation/record/ConsultationRecordViewModel.kt

@@ -1,6 +1,5 @@
 package com.yingyang.healthconsultation.record
 
-import com.yingyang.healthconsultation.entity.UserInfoBean
 import com.yingyang.healthconsultation.net.HEALTHCONSULTATION_API
 import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.mvvm.BaseViewModel

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

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

+ 7 - 0
healthconsultation/src/main/res/drawable/bg_button_submit.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_13px" />
+    <solid android:color="@color/color_FF4A76FF" />
+</shape>

+ 10 - 0
healthconsultation/src/main/res/drawable/bg_payment_selected.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_12px" />
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF2A55FF" />
+    <solid android:color="@android:color/white" />
+</shape>

+ 7 - 0
healthconsultation/src/main/res/drawable/bg_payment_timing.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_FFFF922F" />
+</shape>

+ 10 - 0
healthconsultation/src/main/res/drawable/bg_payment_unselected.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_12px" />
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF979797" />
+    <solid android:color="@android:color/white" />
+</shape>

+ 246 - 0
healthconsultation/src/main/res/layout/activity_payment.xml

@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@mipmap/icon_uniform_background">
+
+        <LinearLayout
+            android:id="@+id/backLayout"
+            android:layout_width="@dimen/divider_195px"
+            android:layout_height="wrap_content"
+            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_43px"
+                android:layout_marginStart="@dimen/divider_37px"
+                android:layout_marginTop="@dimen/divider_36px"
+                android:background="@mipmap/bg_home" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_14px"
+                android:layout_marginTop="@dimen/divider_32px"
+                android:text="@string/back_pager"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_38px"
+                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_24px"
+            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_22px"
+            android:layout_marginTop="@dimen/divider_33px"
+            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">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvTime"
+                    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_timing"
+                    android:gravity="center"
+                    android:text="@string/please_complete_payment_within_minutes_any_delay_cancelle"
+                    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/tvGraphicConsultation"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_41px"
+                    android:layout_marginTop="@dimen/divider_16px"
+                    android:text="@string/inquiries_consultation"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_28px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvTime" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvDocotrName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_36px"
+                    android:layout_marginTop="@dimen/divider_15px"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_28px"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvGraphicConsultation"
+                    tools:text="@string/inquiries_consultation" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvMoney"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/divider_67px"
+                    android:layout_marginEnd="@dimen/divider_36px"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_28px"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvTime"
+                    tools:text="@string/inquiries_consultation" />
+
+                <View
+                    android:id="@+id/lineView"
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:layout_marginStart="@dimen/divider_39px"
+                    android:layout_marginTop="@dimen/divider_32px"
+                    android:layout_marginEnd="@dimen/divider_9px"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvMoney" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvPayment"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_39px"
+                    android:layout_marginTop="@dimen/divider_31px"
+                    android:text="@string/please_select_payment_method"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_28px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/lineView" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/wechatLayout"
+                    android:layout_width="@dimen/divider_371px"
+                    android:layout_height="@dimen/divider_90px"
+                    android:layout_marginStart="@dimen/divider_37px"
+                    android:layout_marginTop="@dimen/divider_16px"
+                    android:background="@drawable/bg_payment_selected"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvPayment">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/imageWechat"
+                        android:layout_width="@dimen/divider_61px"
+                        android:layout_height="@dimen/divider_61px"
+                        android:layout_marginStart="@dimen/divider_82px"
+                        android:background="@mipmap/icon_wechat_ment"
+                        android:scaleType="centerInside"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_9px"
+                        android:text="@string/wechat_payment"
+                        android:textColor="@color/color_FF333333"
+                        android:textSize="@dimen/divider_28px"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/imageWechat"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="@dimen/divider_57px"
+                        android:layout_height="@dimen/divider_48px"
+                        android:background="@mipmap/icon_payment_selected"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/alipayLayout"
+                    android:layout_width="@dimen/divider_371px"
+                    android:layout_height="@dimen/divider_90px"
+                    android:layout_marginStart="@dimen/divider_29px"
+                    android:layout_marginTop="@dimen/divider_16px"
+                    android:background="@drawable/bg_payment_unselected"
+                    app:layout_constraintStart_toEndOf="@+id/wechatLayout"
+                    app:layout_constraintTop_toBottomOf="@+id/tvPayment">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/imageAlipay"
+                        android:layout_width="@dimen/divider_61px"
+                        android:layout_height="@dimen/divider_61px"
+                        android:layout_marginStart="@dimen/divider_82px"
+                        android:background="@mipmap/icon_alipay_ment"
+                        android:scaleType="centerInside"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_9px"
+                        android:text="@string/alipay_payment"
+                        android:textColor="@color/color_FF333333"
+                        android:textSize="@dimen/divider_28px"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/imageAlipay"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="@dimen/divider_57px"
+                        android:layout_height="@dimen/divider_48px"
+                        android:background="@mipmap/icon_payment_selected"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.appcompat.widget.AppCompatButton
+                    android:layout_width="@dimen/divider_290px"
+                    android:layout_height="@dimen/divider_75px"
+                    android:layout_marginBottom="@dimen/divider_36px"
+                    android:background="@drawable/bg_button_submit"
+                    android:gravity="center"
+                    android:text="@string/submit"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_32px"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.card.MaterialCardView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

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


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


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


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

@@ -20,4 +20,6 @@
     <color name="color_B3000000" tools:ignore="ResourceName">#B3000000</color>
     <color name="transparent" tools:ignore="ResourceName">#00000000</color><!-- 透明   -->
     <color name="color_FFE2E2E2" tools:ignore="ResourceName">#FFE2E2E2</color>
+    <color name="color_FFFF922F" tools:ignore="ResourceName">#FFFF922F</color>
+    <color name="color_FF2A55FF" tools:ignore="ResourceName">#FF2A55FF</color>
 </resources>

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

@@ -23,6 +23,7 @@
     <dimen name="divider_404px" tools:ignore="ResourceName">404px</dimen>
     <dimen name="divider_389px" tools:ignore="ResourceName">389px</dimen>
     <dimen name="divider_377px" tools:ignore="ResourceName">377px</dimen>
+    <dimen name="divider_371px" tools:ignore="ResourceName">371px</dimen>
     <dimen name="divider_363px" tools:ignore="ResourceName">363px</dimen>
     <dimen name="divider_354px" tools:ignore="ResourceName">354px</dimen>
     <dimen name="divider_348px" tools:ignore="ResourceName">348px</dimen>
@@ -109,6 +110,7 @@
     <dimen name="divider_101px" tools:ignore="ResourceName">101px</dimen>
     <dimen name="divider_100px" tools:ignore="ResourceName">100px</dimen>
     <dimen name="divider_95px" tools:ignore="ResourceName">95px</dimen>
+    <dimen name="divider_90px" tools:ignore="ResourceName">90px</dimen>
     <dimen name="divider_89px" tools:ignore="ResourceName">89px</dimen>
     <dimen name="divider_88px" tools:ignore="ResourceName">88px</dimen>
     <dimen name="divider_87px" tools:ignore="ResourceName">87px</dimen>

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

@@ -29,4 +29,9 @@
     <string name="evaluate" tools:ignore="ResourceName">评价</string>
     <string name="patient_evaluate" tools:ignore="ResourceName">患者评价</string>
     <string name="anonymous_user" tools:ignore="ResourceName">匿名用户</string>
+    <string name="please_complete_payment_within_minutes_any_delay_cancelle" tools:ignore="ResourceName">请在15分钟内完成支付,超时将取消</string>
+    <string name="inquiries_consultation" tools:ignore="ResourceName">图文问诊</string>
+    <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>
 </resources>