|
|
@@ -9,17 +9,22 @@ import androidx.recyclerview.widget.GridLayoutManager
|
|
|
import com.alibaba.android.arouter.facade.annotation.Route
|
|
|
import com.alibaba.android.arouter.launcher.ARouter
|
|
|
import com.bumptech.glide.Glide
|
|
|
+import com.tencent.imsdk.v2.V2TIMAdvancedMsgListener
|
|
|
import com.tencent.imsdk.v2.V2TIMManager
|
|
|
-import com.tencent.imsdk.v2.V2TIMSimpleMsgListener
|
|
|
-import com.tencent.imsdk.v2.V2TIMUserInfo
|
|
|
+import com.tencent.imsdk.v2.V2TIMMessage
|
|
|
+import com.tencent.imsdk.v2.V2TIMTextElem
|
|
|
import com.yingyang.home.R
|
|
|
import com.yingyang.home.databinding.ActivityHomeBinding
|
|
|
import com.yingyangfly.baselib.bean.GetSaveGameRecordBean
|
|
|
+import com.yingyangfly.baselib.bean.MessageBean
|
|
|
import com.yingyangfly.baselib.bean.Record
|
|
|
import com.yingyangfly.baselib.db.VoicePlayerBean
|
|
|
import com.yingyangfly.baselib.dialog.TaskFragment
|
|
|
import com.yingyangfly.baselib.dialog.TipsDialog
|
|
|
-import com.yingyangfly.baselib.ext.*
|
|
|
+import com.yingyangfly.baselib.ext.getEndAnimation
|
|
|
+import com.yingyangfly.baselib.ext.getScaleAnimation
|
|
|
+import com.yingyangfly.baselib.ext.show
|
|
|
+import com.yingyangfly.baselib.ext.toast
|
|
|
import com.yingyangfly.baselib.guideview.Guide
|
|
|
import com.yingyangfly.baselib.guideview.GuideBuilder
|
|
|
import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
|
|
|
@@ -34,6 +39,7 @@ import com.yingyangfly.home.component.ShowProfessionalEvaluationViewComponent
|
|
|
import com.yingyangfly.home.dialog.DownLoadAppFragment
|
|
|
import com.yingyangfly.home.utils.AnimUtil
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 新版首页
|
|
|
*/
|
|
|
@@ -151,7 +157,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
*/
|
|
|
private fun addSimpleMsgListener() {
|
|
|
//消息接受监听
|
|
|
- V2TIMManager.getInstance().addSimpleMsgListener(simpleMsgListener)
|
|
|
+ V2TIMManager.getMessageManager().addAdvancedMsgListener(simpleMsgListener)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -687,48 +693,41 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
})
|
|
|
}
|
|
|
|
|
|
- override fun onDestroy() {
|
|
|
- runOnUiThread {
|
|
|
- V2TIMManager.getInstance().removeSimpleMsgListener(simpleMsgListener)
|
|
|
- }
|
|
|
- super.onDestroy()
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 自定义消息监听
|
|
|
*/
|
|
|
- private var simpleMsgListener: V2TIMSimpleMsgListener = object : V2TIMSimpleMsgListener() {
|
|
|
- override fun onRecvC2CCustomMessage(
|
|
|
- msgID: String?,
|
|
|
- sender: V2TIMUserInfo?,
|
|
|
- customData: ByteArray?
|
|
|
- ) {
|
|
|
- super.onRecvC2CCustomMessage(msgID, sender, customData)
|
|
|
- if (customData != null) {
|
|
|
- val data = String(customData)
|
|
|
- Log.e("wpp", "自定义消息--------------------------" + data)
|
|
|
-// val messageBean = GsonUtil.GsonToBean(data, MessageBean::class.java)
|
|
|
-// if (messageBean != null) {
|
|
|
-// if (TextUtils.equals("A", messageBean.businessID)) {
|
|
|
-// //缴费通知
|
|
|
-// LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean.data)
|
|
|
-// } else if (TextUtils.equals("B", messageBean.businessID)) {
|
|
|
-// //系统通知
|
|
|
-// LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean.data)
|
|
|
-// } else if (TextUtils.equals("C", messageBean.businessID)) {
|
|
|
-// //报告通知
|
|
|
-// LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean.data)
|
|
|
-// } else if (TextUtils.equals("D", messageBean.businessID)) {
|
|
|
-// //理疗通知
|
|
|
-// LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean.data)
|
|
|
-// }
|
|
|
-// }
|
|
|
+ private var simpleMsgListener: V2TIMAdvancedMsgListener = object : V2TIMAdvancedMsgListener() {
|
|
|
+ override fun onRecvNewMessage(msg: V2TIMMessage) {
|
|
|
+ super.onRecvNewMessage(msg)
|
|
|
+ Log.e("wpp", GsonUtil.GsonString(msg))
|
|
|
+ if (msg.elemType == V2TIMMessage.V2TIM_ELEM_TYPE_CUSTOM) {
|
|
|
+ val customElem = msg.customElem
|
|
|
+ if (customElem != null && customElem.data != null) {
|
|
|
+ val data = String(customElem.data)
|
|
|
+ val messageBean = GsonUtil.GsonToBean(data, MessageBean::class.java)
|
|
|
+ if (messageBean != null) {
|
|
|
+ if (TextUtils.equals("A", messageBean.businessID)) {
|
|
|
+ //缴费通知
|
|
|
+ LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean.data)
|
|
|
+ } else if (TextUtils.equals("B", messageBean.businessID)) {
|
|
|
+ //系统通知
|
|
|
+ LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean.data)
|
|
|
+ } else if (TextUtils.equals("C", messageBean.businessID)) {
|
|
|
+ //报告通知
|
|
|
+ LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean.data)
|
|
|
+ } else if (TextUtils.equals("D", messageBean.businessID)) {
|
|
|
+ //理疗通知
|
|
|
+ LiveEventBusUtil.send(RxBusCodes.SHOWTASKDIALOG, messageBean.data)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ Log.e("wpp", "自定义消息--------------------------解析失败")
|
|
|
+ }
|
|
|
+ } else if (msg.elemType == V2TIMMessage.V2TIM_ELEM_TYPE_TEXT) {
|
|
|
+ val textElem: V2TIMTextElem = msg.textElem
|
|
|
+ val text: String = textElem.text
|
|
|
+ Log.e("wpp", "text:" + text)
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- override fun onRecvC2CTextMessage(msgID: String?, sender: V2TIMUserInfo?, text: String?) {
|
|
|
- super.onRecvC2CTextMessage(msgID, sender, text)
|
|
|
- Log.e("wpp", "普通消息-------------------------" + text)
|
|
|
- }
|
|
|
}
|
|
|
}
|