diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index a6bfd251..44c0100e 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -1425,28 +1425,28 @@ class RoomActivity : BaseMvpActivity(), handleMsgType1039(messageEvent, text) } else if (msgType == EMMessageInfo.QXRoomMessageTypeRoomIsHostvalue) { roomFragment!!.handleMsgType1028(messageEvent) - } else if (msgType == EMMessageInfo.QXRoomMessageTypezailx) { + } else if (msgType == EMMessageInfo.QXRoomMessageTypezailx) {//1058在离线 val userId = messageEvent.text?.user_id LogUtils.e("messageEvent!!.text.type" + messageEvent.text.type) CommonAppContext.getInstance().onlineMap[userId ?: ""] = messageEvent.text.type if (mRoomInfoResp != null && mRoomInfoResp?.room_info != null) { - if (mRoomInfoResp?.room_info?.type_id == "1" || mRoomInfoResp?.room_info?.type_id == "3" || - mRoomInfoResp?.room_info?.type_id == "4" || mRoomInfoResp?.room_info?.type_id == "8" - ) { - if (mRoomInfoResp?.room_info?.label_id == "1") { + + when(mRoomInfoResp?.room_info?.type_id) { + "1","3","4","8" -> { + if (mRoomInfoResp?.room_info?.label_id == "1") { // roomFragment!!.SingSongEvent(messageEvent) - } else { + } else { + roomFragment!!.handleRoomMessage(messageEvent) + } + } + "2","7","9","10" -> { roomFragment!!.handleRoomMessage(messageEvent) } - } else if (mRoomInfoResp?.room_info?.type_id == "2") { - roomFragment!!.handleRoomMessage(messageEvent) - } else if (mRoomInfoResp?.room_info?.type_id == "7"|| mRoomInfoResp?.room_info?.type_id=="10") { - roomFragment!!.handleRoomMessage(messageEvent) } } CommonAppContext.getInstance().getOnlineMap() - } else if (msgType == EMMessageInfo.QXRoomMessageTypeQingGRMl) { // 1059清除个人魅力 1058在离线 + } else if (msgType == EMMessageInfo.QXRoomMessageTypeQingGRMl) { // 1059清除个人魅力 if (mRoomInfoResp != null && mRoomInfoResp?.room_info != null) { roomFragment!!.handleRoomMessage(messageEvent) } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java index dfb24490..e4e4a1da 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java @@ -947,6 +947,9 @@ public class RoomFragment extends BaseMvpFragment