From 335a3aa8d693c4efe52a0295a90daa2d2c840440 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Tue, 1 Mar 2022 11:29:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=97=B4=E9=9A=9430=E5=88=86?=
 =?UTF-8?q?=E9=92=9F=EF=BC=8C=E6=8F=92=E5=85=A5=E4=B8=80=E6=9D=A1=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=B6=88=E6=81=AF=EF=BC=8C=E8=AE=B0=E5=BD=95=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=A4=A7=E6=A6=82=E7=9A=84=E5=8F=91=E9=80=81=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                           |  2 +-
 pages/im/components/showMessageCell.vue |  3 +++
 pages/im/group/chat.vue                 | 16 +++++++++++++---
 pages/im/private/chat.vue               | 15 +++++++++++++--
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/manifest.json b/manifest.json
index 66c6eac..0b1b1a0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "ZH-HEALTH",
     "appid" : "__UNI__C29473D",
     "description" : "ZH-HEALTH，您手上的健康管理专家",
-    "versionName" : "1.0.21",
+    "versionName" : "1.0.22",
     "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/pages/im/components/showMessageCell.vue b/pages/im/components/showMessageCell.vue
index 5ed7e7b..6195687 100644
--- a/pages/im/components/showMessageCell.vue
+++ b/pages/im/components/showMessageCell.vue
@@ -7,6 +7,9 @@
         </view>
         <view class="notify" v-else-if="message.objectName === 'RC:RcNtf'">
             {{ contact(message.senderUserId).name }} 撤回了一条消息
+        </view>
+        <view class="notify" v-else-if="message.objectName === 'RC:InfoNtf'">
+            {{ message.sentTime|timeCustomCN }}
         </view>
         <view v-else :class="['cell-item', message.messageDirection == 1 ? 'right' : 'left']">
             <u-avatar class="avatar" @click="toUser(message)" :size="avatarSize" shape="square"
diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index af8ff80..a0d5ec0 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -156,15 +156,25 @@
                 this.$refs.messageBar.onHidePopus()
             },
             getNewMessage() {
+                if (new Date().getTime() - this.latestMessage.sentTime > 18000000) {
+                    // 在本地插入一条时间的消息
+                    const messageContent = {
+                        objectName: 'RC:InfoNtf',
+                        message: 'DateInfo'
+                    }
+                    RongIMLib.insertOutgoingMessage(this.conversationType, this.targetId, 50, messageContent, 0)
+                }
+
                 im.getMessageList(
                     this.conversationType,
                     this.targetId,
-                    this.latestMessage.sentTime,
+                    this.latestMessage.sentTime || 0,
                     10,
                     false,
                     (messages) => {
-                        console.log('获取最新消息', messages);
-                        this.messages.unshift(...messages)
+                        console.log(messages);
+                        // 
+                        this.messages.unshift(...messages.reverse())
                         this.scrollBottom()
                     })
             },
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index ec87b2d..46a2786 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -140,14 +140,25 @@
         },
         methods: {
             getNewMessage() {
+                if (new Date().getTime() - this.latestMessage.sentTime > 18000000) {
+                    // 在本地插入一条时间的消息
+                    const messageContent = {
+                        objectName: 'RC:InfoNtf',
+                        message: 'DateInfo'
+                    }
+                    RongIMLib.insertOutgoingMessage(this.conversationType, this.targetId, 50, messageContent, 0)
+                }
+
                 im.getMessageList(
                     this.conversationType,
                     this.targetId,
                     this.latestMessage.sentTime || 0,
-                    1,
+                    10,
                     false,
                     (messages) => {
-                        this.messages.unshift(...messages)
+                        console.log(messages);
+                        // 
+                        this.messages.unshift(...messages.reverse())
                         this.scrollBottom()
                     })
             },