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 3d3296ec..e6c37f72 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
@@ -2017,7 +2017,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
     private var isPreloaded = false
 
     private fun handleMsgType1001(roomMessageEvent: RoomMessageEvent) {
-        if (roomMessageEvent.text.fromUserInfo.enter_image?.isNotEmpty() == true) {
+        if (roomMessageEvent.text.fromUserInfo != null &&roomMessageEvent.text.fromUserInfo.enter_image?.isNotEmpty() == true) {
             showFloatingMessage(roomMessageEvent.text.fromUserInfo)
         }
 
@@ -2081,9 +2081,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                 layoutParams.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL
                 currentMqttView?.setLayoutParams(layoutParams)
                 decorView?.addView(currentMqttView)
-                currentMqttView?.let { updateFloatingViewData(it, userInfo) }
-
                 currentMqttView?.let {
+                    updateFloatingViewData(it, userInfo)
                     resetAndStartMqttAnimation(it, Runnable {
                         // 清理当前视图
                         if (currentMqttView?.getParent() != null) {