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

.idea/misc.xml

@@ -84,7 +84,7 @@
         <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.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_payment_qr_code.xml" value="0.536" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/layout/dialog_payment_qr_code.xml" value="0.176" />
         <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" />

healthconsultation/src/main/java/com/yingyang/healthconsultation/adapter/ConsultationRecordAdapter.kt

@@ -64,7 +64,7 @@ class ConsultationRecordAdapter(override val layoutId: Int = R.layout.item_consu
                     binding.btnRecord.setBackgroundResource(R.drawable.bg_consultation_record)
                     binding.btnRecord.setTextColorResource(R.color.color_FFFFFF)
                 }
-                "3" -> {
+                "3", "5" -> {
                     //3已拒诊
                     binding.tvStastus.setTextColorResource(R.color.color_FFB4B4B4)
                     binding.tvStastus.text = "已取消"
@@ -90,7 +90,7 @@ class ConsultationRecordAdapter(override val layoutId: Int = R.layout.item_consu
             }
         }
 
-        binding.btnRecord.setOnSingleClickListener {
+        binding.btnEvaluate.setOnSingleClickListener {
             onLeftClickListener?.invoke(item)
         }
 

healthconsultation/src/main/java/com/yingyang/healthconsultation/payment/PaymentActivity.kt

@@ -9,6 +9,7 @@ import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.databinding.ActivityPaymentBinding
 import com.yingyang.healthconsultation.dialog.PaymentQrCodeDialog
 import com.yingyang.healthconsultation.entity.PurchaseConsultationBean
+import com.yingyang.healthconsultation.utils.CommonUtils
 import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
@@ -117,7 +118,9 @@ class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewMode
                         }
                     }
                     R.id.btnSubmit -> {
-                        submit()
+                        if (CommonUtils.isFastClick) {
+                            submit()
+                        }
                     }
                 }
             }

healthconsultation/src/main/java/com/yingyang/healthconsultation/record/ConsultationRecordActivity.kt

@@ -4,11 +4,14 @@ 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.ConsultationRecordAdapter
 import com.yingyang.healthconsultation.databinding.ActivityConsultationRecordBinding
 import com.yingyang.healthconsultation.entity.ConsultationRecordsBean
+import com.yingyang.healthconsultation.entity.PurchaseConsultationBean
 import com.yingyangfly.baselib.db.DoctorBean
+import com.yingyangfly.baselib.dialog.TipsDialog
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.ext.show
@@ -36,7 +39,7 @@ class ConsultationRecordActivity :
                 when (it.status) {
                     "0" -> {
                         //0未支付
-                        cancleOrder(it.id)
+                        showTipsDialog(it.id)
                     }
                     "1" -> {
                         //1待接诊
@@ -52,7 +55,7 @@ class ConsultationRecordActivity :
                     }
                     "4" -> {
                         //4已完成
-
+                        evaluationOrder()
                     }
                 }
             }
@@ -61,11 +64,11 @@ class ConsultationRecordActivity :
                 when (it.status) {
                     "0" -> {
                         //0未支付
-
+                        payOrder(it)
                     }
                     "1" -> {
                         //1待接诊
-                        cancleOrder(it.id)
+                        showTipsDialog(it.id)
                     }
                     "2" -> {
                         //2接诊中
@@ -99,6 +102,20 @@ class ConsultationRecordActivity :
         })
     }
 
+    private fun showTipsDialog(id: String) {
+        TipsDialog.TipDialogBuilder()
+            .title("提示")
+            .content("是否取消该笔订单")
+            .leftBtnText("取消")
+            .rightBtnText("确定")
+            .leftClick({
+            }, true)
+            .rightClick({
+                cancleOrder(id)
+            }, true)
+            .show(supportFragmentManager)
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     override fun initListener() {
         binding.backLayout.setOnTouchListener(this)
@@ -108,6 +125,32 @@ class ConsultationRecordActivity :
 
     }
 
+    /**
+     * 评价订单
+     */
+    private fun evaluationOrder() {
+
+    }
+
+    /**
+     * 支付订单
+     */
+    private fun payOrder(bean: ConsultationRecordsBean) {
+        val purchaseConsultationBean = PurchaseConsultationBean()
+        purchaseConsultationBean.let {
+            it.remark = bean.remark
+            it.sysUserId = bean.sysUserId
+            it.sickTime = bean.sickTime
+            it.images = bean.images
+            it.isConsultation = bean.isConsultation
+        }
+        ARouter.getInstance().build(RouterUrlCommon.payment)
+            .withString("id", bean.doctor.id)
+            .withSerializable("purchaseConsultationBean", purchaseConsultationBean)
+            .withTransition(R.anim.leftin, R.anim.leftout)
+            .navigation(mContext)
+    }
+
     override fun onResume() {
         super.onResume()
         loadData()

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

@@ -2,8 +2,12 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <dimen name="divider_1194px" tools:ignore="ResourceName">1194px</dimen>
     <dimen name="divider_834px" tools:ignore="ResourceName">834px</dimen>
+    <dimen name="divider_763px" tools:ignore="ResourceName">763px</dimen>
+    <dimen name="divider_747px" tools:ignore="ResourceName">747px</dimen>
+    <dimen name="divider_693px" tools:ignore="ResourceName">93px</dimen>
     <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
     <dimen name="divider_684px" tools:ignore="ResourceName">684px</dimen>
+    <dimen name="divider_645px" tools:ignore="ResourceName">645px</dimen>
     <dimen name="divider_616px" tools:ignore="ResourceName">616px</dimen>
     <dimen name="divider_597px" tools:ignore="ResourceName">597px</dimen>
     <dimen name="divider_561px" tools:ignore="ResourceName">561px</dimen>