From 2a61a263de0e0d0aae37bb3944e32d15053ce4bf Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 23 Feb 2022 10:07:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E6=B6=88=E6=81=AF=E5=B7=B2=E8=AF=BB?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=BC=98=E5=8C=96=EF=BC=8C=E6=92=A4=E5=9B=9E?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E5=8A=9F=E8=83=BD=E6=89=A9=E5=B1=95?=
 =?UTF-8?q?=E5=88=B0=E8=AF=AD=E9=9F=B3=E5=9B=BE=E7=89=87=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/show/messageState.vue | 34 ++++++++++--------
 pages/im/components/show/showImage.vue    |  2 +-
 pages/im/components/show/showText.vue     | 42 ++---------------------
 pages/im/components/show/showVoice.vue    |  4 +--
 pages/im/components/showMessageCell.vue   | 37 +++++++++++++++++++-
 5 files changed, 62 insertions(+), 57 deletions(-)

diff --git a/pages/im/components/show/messageState.vue b/pages/im/components/show/messageState.vue
index d32429a..0d9b6aa 100644
--- a/pages/im/components/show/messageState.vue
+++ b/pages/im/components/show/messageState.vue
@@ -1,6 +1,13 @@
 <template>
-    <view class="">
-        <view class="state" v-if="!isGroup && !isRemote">
+    <view v-if="!isRemote">
+        <view class="state" v-if="isGroup">
+            <!-- 已发送 -->
+            <u-icon name="checkbox-mark" :size="iconSize" class="sent"
+                :color="message.sentStatus >= 30 ? '#34CE98' : '#999999' " />
+            <!-- 已阅读 -->
+            <text class="readers">{{ readers }}</text>
+        </view>
+        <view class="state" v-else>
             <!-- 已发送 -->
             <u-icon name="checkbox-mark" :size="iconSize" class="sent"
                 :color="message.sentStatus >= 30 ? '#34CE98' : '#999999' " />
@@ -8,18 +15,9 @@
             <u-icon name="checkbox-mark" :size="iconSize" class="receive"
                 :color="message.sentStatus >= 50 ? '#34CE98' : '#999999' " />
         </view>
-        <view class="state" v-if="isGroup && !isRemote">
-            <!-- 已发送 -->
-            <u-icon name="checkbox-mark" :size="iconSize" class="sent"
-                :color="message.sentStatus >= 30 ? '#34CE98' : '#999999' " />
-            <!-- 已阅读 -->
-            <text class="readers">{{ JSON.parse(message.extra).readers || 0 }}</text>
-        </view>
     </view>
-
 </template>
 
-
 <script>
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import utils from '@/utils/index.js'
@@ -36,14 +34,22 @@
             isGroup: {
                 type: Boolean,
                 default: false
+            },
+            isRemote: {
+                type: Boolean,
+                default: false
             }
         },
         computed: {
             iconSize() {
                 return utils.rpx2px(28)
             },
-            isRemote() {
-                return this.message.messageDirection == 2
+            readers() {
+                if (this.message.extra) {
+                    return JSON.parse(this.message.extra).readers || 0
+                }
+                
+                return 0
             }
         }
     }
@@ -68,7 +74,7 @@
 
         .readers {
             font-size: 20rpx;
-            margin-left: -10rpx;
+            margin-left: -6rpx;
             color: $text-gray-m;
         }
     }
diff --git a/pages/im/components/show/showImage.vue b/pages/im/components/show/showImage.vue
index b65691d..ecf16cf 100644
--- a/pages/im/components/show/showImage.vue
+++ b/pages/im/components/show/showImage.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="msg--image">
-        <message-state :message="message" :isGroup="isGroup" />
+        <message-state :message="message" :isGroup="isGroup" :isRemote="isRemote" />
 
         <view class="">
             <view class="name" v-if="isGroup && isRemote">{{ contact(message.senderUserId).name }}</view>
diff --git a/pages/im/components/show/showText.vue b/pages/im/components/show/showText.vue
index 51d9a31..768fefb 100644
--- a/pages/im/components/show/showText.vue
+++ b/pages/im/components/show/showText.vue
@@ -1,15 +1,15 @@
 <template>
     <view class="msg--text">
-        <message-state :message="message" :isGroup="isGroup" />
+        <message-state :message="message" :isGroup="isGroup" :isRemote="isRemote" />
+
         <view class="">
             <view class="name" v-if="isGroup && isRemote">{{ contact(message.senderUserId).name }}</view>
-            <view @longpress="backMessage" :class="['text', isRemote ? 'left': 'right']">{{ content }}</view>
+            <view :class="['text', isRemote ? 'left': 'right']">{{ content }}</view>
         </view>
     </view>
 </template>
 
 <script>
-    import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import messageState from './messageState'
 
     export default {
@@ -41,42 +41,6 @@
                     return this.$store.getters.contactInfo(targetId)
                 }
             }
-        },
-        methods: {
-            // 撤回消息测试
-            backMessage() {
-                if (this.$store.getters.sender.userId != this.message.senderUserId) {
-                    uni.showToast({
-                        icon: 'none',
-                        title: '不能撤回别人的消息'
-                    })
-                    return
-                }
-                // 判断时间超过了多久 就不能撤回 TODO
-                // this.message.sentTime
-                const pushContent = this.$store.getters.sender.name + '撤回了一条消息'
-                RongIMLib.recallMessage(this.message.messageId, pushContent,
-                    ({
-                        code,
-                        message
-                    }) => {
-                        if (code === 0) {
-                            uni.showToast({
-                                icon: 'none',
-                                title: '消息撤回成功'
-                            })
-                            RongIMLib.getMessage(this.message.messageId, res => {
-                                uni.$emit('onRecallMessage', res.message)
-                            })
-                        } else {
-                            uni.showToast({
-                                icon: 'none',
-                                title: '撤回失败' + code
-                            })
-                        }
-                    }
-                )
-            }
         }
     }
 </script>
diff --git a/pages/im/components/show/showVoice.vue b/pages/im/components/show/showVoice.vue
index a4da8e2..4a05c9f 100644
--- a/pages/im/components/show/showVoice.vue
+++ b/pages/im/components/show/showVoice.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="msg--voice">
-        <message-state :message="message" :isGroup="isGroup" />
-        
+        <message-state :message="message" :isGroup="isGroup" :isRemote="isRemote" />
+
         <view class="">
             <view class="name" v-if="isGroup && isRemote">{{ contact(message.senderUserId).name }}</view>
             <view class="msg-voice">
diff --git a/pages/im/components/showMessageCell.vue b/pages/im/components/showMessageCell.vue
index 95c06f9..ec41398 100644
--- a/pages/im/components/showMessageCell.vue
+++ b/pages/im/components/showMessageCell.vue
@@ -7,7 +7,7 @@
         <view v-else :class="['cell-item', message.messageDirection == 1 ? 'right' : 'left']">
             <u-avatar class="avatar" @click="toUser(message)" :size="avatarSize" shape="square"
                 :src="contact(message.senderUserId).portraitUrl" />
-            <view class="msg">
+            <view class="msg" @longpress="backMessage">
                 <show-text v-if="message.objectName === 'RC:TxtMsg'" :message="message" :isGroup="isGroup" />
                 <show-voice v-else-if="message.objectName === 'RC:HQVCMsg'" :message="message" :isGroup="isGroup" />
                 <show-image v-else-if="message.objectName === 'RC:ImgMsg'" :message="message" :isGroup="isGroup" />
@@ -22,6 +22,7 @@
 </template>
 
 <script>
+    import * as IMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import showVoice from './show/showVoice'
     import showImage from './show/showImage'
     import showText from './show/showText'
@@ -73,6 +74,40 @@
                         url: '/pages/im/friends/info?targetId=' + item.senderUserId
                     })
                 }
+            },
+            // 撤回消息测试
+            backMessage() {
+                if (this.$store.getters.sender.userId != this.message.senderUserId) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '不能撤回别人的消息'
+                    })
+                    return
+                }
+                // 判断时间超过了多久 就不能撤回 TODO
+                // this.message.sentTime
+                const pushContent = this.$store.getters.sender.name + '撤回了一条消息'
+                IMLib.recallMessage(this.message.messageId, pushContent,
+                    ({
+                        code,
+                        message
+                    }) => {
+                        if (code === 0) {
+                            uni.showToast({
+                                icon: 'none',
+                                title: '消息撤回成功'
+                            })
+                            IMLib.getMessage(this.message.messageId, res => {
+                                uni.$emit('onRecallMessage', res.message)
+                            })
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: '撤回失败' + code
+                            })
+                        }
+                    }
+                )
             }
         }
     }