1.优化语音播放时机

.idea/misc.xml

@@ -560,6 +560,7 @@
         <entry key="..\:/workspace/hcp-pads/superplayerkit/src/main/res/layout/superplayer_vod_player_window.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/superplayerkit/src/main/res/layout/superplayer_vod_view.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pads/superplayerkit/src/main/res/layout/superplayer_vod_vipwatch_view.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/chat_end_consultation.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pads/webview/src/main/res/layout/activity_bridge_web.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/webview/src/main/res/layout/activity_tencent_webview.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pads/webview/src/main/res/layout/activity_webview.xml" value="0.23697916666666666" />

baselib/src/main/java/com/yingyangfly/baselib/utils/RxBusCodes.kt

@@ -21,10 +21,7 @@ object RxBusCodes {
     const val EndMOCAQuestion = 9004
 
     //购买成功
-    const val SuccessfulPurchase = 9005
-
-    //加载语音
-    const val LoadedVoice = 9006
+    const val SuccessfulPurchase = "SuccessfulPurchase"
 
     //加载语音
     const val EVALUATE_ORDER = 9007

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

@@ -18,9 +18,8 @@ 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.LiveEventBusUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
-import gorden.rxbus2.Subscribe
-import gorden.rxbus2.ThreadMode
 
 /**
  * 问诊申请
@@ -64,6 +63,7 @@ class ConsultationRequestActivity :
 
     override fun initData() {
         getUserInfo()
+        successfulPurchase()
     }
 
     /**
@@ -116,8 +116,11 @@ class ConsultationRequestActivity :
     /**
      * 结束答题
      */
-    @Subscribe(code = RxBusCodes.SuccessfulPurchase, threadMode = ThreadMode.MAIN)
-    fun successfulPurchase() {
-        finish()
+    private fun successfulPurchase() {
+        LiveEventBusUtil.observer<String>(this, RxBusCodes.SuccessfulPurchase){
+            runOnUiThread {
+                finish()
+            }
+        }
     }
 }

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

@@ -32,11 +32,10 @@ import com.yingyangfly.baselib.image.ImagePagerActivity
 import com.yingyangfly.baselib.image.XImageSelector
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.LiveEventBusUtil
 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
@@ -207,7 +206,7 @@ class ConsultationSheetActivity :
     }
 
     override fun initData() {
-
+        successfulPurchase()
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -444,9 +443,12 @@ class ConsultationSheetActivity :
     /**
      * 结束答题
      */
-    @Subscribe(code = RxBusCodes.SuccessfulPurchase, threadMode = ThreadMode.MAIN)
-    fun successfulPurchase() {
-        finish()
+    private fun successfulPurchase() {
+        LiveEventBusUtil.observer<String>(this, RxBusCodes.SuccessfulPurchase) {
+            runOnUiThread {
+                finish()
+            }
+        }
     }
 
     /**

healthconsultation/src/main/java/com/yingyang/healthconsultation/doctordetails/DoctorDetailsActivity.kt

@@ -21,8 +21,8 @@ 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.LiveEventBusUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
-import gorden.rxbus2.Subscribe
 
 /**
  * 医生详情
@@ -57,7 +57,7 @@ class DoctorDetailsActivity :
     }
 
     override fun initData() {
-
+        successfulPurchase()
     }
 
     override fun onResume() {
@@ -164,8 +164,11 @@ class DoctorDetailsActivity :
     /**
      * 结束答题
      */
-    @Subscribe(code = RxBusCodes.SuccessfulPurchase)
-    fun successfulPurchase() {
-        finish()
+    private fun successfulPurchase() {
+        LiveEventBusUtil.observer<String>(this, RxBusCodes.SuccessfulPurchase) {
+            runOnUiThread {
+                finish()
+            }
+        }
     }
 }

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

@@ -17,9 +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.LiveEventBusUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.RxTimer
-import gorden.rxbus2.RxBus
 
 /**
  * 订单支付
@@ -138,8 +138,10 @@ class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewMode
                         orderNo = it.orderNo
                         paymentQrCodeDialog = PaymentQrCodeDialog()
                         paymentQrCodeDialog?.onQueryPaymentStatusListener = {
-                            RxBus.get().send(RxBusCodes.SuccessfulPurchase)
-                            finish()
+                            runOnUiThread {
+                                LiveEventBusUtil.send(RxBusCodes.SuccessfulPurchase, "")
+                                finish()
+                            }
                         }
                         paymentQrCodeDialog?.setPaymentQrCodeBean(it.orderNo, it.qrCode, method)
                         paymentQrCodeDialog?.show(supportFragmentManager, "paymentQrCodeDialog")

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

@@ -32,10 +32,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.LiveEventBusUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.User
-import gorden.rxbus2.Subscribe
-import gorden.rxbus2.ThreadMode
 import java.util.*
 
 /**
@@ -153,7 +152,7 @@ class ConsultationRecordActivity :
     }
 
     override fun initData() {
-
+        successfulPurchase()
     }
 
     /**
@@ -229,9 +228,12 @@ class ConsultationRecordActivity :
     /**
      * 结束答题
      */
-    @Subscribe(code = RxBusCodes.SuccessfulPurchase, threadMode = ThreadMode.MAIN)
-    fun successfulPurchase() {
-        finish()
+    private fun successfulPurchase() {
+        LiveEventBusUtil.observer<String>(this, RxBusCodes.SuccessfulPurchase) {
+            runOnUiThread {
+                finish()
+            }
+        }
     }
 
     /**