1.优化代码

.idea/misc.xml

@@ -625,12 +625,18 @@
         <entry key="..\:/workspace/hcp-pads/timcommon/src/main/res/layout/message_adapter_item_content.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/timcommon/src/main/res/layout/minimalist_message_adapter_item_content.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/timcommon/src/main/res/layout/profile_icon_view.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/timcommon/src/main/res/layout/title_bar_layout.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res-minimalistui/drawable/white_round_rect_border.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res-minimalistui/layout/chat_minimalist_fragment.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res-minimalistui/layout/chat_minimalist_header_layout.xml" value="0.536" />
+        <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res-minimalistui/layout/chat_minimalist_layout.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res-minimalistui/layout/chat_react_dialog_layout.xml" value="0.176" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/drawable/chat_bubble_self_cavity_bg.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/chat_end_consultation.xml" value="0.536" />
+        <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/chat_input_layout.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/chat_input_layout_actoin.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/chat_inputmore_layout.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/chat_layout.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/chat_reply_details_item_layout.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/forward_chat_layout.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/group_receipt_member_item.xml" value="0.6" />

healthconsultation/src/main/java/com/yingyang/healthconsultation/entity/ConsultationRecordsBean.kt

@@ -20,7 +20,7 @@ data class ConsultationRecordsBean(
     val orgCode: String,//租户编号
     val orgName: String,//租户名称
     val payMethod: String,
-    val price: Double,//金额
+    val price: String,//金额
     val reason: String,//拒诊原因
     val remark: String,//病情描述
     val sickTime: String,//患病时间

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

@@ -2,6 +2,7 @@ package com.yingyang.healthconsultation.payment
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.MotionEvent
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -28,6 +29,7 @@ class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewMode
     View.OnTouchListener {
 
     private var id: String = ""
+    private var price: String = ""
     private var doctorBean: DoctorBean? = null
     private var orderNo = ""
     private var method = ""
@@ -36,6 +38,7 @@ class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewMode
 
     override fun onCreate(savedInstanceState: Bundle?) {
         id = intent.getStringExtra("id") ?: ""
+        price = intent.getStringExtra("price") ?: ""
         purchaseConsultationBean =
             intent.getSerializableExtra("purchaseConsultationBean") as PurchaseConsultationBean
         super.onCreate(savedInstanceState)
@@ -46,10 +49,35 @@ class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewMode
             doctorBean = doctorDao?.getDoctor(id)
             if (doctorBean != null) {
                 binding.data = doctorBean
+                binding.tvMoney.text = if (TextUtils.isEmpty(price)) {
+                    "¥ " + doctorBean?.price
+                } else {
+                    "¥ $price"
+                }
+            } else {
+                getDoctorDetail()
             }
         }
     }
 
+    /**
+     * 获取医生信息
+     */
+    private fun getDoctorDetail() {
+        viewModel.getDoctorDetail(id, fail = {
+            it.toast()
+        }, success = {
+            if (it != null) {
+                binding.data = it
+                binding.tvMoney.text = if (TextUtils.isEmpty(price)) {
+                    "¥ " + it.price
+                } else {
+                    "¥ $price"
+                }
+            }
+        })
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     override fun initListener() {
         binding {

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

@@ -1,8 +1,10 @@
 package com.yingyang.healthconsultation.payment
 
+import com.yingyang.healthconsultation.entity.GetDoctorDetailsBean
 import com.yingyang.healthconsultation.entity.PurchaseConsultationBean
 import com.yingyang.healthconsultation.net.HEALTHCONSULTATION_API
 import com.yingyangfly.baselib.bean.PayImageBean
+import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.mvvm.BaseViewModel
 import com.yingyangfly.baselib.net.XUtils
 import com.yingyangfly.baselib.utils.GsonUtil
@@ -24,4 +26,19 @@ class PaymentViewModel : BaseViewModel() {
         fail
     )
 
+    fun getDoctorDetail(
+        doctorId: String,
+        fail: ((msg: String) -> Unit)? = null,
+        success: ((success: DoctorBean?) -> Unit)? = null,
+    ) = launchFlow(true) {
+        val requestBean = GetDoctorDetailsBean().apply {
+            id = doctorId
+        }
+        val body = XUtils.createJson(GsonUtil.GsonString(requestBean))
+        HEALTHCONSULTATION_API.getDoctorDetail(body)
+    }.runUI(
+        success,
+        fail
+    )
+
 }

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

@@ -186,6 +186,7 @@ class ConsultationRecordActivity :
         }
         ARouter.getInstance().build(RouterUrlCommon.payment)
             .withString("id", bean.doctor.id)
+            .withString("price", bean.price)
             .withSerializable("purchaseConsultationBean", purchaseConsultationBean)
             .withTransition(R.anim.leftin, R.anim.leftout)
             .navigation(mContext)

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

@@ -122,7 +122,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_11px"
                     android:layout_marginEnd="@dimen/divider_36px"
-                    android:text='@{"¥ "+data.price}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_28px"
                     android:textStyle="bold"