|
|
@@ -664,7 +664,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
override fun onRecvNewMessage(msg: V2TIMMessage) {
|
|
|
super.onRecvNewMessage(msg)
|
|
|
runOnUiThread {
|
|
|
- Log.e("wpp", "msg----------------------> "+GsonUtil.GsonString(msg))
|
|
|
+ Log.e("wpp", "msg----------------------> " + GsonUtil.GsonString(msg))
|
|
|
if (msg.isRead.not()) {
|
|
|
makeMessageAsRead(msg)
|
|
|
if (msg.elemType == V2TIMMessage.V2TIM_ELEM_TYPE_CUSTOM) {
|
|
|
@@ -672,10 +672,16 @@ 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("wpp1", "messageBean-----------------------> " + messageBean)
|
|
|
+ Log.e(
|
|
|
+ "wpp1",
|
|
|
+ "messageBean-----------------------> " + messageBean
|
|
|
+ )
|
|
|
if (messageBean != null) {
|
|
|
messageBean.timestamp = msg.timestamp
|
|
|
- Log.e("wpp9", "messageBean.timestamp-----------------------> " + messageBean)
|
|
|
+ Log.e(
|
|
|
+ "wpp9",
|
|
|
+ "messageBean.timestamp-----------------------> " + messageBean
|
|
|
+ )
|
|
|
when (messageBean.businessID) {
|
|
|
"A" -> {
|
|
|
if (TextUtils.equals("购买成功,等待医生接诊。", messageBean.data) ||
|
|
|
@@ -684,7 +690,6 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
messageBean.data
|
|
|
)
|
|
|
) {
|
|
|
- clearC2CHistoryMessage(msg.sender)
|
|
|
LiveEventBusUtil.send(
|
|
|
RxBusCodes.SuccessfulPurchase,
|
|
|
messageBean.data
|
|
|
@@ -703,6 +708,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
addAMessageData(messageBean)
|
|
|
}
|
|
|
"end" -> {
|
|
|
+ //结束问诊清空IM聊天历史
|
|
|
clearC2CHistoryMessage(msg.sender)
|
|
|
}
|
|
|
}
|
|
|
@@ -744,7 +750,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
*/
|
|
|
private fun addAMessageData(msg: MessageBean) {
|
|
|
runOnUiThread {
|
|
|
- Log.e("wpp", "addAMessageData----------------------> "+GsonUtil.GsonString(msg))
|
|
|
+ Log.e("wpp", "addAMessageData----------------------> " + GsonUtil.GsonString(msg))
|
|
|
if (aMessageList.isNotEmpty() && aMessageList.containsKey(msg.timestamp).not()) {
|
|
|
aMessageList[msg.timestamp] = msg
|
|
|
} else {
|
|
|
@@ -759,7 +765,12 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
|
|
|
}
|
|
|
|
|
|
override fun onFinish() {
|
|
|
- Log.e("wpp8", "onFinish-------------------------> "+GsonUtil.GsonString(aMessageList))
|
|
|
+ Log.e(
|
|
|
+ "wpp8",
|
|
|
+ "onFinish-------------------------> " + GsonUtil.GsonString(
|
|
|
+ aMessageList
|
|
|
+ )
|
|
|
+ )
|
|
|
sortMessageDataByTimestamp(ArrayList(aMessageList.values))
|
|
|
}
|
|
|
}
|