Ver código fonte

1.添加获取单个医生信息接口

王鹏鹏 2 anos atrás
pai
commit
e2b8fa47f0

+ 1 - 0
.idea/misc.xml

@@ -58,6 +58,7 @@
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_services.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_services_alipay.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_status_to_be_paid.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" />

+ 66 - 4
healthconsultation/src/main/java/com/yingyang/healthconsultation/paid/PaidActivity.kt

@@ -10,10 +10,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.adapter.ConsultationDataAdapter
 import com.yingyang.healthconsultation.databinding.ActivityPaidBinding
-import com.yingyangfly.baselib.ext.getEndAnimation
-import com.yingyangfly.baselib.ext.getScaleAnimation
-import com.yingyangfly.baselib.ext.show
-import com.yingyangfly.baselib.ext.toast
+import com.yingyangfly.baselib.ext.*
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.JumpUtil
@@ -73,6 +70,7 @@ class PaidActivity : BaseMVVMActivity<ActivityPaidBinding, PaidViewModel>(),
                 imageList.clear()
                 if (it != null) {
                     binding.data = it
+                    setStatusInfo(it.status, it.payOrder != null)
                     if (it.payOrder != null) {
                         binding.payOrder = it.payOrder
                     }
@@ -94,6 +92,70 @@ class PaidActivity : BaseMVVMActivity<ActivityPaidBinding, PaidViewModel>(),
         }
     }
 
+    /**
+     * 设置订单状态
+     * @param isGenerateOrder 是否生成订单
+     */
+    @SuppressLint("SetTextI18n")
+    private fun setStatusInfo(status: String, isGenerateOrder: Boolean) {
+        when (status) {
+            "0" -> {
+                //0未支付
+                binding {
+                    tvStatus.text = "订单待支付,超时将取消"
+                    btnCancleOrder.show(true)
+                    btnCancleOrder.text = "取消订单"
+                    btnCancleOrder.setBackgroundResource(R.drawable.bg_record_cancel_order)
+                    btnCancleOrder.setTextColorResource(R.color.color_FFA5A5A5)
+                    btnContactDoctor.show(true)
+                    btnContactDoctor.text = "去支付"
+                    btnContactDoctor.setBackgroundResource(R.drawable.bg_pay_order)
+                    btnContactDoctor.setTextColorResource(R.color.color_FFFFFF)
+                }
+            }
+            "1" -> {
+                //1待接诊
+                binding {
+                    tvStatus.text = "订单已支付,等待医生回复医生会在24小时内回复您"
+                }
+            }
+            "2" -> {
+                //2接诊中
+                binding {
+                    tvStatus.text = "医生接诊中"
+                }
+            }
+            "3" -> {
+                //3已拒诊
+                binding {
+                    tvStatus.text = "医生已取消"
+                }
+            }
+
+            "4" -> {
+                //4已完成
+                binding {
+                    tvStatus.text = "订单完成"
+                }
+            }
+
+            "5" -> {
+                //5已取消
+                binding {
+                    tvStatus.text = if (isGenerateOrder) {
+                        "订单已取消,超时未支付"
+                    } else {
+                        "订单已取消,支付的费用会在24小内返还到您的支付账户里"
+                    }
+                    btnCancleOrder.show(false)
+                    btnContactDoctor.text = "重新问诊"
+                    btnContactDoctor.setBackgroundResource(R.drawable.bg_pay_order)
+                    btnContactDoctor.setTextColorResource(R.color.color_FFFFFF)
+                }
+            }
+        }
+    }
+
     /**
      * 获取医生信息
      */

+ 1 - 1
healthconsultation/src/main/res/drawable/bg_payment_status.xml

@@ -2,6 +2,6 @@
 <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" />
+    <corners android:radius="@dimen/divider_13px" />
     <solid android:color="@color/color_FF352FFF" />
 </shape>

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

+ 14 - 0
healthconsultation/src/main/res/layout/activity_paid.xml

@@ -424,6 +424,20 @@
                         app:layout_constraintStart_toEndOf="@+id/btnCancleOrder"
                         app:layout_constraintTop_toBottomOf="@+id/orderLayout" />
 
+                    <androidx.appcompat.widget.AppCompatButton
+                        android:id="@+id/btnConnection"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/bg_contact_doctor"
+                        android:gravity="center"
+                        android:text="@string/contact_doctor"
+                        android:layout_marginTop="@dimen/divider_78px"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_28px"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/btnCancleOrder" />
+
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </com.google.android.material.card.MaterialCardView>
         </LinearLayout>