|
|
@@ -664,6 +664,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
override fun onRecvNewMessage(msg: V2TIMMessage) {
|
|
|
super.onRecvNewMessage(msg)
|
|
|
runOnUiThread {
|
|
|
+ Log.e("wpp", GsonUtil.GsonString(msg))
|
|
|
if (msg.isRead.not()) {
|
|
|
makeMessageAsRead(msg)
|
|
|
if (msg.elemType == V2TIMMessage.V2TIM_ELEM_TYPE_CUSTOM) {
|
|
|
@@ -671,6 +672,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
if (customElem != null && customElem.data != null) {
|
|
|
val data = String(customElem.data)
|
|
|
val messageBean = GsonUtil.GsonToBean(data, MessageBean::class.java)
|
|
|
+ Log.e("wpp", "666-----------------------" + messageBean)
|
|
|
if (messageBean != null) {
|
|
|
messageBean.timestamp = msg.timestamp
|
|
|
when (messageBean.businessID) {
|
|
|
@@ -681,7 +683,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
messageBean.data
|
|
|
)
|
|
|
) {
|
|
|
- clearC2CHistoryMessage()
|
|
|
+ clearC2CHistoryMessage(msg.sender)
|
|
|
LiveEventBusUtil.send(
|
|
|
RxBusCodes.SuccessfulPurchase,
|
|
|
messageBean.data
|
|
|
@@ -699,6 +701,9 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
"B", "C", "D" -> {
|
|
|
addAMessageData(messageBean)
|
|
|
}
|
|
|
+ "end" -> {
|
|
|
+ clearC2CHistoryMessage(msg.sender)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -806,16 +811,20 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
/**
|
|
|
* 清空消息列表
|
|
|
*/
|
|
|
- private fun clearC2CHistoryMessage() {
|
|
|
+ private fun clearC2CHistoryMessage(userId: String) {
|
|
|
runOnUiThread {
|
|
|
V2TIMManager.getMessageManager()
|
|
|
- .clearC2CHistoryMessage(User.getUserId(), object : V2TIMCallback {
|
|
|
+ .clearC2CHistoryMessage(userId, object : V2TIMCallback {
|
|
|
override fun onSuccess() {
|
|
|
// 清空单聊消息成功
|
|
|
+ Log.e("wpp", "1-------------------清空单聊消息成功")
|
|
|
}
|
|
|
|
|
|
override fun onError(code: Int, desc: String) {
|
|
|
// 清空单聊消息失败
|
|
|
+ Log.e("wpp", "2-------------------清空单聊消息失败")
|
|
|
+ Log.e("wpp", "2-------------------清空单聊消息失败" + code)
|
|
|
+ Log.e("wpp", "2-------------------清空单聊消息失败" + desc)
|
|
|
}
|
|
|
})
|
|
|
}
|