1.修改问诊消息接受位置

healthconsultation/src/main/java/com/yingyang/healthconsultation/activity/HealthConsultationActivity.kt

@@ -10,7 +10,10 @@ import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.hjq.permissions.OnPermissionCallback
 import com.hjq.permissions.XXPermissions
-import com.tencent.imsdk.v2.*
+import com.tencent.imsdk.v2.V2TIMCallback
+import com.tencent.imsdk.v2.V2TIMConversation
+import com.tencent.imsdk.v2.V2TIMManager
+import com.tencent.imsdk.v2.V2TIMMessage
 import com.tencent.qcloud.tuicore.TUIConstants
 import com.tencent.qcloud.tuicore.TUICore
 import com.tencent.qcloud.tuicore.TUILogin
@@ -19,7 +22,6 @@ import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.adapter.ConsultationAdapter
 import com.yingyang.healthconsultation.adapter.RecommendDoctorAdapter
 import com.yingyang.healthconsultation.databinding.ActivityHealthConsultationBinding
-import com.yingyangfly.baselib.bean.MessageBean
 import com.yingyangfly.baselib.config.AccountConfig
 import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.dialog.TipDialogFragment
@@ -29,7 +31,10 @@ 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.*
+import com.yingyangfly.baselib.utils.JumpUtil
+import com.yingyangfly.baselib.utils.LiveEventBusUtil
+import com.yingyangfly.baselib.utils.RxBusCodes
+import com.yingyangfly.baselib.utils.User
 
 /**
  * 健康咨询
@@ -107,41 +112,6 @@ class HealthConsultationActivity :
 
     override fun initData() {
         successfulPurchase()
-        //消息接受监听
-        V2TIMManager.getMessageManager().addAdvancedMsgListener(simpleMsgListener)
-    }
-
-    /**
-     * 自定义消息监听
-     */
-    private var simpleMsgListener: V2TIMAdvancedMsgListener = object : V2TIMAdvancedMsgListener() {
-        override fun onRecvNewMessage(msg: V2TIMMessage?) {
-            super.onRecvNewMessage(msg)
-            runOnUiThread {
-                if (msg != null) {
-                    if (msg.isRead.not()) {
-                        makeMessageAsRead(msg)
-                        if (msg.elemType == V2TIMMessage.V2TIM_ELEM_TYPE_CUSTOM) {
-                            val customElem = msg.customElem
-                            if (customElem != null && customElem.data != null) {
-                                val data = String(customElem.data)
-                                if (TextUtils.isEmpty(data).not()) {
-                                    val messageBean =
-                                        GsonUtil.GsonToBean(data, MessageBean::class.java)
-                                    if (messageBean != null && TextUtils.equals(
-                                            "start",
-                                            messageBean.businessID
-                                        )
-                                    ) {
-                                        getConsultationList()
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
     }
 
     /**
@@ -292,13 +262,6 @@ class HealthConsultationActivity :
         })
     }
 
-    override fun onDestroy() {
-        runOnUiThread {
-            V2TIMManager.getMessageManager().removeAdvancedMsgListener(simpleMsgListener)
-        }
-        super.onDestroy()
-    }
-
     /**
      * 是否有相机权限
      * @return

home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -671,6 +671,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                         val customElem = msg.customElem
                         if (customElem != null && customElem.data != null) {
                             val data = String(customElem.data)
+                            val description = customElem.description
                             val messageBean = GsonUtil.GsonToBean(data, MessageBean::class.java)
                             Log.e(
                                 "wpp1",
@@ -678,6 +679,9 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                             )
                             if (messageBean != null) {
                                 messageBean.timestamp = msg.timestamp
+                                if (TextUtils.isEmpty(description).not()) {
+                                    messageBean.description = description
+                                }
                                 Log.e(
                                     "wpp9",
                                     "messageBean.timestamp----------------------->        " + messageBean
@@ -711,6 +715,13 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                                         //结束问诊清空IM聊天历史
                                         clearC2CHistoryMessage(msg.sender)
                                     }
+                                    "start" -> {
+                                        //医生接诊
+                                        LiveEventBusUtil.send(
+                                            RxBusCodes.SuccessfulPurchase,
+                                            messageBean
+                                        )
+                                    }
                                 }
                             }
                         }