Просмотр исходного кода

1.修改订单完成评价按钮显示逻辑

王鹏鹏 2 лет назад
Родитель
Сommit
f838a9617c

+ 15 - 7
healthconsultation/src/main/java/com/yingyang/healthconsultation/adapter/ConsultationRecordAdapter.kt

@@ -1,5 +1,6 @@
 package com.yingyang.healthconsultation.adapter
 
+import android.text.TextUtils
 import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.databinding.ItemConsultationRecordBinding
 import com.yingyang.healthconsultation.entity.ConsultationRecordsBean
@@ -75,13 +76,20 @@ class ConsultationRecordAdapter(override val layoutId: Int = R.layout.item_consu
                     binding.btnRecord.setTextColorResource(R.color.color_FFFFFF)
                 }
                 "4" -> {
-                    //4已完成
-                    binding.tvStastus.text = "已完成"
-                    binding.btnEvaluate.show(false)
-                    binding.btnRecord.show(true)
-                    binding.btnRecord.text = "评价"
-                    binding.btnRecord.setBackgroundResource(R.drawable.bg_consultation_record)
-                    binding.btnRecord.setTextColorResource(R.color.color_FFFFFF)
+                    if (TextUtils.equals("0", item.isComment)) {
+                        //4已完成
+                        binding.tvStastus.text = "已完成"
+                        binding.btnEvaluate.show(false)
+                        binding.btnRecord.show(false)
+                    } else {
+                        //4已完成
+                        binding.tvStastus.text = "已完成"
+                        binding.btnEvaluate.show(false)
+                        binding.btnRecord.show(true)
+                        binding.btnRecord.text = "评价"
+                        binding.btnRecord.setBackgroundResource(R.drawable.bg_consultation_record)
+                        binding.btnRecord.setTextColorResource(R.color.color_FFFFFF)
+                    }
                 }
             }
         }

+ 2 - 1
healthconsultation/src/main/java/com/yingyang/healthconsultation/entity/ConsultationRecordsBean.kt

@@ -28,5 +28,6 @@ data class ConsultationRecordsBean(
     val sysUserId: String,//医生id
     val sysUserName: String,//	医生姓名
     val updateBy: String,//更新人
-    val updateTime: String//更新时间
+    val updateTime: String,//更新时间
+    val isComment: String//是否评价 0是 1否
 )

+ 1 - 0
healthconsultation/src/main/java/com/yingyang/healthconsultation/entity/MedicalConsultationDetailBean.kt

@@ -17,6 +17,7 @@ data class MedicalConsultationDetailBean(
     val id: String,
     val images: String,
     val isConsultation: String,//是否就诊 0是 1否
+    val isComment: String,//是否评价 0是 1否
     val orgCode: String,
     val orgName: String,
     val payMethod: String,

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

@@ -125,7 +125,7 @@ class PaidActivity : BaseMVVMActivity<ActivityPaidBinding, PaidViewModel>(),
                     sickTime = it.sickTime
                     images = it.images
                     isConsultation = it.isConsultation
-                    setStatusInfo(it.status, it.payOrder != null)
+                    setStatusInfo(it.status, it.payOrder != null, it.isComment)
                     if (it.payOrder != null) {
                         binding.payOrder = it.payOrder
                     }
@@ -152,7 +152,7 @@ class PaidActivity : BaseMVVMActivity<ActivityPaidBinding, PaidViewModel>(),
      * @param isGenerateOrder 是否生成订单
      */
     @SuppressLint("SetTextI18n")
-    private fun setStatusInfo(status: String, isGenerateOrder: Boolean) {
+    private fun setStatusInfo(status: String, isGenerateOrder: Boolean, isComment: String) {
         when (status) {
             "0" -> {
                 //0未支付
@@ -197,9 +197,9 @@ class PaidActivity : BaseMVVMActivity<ActivityPaidBinding, PaidViewModel>(),
             "4" -> {
                 //4已完成
                 binding {
+                    binding.btnConnection.show(TextUtils.equals("0", isComment).not())
                     tvStatus.text = "订单完成"
                     orderBtnLayout.show(false)
-                    btnConnection.show(true)
                     btnConnection.text = "去评价"
                 }
             }