Browse Source

1.修改gif图片

王鹏鹏 2 years ago
parent
commit
e7631599c2

+ 3 - 0
baselib/src/main/java/com/yingyangfly/baselib/utils/RxBusCodes.kt

@@ -19,4 +19,7 @@ object RxBusCodes {
 
     //结束答题
     const val EndMOCAQuestion = 9004
+
+    //购买成功
+    const val SuccessfulPurchase = 9005
 }

+ 11 - 0
healthconsultation/src/main/java/com/yingyang/healthconsultation/consultationsheet/ConsultationSheetActivity.kt

@@ -36,7 +36,10 @@ import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.LogUtil
+import com.yingyangfly.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.img.ImgUtil
+import gorden.rxbus2.Subscribe
+import gorden.rxbus2.ThreadMode
 import top.zibin.luban.Luban
 import top.zibin.luban.OnCompressListener
 import java.io.File
@@ -483,4 +486,12 @@ class ConsultationSheetActivity :
             }, dimiss = true)
             .show(supportFragmentManager)
     }
+
+    /**
+     * 结束答题
+     */
+    @Subscribe(code = RxBusCodes.SuccessfulPurchase, threadMode = ThreadMode.MAIN)
+    fun successfulPurchase() {
+        finish()
+    }
 }

+ 2 - 0
healthconsultation/src/main/java/com/yingyang/healthconsultation/dialog/PaymentQrCodeDialog.kt

@@ -28,6 +28,7 @@ class PaymentQrCodeDialog : DialogFragment() {
     private var payImage: AppCompatImageView? = null
     private var paySuccessBtn: AppCompatButton? = null
     private var imageClose: AppCompatImageView? = null
+    var onQueryPaymentStatusListener: ((orderNo: String) -> Unit)? = null
 
     fun setPaymentQrCodeBean(orderNo: String, qrCode: String) {
         this.orderNo = orderNo
@@ -130,6 +131,7 @@ class PaymentQrCodeDialog : DialogFragment() {
                             }
                             "2" -> {
                                 "订单支付成功".toast()
+                                onQueryPaymentStatusListener?.invoke(orderNo)
                                 dismiss()
                             }
                             "3" -> {

+ 11 - 0
healthconsultation/src/main/java/com/yingyang/healthconsultation/doctordetails/DoctorDetailsActivity.kt

@@ -21,6 +21,9 @@ import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.JumpUtil
+import com.yingyangfly.baselib.utils.RxBusCodes
+import gorden.rxbus2.Subscribe
+import gorden.rxbus2.ThreadMode
 
 /**
  * 医生详情
@@ -158,4 +161,12 @@ class DoctorDetailsActivity :
         }
         return true
     }
+
+    /**
+     * 结束答题
+     */
+    @Subscribe(code = RxBusCodes.SuccessfulPurchase, threadMode = ThreadMode.MAIN)
+    fun successfulPurchase() {
+        finish()
+    }
 }

+ 6 - 0
healthconsultation/src/main/java/com/yingyang/healthconsultation/payment/PaymentActivity.kt

@@ -17,7 +17,9 @@ import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.RxTimer
+import gorden.rxbus2.RxBus
 
 /**
  * 订单支付
@@ -146,6 +148,10 @@ class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewMode
                 }, success = {
                     if (it != null) {
                         val dialog = PaymentQrCodeDialog()
+                        dialog.onQueryPaymentStatusListener = {
+                            RxBus.get().send(RxBusCodes.SuccessfulPurchase)
+                            finish()
+                        }
                         dialog.setPaymentQrCodeBean(it.orderNo, it.qrCode)
                         dialog.show(supportFragmentManager, "paymentQrCodeDialog")
                     }

+ 12 - 0
healthconsultation/src/main/java/com/yingyang/healthconsultation/record/ConsultationRecordActivity.kt

@@ -17,6 +17,9 @@ import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.RxBusCodes
+import gorden.rxbus2.Subscribe
+import gorden.rxbus2.ThreadMode
 
 /**
  * 问诊记录
@@ -210,4 +213,13 @@ class ConsultationRecordActivity :
         }
         return true
     }
+
+    /**
+     * 结束答题
+     */
+    @Subscribe(code = RxBusCodes.SuccessfulPurchase, threadMode = ThreadMode.MAIN)
+    fun successfulPurchase() {
+        finish()
+    }
+
 }