From da12ae01f4cba5f70f0c01bc912735dc16c7d7ec Mon Sep 17 00:00:00 2001
From: LiuSiXiang-007 <2535147127@qq.com>
Date: Wed, 10 Jan 2024 11:28:42 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8--=20=E5=BD=93=E5=8F=8C=E6=96=B9?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E8=BD=BD=E6=9C=80=E6=96=B0=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=B6=E8=BF=9B=E8=A1=8C=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kanglai/push/ui/vm/InstantViewModel.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/kanglai/push/ui/vm/InstantViewModel.java b/app/src/main/java/com/kanglai/push/ui/vm/InstantViewModel.java
index d1834f8..5b01881 100644
--- a/app/src/main/java/com/kanglai/push/ui/vm/InstantViewModel.java
+++ b/app/src/main/java/com/kanglai/push/ui/vm/InstantViewModel.java
@@ -219,9 +219,13 @@ public class InstantViewModel extends ToolbarViewModel<InstantActivity>{
                                 ToastUtil.showBottomWarn("操作移除，退出后重试");
                                 return;
                             }
-                            PushChatMessage lastData = data.get(0);
-                            if (!lastData.getId().equals( requestList.get(requestList.size()-1 ).getId()) ) {
-                                requestList.add(requestList.size(), lastData);  // 确定为新消息才将数据插入数组末尾
+                            if (CollectionUtils.isEmpty(requestList)) { // 本地没有聊天记录
+                                requestList.add(data.get(0));
+                                mActivity.adapterInit(requestList);
+                                return;
+                            }
+                            if (!data.get(0).getId().equals( requestList.get(requestList.size()-1 ).getId()) ) {
+                                requestList.add(requestList.size(), data.get(0));  // 确定为新消息才将数据插入数组末尾
                                 mActivity.mAdapter.refreshLastDate();
                             }
                         }else ToastUtil.showBottomWarn(R.getMsg());