From 04d9d772c4f0063108138d74e52c495be5494cc9 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Mon, 28 Feb 2022 16:52:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E5=9B=9E=E6=89=A7=E8=AF=B7=E6=B1=82=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/sent/sentPopups.vue   |  3 +-
 pages/im/components/show/showLocation.vue | 43 ++++++++++++++++-------
 utils/im/message.js                       | 30 +++++++++++-----
 3 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/pages/im/components/sent/sentPopups.vue b/pages/im/components/sent/sentPopups.vue
index b847a97..28ea991 100644
--- a/pages/im/components/sent/sentPopups.vue
+++ b/pages/im/components/sent/sentPopups.vue
@@ -132,7 +132,8 @@
                         break;
                     case 'location':
                         uni.chooseLocation({
-                            success: (location) => {
+                            success: (location) => {
+                                console.log(location);
                                 im.sentLocation(this.conversationType, this.targetId, location).then(() => {
                                     this.success()
                                 })
diff --git a/pages/im/components/show/showLocation.vue b/pages/im/components/show/showLocation.vue
index dbb74fb..80efb4c 100644
--- a/pages/im/components/show/showLocation.vue
+++ b/pages/im/components/show/showLocation.vue
@@ -5,9 +5,11 @@
         <view class="">
             <view class="name" v-if="isGroup && isRemote">{{ contact(message.senderUserId).name }}</view>
             <view class="location" :class="isRemote ? 'left': 'right'" @click="showLocation">
-                {{ content.customFields.name }}
-                {{ content.customFields.thumbnail }}
-                <!-- 缩略图，在考虑是否要通过截图后自动截屏来操作 -->
+                <view class="location--name">
+                    {{ content.customFields.name }}
+                    {{ content.customFields.address }}
+                </view>
+                <image class="map" :src="content.customFields.thumbnail" />
             </view>
         </view>
     </view>
@@ -48,8 +50,16 @@
         },
         methods: {
             showLocation() {
-                console.log(this.content.customFields.longitude, this.content.customFields.latitude)
-
+                uni.openLocation({
+                    latitude: Number(this.content.customFields.latitude),
+                    longitude: Number(this.content.customFields.longitude),
+                    fail: (err) => {
+                        uni.showToast({
+                            icon: 'none',
+                            title: '打开地图失败'
+                        })
+                    }
+                })
             }
         }
     }
@@ -66,20 +76,27 @@
         }
 
         .location {
-            .image {
-                width: 180rpx;
+            position: relative;
+            width: 400rpx;
+            background: #FFFFFF;
+            padding: 10rpx;
+
+            .location--name {
+                overflow: hidden;
+                word-break: break-all;
+            }
+
+            .map {
+                width: 400rpx;
+                height: 200rpx;
             }
 
             &.left {
-                .image {
-                    border-radius: 0 10rpx 10rpx 10rpx;
-                }
+                border-radius: 0 10rpx 10rpx 10rpx;
             }
 
             &.right {
-                .image {
-                    border-radius: 10rpx 0 10rpx 10rpx;
-                }
+                border-radius: 10rpx 0 10rpx 10rpx;
             }
         }
     }
diff --git a/utils/im/message.js b/utils/im/message.js
index 286a988..d05e88a 100644
--- a/utils/im/message.js
+++ b/utils/im/message.js
@@ -136,13 +136,18 @@ const sentVoice = (conversationType, targetId, voiceUrl, time) => {
             }
         }
         RongIMLib.sendMediaMessage(msg, {
-            success: (messageId) => {
-                resolve(messageId);
+            success: (messageId) => {
+                if (conversationType == 3) {
+                    RongIMLib.sendReadReceiptRequest(messageId, (res) => {
+                        console.log('发送回执请求', res);
+                    })
+                }
+                resolve(messageId)
             },
             progress: (progress, messageId) => {},
             cancel: (messageId) => {},
             error: (errorCode, messageId) => {
-                reject(errorCode);
+                reject(errorCode)
             }
         })
     })
@@ -164,7 +169,12 @@ const sentImage = (conversationType, targetId, imageUrl) => {
                     }
                 }
                 RongIMLib.sendMediaMessage(msg, {
-                    success: (messageId) => {
+                    success: (messageId) => {
+                        if (conversationType == 3) {
+                            RongIMLib.sendReadReceiptRequest(messageId, (res) => {
+                                console.log('发送回执请求', res);
+                            })
+                        }
                         resolve(messageId)
                     },
                     progress: (progress, messageId) => {},
@@ -190,10 +200,13 @@ const sentFile = (conversationType, targetId, fileUrl) => {
             }
         }
 
-        console.log('发送文件', msg);
-
         RongIMLib.sendMediaMessage(msg, {
-            success: (messageId) => {
+            success: (messageId) => {
+                if (conversationType == 3) {
+                    RongIMLib.sendReadReceiptRequest(messageId, (res) => {
+                        console.log('发送回执请求', res);
+                    })
+                }
                 resolve(messageId)
             },
             progress: (progress, messageId) => {},
@@ -216,7 +229,8 @@ const sentLocation = (conversationType, targetId, location) => {
                 customType: 2,
                 objectName: 'RC:LBSMsg',
                 customFields: {
-                    name: location.name,
+                    name: location.name,
+                    address: location.address,
                     latitude: Number(location.latitude),
                     longitude: Number(location.longitude),
                     thumbnail: ''