1.添加隐私协议UI

healthconsultation/src/main/java/com/yingyang/healthconsultation/consultationsheet/ConsultationSheetActivity.kt

@@ -55,6 +55,7 @@ class ConsultationSheetActivity :
         Manifest.permission.CAMERA
     ).toTypedArray()
 
+    private var isConsultation = ""
     private var id: String = ""
     private var imageList = mutableListOf<UploadImgBean>()
     private lateinit var emptyUploadImgBean: UploadImgBean
@@ -196,8 +197,10 @@ class ConsultationSheetActivity :
             btnSubmit.setOnTouchListener(this@ConsultationSheetActivity)
             radioBeenHospital.setOnCheckedChangeListener { group, checkedId ->
                 if (checkedId == R.id.radioYes) {
+                    isConsultation = "0"
                     purchaseConsultationBean.isConsultation = "0"
                 } else if (checkedId == R.id.radioNo) {
+                    isConsultation = "1"
                     purchaseConsultationBean.isConsultation = "1"
                 }
             }
@@ -339,6 +342,7 @@ class ConsultationSheetActivity :
             stringBuffer.append(it).append(",")
         }
         purchaseConsultationBean.let {
+            it.isConsultation = isConsultation
             it.remark = binding.editCondition.text.toString()
             it.sysUserId = id
             it.images = stringBuffer.toString()
@@ -372,7 +376,7 @@ class ConsultationSheetActivity :
             "请选择患病多久了".toast()
             return false
         }
-        if (TextUtils.isEmpty(purchaseConsultationBean.isConsultation)) {
+        if (TextUtils.isEmpty(isConsultation)) {
             "请选择此次病情是否去医院就诊过".toast()
             return false
         }

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

@@ -31,6 +31,10 @@ import gorden.rxbus2.RxBus
 class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewModel>(),
     View.OnTouchListener {
 
+    /**
+     * 是否支付成功
+     */
+    private var paySuccess = false
     private var id: String = ""
     private var price: String = ""
     private var doctorBean: DoctorBean? = null
@@ -168,6 +172,7 @@ class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewMode
                         paymentQrCodeDialog = PaymentQrCodeDialog()
                         paymentQrCodeDialog?.onQueryPaymentStatusListener = {
                             runOnUiThread {
+                                paySuccess = true
                                 LiveEventBusUtil.send(RxBusCodes.SuccessfulPurchase, "")
                             }
                         }
@@ -185,14 +190,20 @@ class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewMode
     private fun successfulPurchase() {
         LiveEventBusUtil.observer<String>(this, RxBusCodes.SuccessfulPurchase) {
             runOnUiThread {
+                paySuccess = true
                 finish()
             }
         }
     }
 
     override fun onDestroy() {
-        RxBus.get()
-            .send(RxBusCodes.purchaseConsultationEvent, PurchaseConsultationEvent(id, patientInfo))
+        if (paySuccess) {
+            RxBus.get()
+                .send(
+                    RxBusCodes.purchaseConsultationEvent,
+                    PurchaseConsultationEvent(id, patientInfo)
+                )
+        }
         super.onDestroy()
     }
 }