From e8e496cf37f0d0c0d3fbb9bb53667eaebf714963 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Mon, 28 Feb 2022 10:26:48 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=A5=BD=E5=8F=8B?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=E8=87=AA=E5=B7=B1=EF=BC=8C=E4=BD=86=E6=98=AF=E8=BF=98?=
 =?UTF-8?q?=E8=A6=81=E6=8A=8A=E8=87=AA=E5=B7=B1=E7=9A=84=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=88=B0=E5=86=85=E5=AD=98=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                          |  2 +-
 manifest.json                                    |  2 +-
 pages/im/components/conversation/messageCell.vue |  2 +-
 store/modules/im.js                              | 10 +++++++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/main.js b/main.js
index 5b16def..cb91b00 100644
--- a/main.js
+++ b/main.js
@@ -40,7 +40,7 @@ usqlite.connect({
         fail: () => {
             contactModel.create((err, res) => {
                 console.error('SQLITE 创建表格', err, res)
-                uni.setStorageSync('FIRST_RUN', 'X')
+                uni.setStorageSync('FIRST_RUN', true)
             })
         }
     })
diff --git a/manifest.json b/manifest.json
index 28d6cdf..3153cbb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "ZH-HEALTH",
     "appid" : "__UNI__C29473D",
     "description" : "ZH-HEALTH，您手上的健康管理专家",
-    "versionName" : "1.0.20",
+    "versionName" : "1.0.21",
     "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/pages/im/components/conversation/messageCell.vue b/pages/im/components/conversation/messageCell.vue
index 7041980..25b78a5 100644
--- a/pages/im/components/conversation/messageCell.vue
+++ b/pages/im/components/conversation/messageCell.vue
@@ -8,7 +8,7 @@
             <view class="header">
                 <view class="name">
                     {{ contact(item.targetId).name }}
-                    <text v-if="item.conversationType === 3" class='group'>[群]</text>
+                    <!-- <text v-if="item.conversationType === 3" class='group'>[群]</text> -->
                 </view>
                 <view class="time">{{ item.sentTime|timeCustomCN }}</view>
             </view>
diff --git a/store/modules/im.js b/store/modules/im.js
index 01e2b92..fadf352 100644
--- a/store/modules/im.js
+++ b/store/modules/im.js
@@ -6,7 +6,7 @@ import {
 export default {
     state: {
         contacts: {},
-        myInfo: {}
+        myInfo: {}
     },
     getters: {
         contacts(state) {
@@ -41,6 +41,7 @@ export default {
         updateContactInfo(state, contactInfo) {
             Vue.set(state.contacts, contactInfo.targetId, contactInfo)
         },
+        // 设置我的资料
         setSenderInfo(state, contactInfo) {
             state.myInfo = {
                 userId: contactInfo.targetId,
@@ -69,8 +70,11 @@ export default {
             })
         },
         setSenderInfo({
-            commit
-        }, contactInfo) {
+            commit,
+            dispatch
+        }, contactInfo) {
+            contactInfo.type = 0 // type 更改为0，标记是我自己
+            dispatch('updateContact', contactInfo)
             commit('setSenderInfo', contactInfo)
         },
         // 载入好友信息

From bf94cca5334d714e9b98b155f36df1a310216966 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Mon, 28 Feb 2022 12:15:11 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E9=94=AE=E7=9B=98=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=EF=BC=8C=E6=94=B9=E5=96=84=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=86=85=E5=AE=B9=E5=B0=91=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E6=8E=A8=E5=B1=8F=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=86=E6=98=AF=E6=9C=89=E7=82=B9=E5=8D=A1=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/conversation/messageCell.vue   |  2 +-
 pages/im/group/chat.vue                       | 25 ++++++--
 pages/im/mixins/imBase.js                     |  3 +
 pages/im/private/chat.vue                     | 57 +++++++++++++------
 utils/im/index.js                             |  3 +-
 5 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/pages/im/components/conversation/messageCell.vue b/pages/im/components/conversation/messageCell.vue
index 25b78a5..7041980 100644
--- a/pages/im/components/conversation/messageCell.vue
+++ b/pages/im/components/conversation/messageCell.vue
@@ -8,7 +8,7 @@
             <view class="header">
                 <view class="name">
                     {{ contact(item.targetId).name }}
-                    <!-- <text v-if="item.conversationType === 3" class='group'>[群]</text> -->
+                    <text v-if="item.conversationType === 3" class='group'>[群]</text>
                 </view>
                 <view class="time">{{ item.sentTime|timeCustomCN }}</view>
             </view>
diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index 9f1a5c1..62c8741 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="chat">
-        <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
+        <sent-message-bar id="msgbar" :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
 
         <view class="shade" @click="hidePop" v-show="showPop">
             <view class="pop" :style="popStyle" :class="{'show':showPop}">
@@ -11,7 +11,8 @@
         </view>
 
         <view class="body">
-            <view class="scroll">
+            <view class="place" :style="{ height: placeHeight + 'px' }"></view>
+            <view class="scroll" id="scroll">
                 <view class="cell" v-for="(message, index) in messages" :key="index">
                     <show-message-cell :message="message" isGroup @messageAction="messageAction" />
                 </view>
@@ -51,7 +52,9 @@
                 messages: [],
                 groupInfo: {
                     name: ''
-                }
+                },
+                placeHeight: uni.getSystemInfoSync().windowHeight,
+                bottomHeihgt: 56
             }
         },
         computed: {
@@ -68,7 +71,21 @@
         onShow() {
             this.initGroupInfo()
         },
-        onLoad(e) {
+        onLoad(e) {
+            const query = uni.createSelectorQuery().in(this);
+            this.$nextTick(function() {
+                query.select('#msgbar').boundingClientRect(bottom => {
+                    this.bottomHeihgt = bottom.height
+                }).exec();
+            })
+            // 监听键盘高度变化
+            uni.onKeyboardHeightChange(keyboard => {
+                query.select('#scroll').boundingClientRect(scroll => {
+                    const placeHeight = this.windowHeight - scroll.height - keyboard.height - this
+                        .bottomHeihgt
+                    this.placeHeight = placeHeight > 0 ? placeHeight : 0
+                }).exec();
+            })
             this.targetId = e.targetId
             // 获取历史消息列表
             this.getMessageList()
diff --git a/pages/im/mixins/imBase.js b/pages/im/mixins/imBase.js
index faaf422..fb37af2 100644
--- a/pages/im/mixins/imBase.js
+++ b/pages/im/mixins/imBase.js
@@ -12,6 +12,9 @@ export default {
         },
         sender() {
             return this.$store.getters.sender
+        },
+        windowHeight() {
+            return uni.getSystemInfoSync().windowHeight
         }
     },
     methods: {
diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue
index 24f48ce..ec87b2d 100644
--- a/pages/im/private/chat.vue
+++ b/pages/im/private/chat.vue
@@ -1,6 +1,7 @@
 <template>
     <view class="chat">
-        <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
+        <sent-message-bar id="msgbar" :conversationType="conversationType" :targetId="targetId"
+            @onSuccess="getNewMessage()" />
         <view class="shade" @click="hidePop" v-show="showPop">
             <view class="pop" :style="popStyle" :class="{'show':showPop}">
                 <view v-for="(item, index) in popButton" :key="index" @click="pickerMenu(item)">
@@ -10,7 +11,8 @@
         </view>
         <!-- chat -->
         <view class="body">
-            <view class="scroll">
+            <view class="place" :style="{ height: placeHeight + 'px' }"></view>
+            <view class="scroll" id="scroll">
                 <view class="cell" v-for="(message, index) in messages" :key="index">
                     <show-message-cell :message="message" @messageAction="messageAction" />
                 </view>
@@ -26,11 +28,11 @@
     import showMessageCell from '../components/showMessageCell'
     import utils from '@/utils/index.js'
     import imBase from '../mixins/imBase.js'
-    import messageActions from '../mixins/messageActions.js'
-    
+    import messageActions from '../mixins/messageActions.js'
+
     export default {
         mixins: [
-            imBase,
+            imBase,
             messageActions
         ],
         components: {
@@ -46,7 +48,9 @@
                     name: '',
                     userId: '',
                     portraitUrl: ''
-                }
+                },
+                placeHeight: uni.getSystemInfoSync().windowHeight,
+                bottomHeihgt: 56
             }
         },
         computed: {
@@ -59,13 +63,27 @@
                     }
                 }
             }
-        },
-        onShow() {
-            uni.setNavigationBarTitle({
-                title: this.contact(this.targetId).name
-            })
         },
-        onLoad(e) {
+        onShow() {
+            uni.setNavigationBarTitle({
+                title: this.contact(this.targetId).name
+            })
+        },
+        onLoad(e) {
+            const query = uni.createSelectorQuery().in(this);
+            this.$nextTick(function() {
+                query.select('#msgbar').boundingClientRect(bottom => {
+                    this.bottomHeihgt = bottom.height
+                }).exec();
+            })
+            // 监听键盘高度变化
+            uni.onKeyboardHeightChange(keyboard => {
+                query.select('#scroll').boundingClientRect(scroll => {
+                    const placeHeight = this.windowHeight - scroll.height - keyboard.height - this
+                        .bottomHeihgt
+                    this.placeHeight = placeHeight > 0 ? placeHeight : 0
+                }).exec();
+            })
             this.targetId = e.targetId
             this.userInfo = this.$store.getters.contactInfo(this.targetId)
             // 获取消息列表
@@ -106,16 +124,19 @@
             })
         },
         onUnload() {
+            uni.offKeyboardHeightChange(res => {
+                console.log('卸载监听键盘高度变化', res);
+            })
             uni.$off('onUserDelete_' + this.targetId)
             uni.$off('onReceiveMessage_' + this.targetId)
             uni.$off('onRecallMessage_' + this.targetId)
             uni.$off('onRecallMessage')
             uni.$off('onReadReceiptReceived')
-        },
-        onNavigationBarButtonTap() {
-            uni.navigateTo({
-                url:'/pages/im/friends/info?targetId='+this.targetId
-            })
+        },
+        onNavigationBarButtonTap() {
+            uni.navigateTo({
+                url: '/pages/im/friends/info?targetId=' + this.targetId
+            })
         },
         methods: {
             getNewMessage() {
@@ -160,6 +181,8 @@
 </script>
 
 <style scoped lang="scss">
+    .place {}
+
     /* 窗口 */
     .chat {
         background: $window-color;
diff --git a/utils/im/index.js b/utils/im/index.js
index 3c39229..6775eb9 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -66,13 +66,14 @@ const connect = (token, userInfo, callback) => {
         store.dispatch('setSenderInfo', userInfo)
         // 设置未读消息数量
         setNotifyBadge()
-        // 首次运行获取好友列表
+        // 首次运行获取好友列表
         const FK = 'ZH_CONTACT_' + userInfo.targetId
 
         uni.getStorage({
             key: FK,
             success: () => {
                 contactModel.find((err, results) => {
+                    console.log('初始化联系人信息', results);
                     results.map(item => {
                         store.dispatch('launchContact', item)
                     })

From 39b8f158c055c910b2a81dd753f1251ee7b0c2cf Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Mon, 28 Feb 2022 13:45:17 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A8=A1=E5=BC=8F=E4=B8=BApromise?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tki-file-manager/tki-file-manager.vue     | 183 +++++++++
 main.js                                       |  22 +-
 pages/im/components/sent/sentEmoji.vue        | 164 ++++----
 pages/im/components/sent/sentPopups.vue       |  38 +-
 pages/im/components/sent/sentText.vue         |  43 +-
 pages/im/components/sent/sentVoice.vue        | 388 +++++++++---------
 pages/im/group/chat.vue                       |  48 ++-
 utils/im/message.js                           | 225 +++++-----
 utils/im/models.js                            |   2 +-
 9 files changed, 647 insertions(+), 466 deletions(-)
 create mode 100644 components/tki-file-manager/tki-file-manager.vue

diff --git a/components/tki-file-manager/tki-file-manager.vue b/components/tki-file-manager/tki-file-manager.vue
new file mode 100644
index 0000000..5ee1634
--- /dev/null
+++ b/components/tki-file-manager/tki-file-manager.vue
@@ -0,0 +1,183 @@
+<template xlang="wxml" minapp="mpvue">
+	<view>
+	</view>
+</template>
+<script>
+export default {
+	name: 'tki-file-manager',
+	props: {},
+	data() {
+		return {
+		}
+	},
+	methods: {
+		_openFile() {
+			// #ifdef APP-PLUS
+			if (plus.os.name.toLowerCase() != "android") {
+				uni.showModal({
+					title: '提示',
+					content: '仅支持Android平台',
+					success: function (res) {}
+				});
+				return false
+			}
+			let that = this
+			// java 代码来自 http://www.cnblogs.com/panhouye/archive/2017/04/23/6751710.html
+			let main = plus.android.runtimeMainActivity();
+			let Intent = plus.android.importClass("android.content.Intent");
+
+			// 
+			let fileIntent = new Intent(Intent.ACTION_GET_CONTENT)
+			//fileIntent.setType(“image/*”);//选择图片
+			//fileIntent.setType(“audio/*”); //选择音频
+			//fileIntent.setType(“video/*”); //选择视频 （mp4 3gp 是android支持的视频格式）
+			//fileIntent.setType(“video/*;image/*”);//同时选择视频和图片
+			fileIntent.setType("*/*"); //无类型限制
+			fileIntent.addCategory(Intent.CATEGORY_OPENABLE);
+			main.startActivityForResult(fileIntent, 1);
+			// 获取回调
+			main.onActivityResult = function (requestCode, resultCode, data) {
+				let Activity = plus.android.importClass("android.app.Activity");
+				let ContentUris = plus.android.importClass("android.content.ContentUris");
+				let Cursor = plus.android.importClass("android.database.Cursor");
+				let Uri = plus.android.importClass("android.net.Uri");
+				let Build = plus.android.importClass("android.os.Build");
+				let Environment = plus.android.importClass("android.os.Environment");
+				let DocumentsContract = plus.android.importClass("android.provider.DocumentsContract");
+				let MediaStore = plus.android.importClass("android.provider.MediaStore");
+				// 给系统导入 contentResolver
+				let contentResolver = main.getContentResolver()
+				plus.android.importClass(contentResolver);
+				// 返回路径
+				let path = '';
+				if (resultCode == Activity.RESULT_OK) {
+					let uri = data.getData()
+					if ("file" == uri.getScheme().toLowerCase()) { //使用第三方应用打开
+						path = uri.getPath();
+						return;
+					}
+					if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) { //4.4以后
+						path = getPath(this, uri);
+					} else { //4.4以下下系统调用方法
+						path = getRealPathFromURI(uri)
+					}
+					// 回调
+					that.$emit('result', path)
+				}
+				// 4.4 以上 从Uri 获取文件绝对路径
+				function getPath(context, uri) {
+					let isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+					let scheme = uri.getScheme().toLowerCase()
+					if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
+						// ExternalStorageProvider
+						if (isExternalStorageDocument(uri)) {
+							let docId = DocumentsContract.getDocumentId(uri);
+							let split = docId.split(":");
+							let type = split[0];
+							// 如果是手机内部存储
+							if ("primary" == type.toLowerCase()) {
+								return Environment.getExternalStorageDirectory() + "/" + split[1];
+							} else {
+								return '/storage/' + type + "/" + split[1];
+							}
+						}
+						// DownloadsProvider
+						else if (isDownloadsDocument(uri)) {
+							let id = DocumentsContract.getDocumentId(uri);
+							let split = id.split(":");
+							return split[1]
+							// console.log(id)
+							// let contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), id);
+							// return getDataColumn(context, contentUri, null, null);
+						}
+						// MediaProvider
+						else if (isMediaDocument(uri)) {
+							let docId = DocumentsContract.getDocumentId(uri);
+							let split = docId.split(":");
+							let type = split[0];
+							let contentUri = null;
+							if ("image" == type.toLowerCase()) {
+								contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+							} else if ("video" == type.toLowerCase()) {
+								contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+							} else if ("audio" == type.toLowerCase()) {
+								contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+							}
+							let selection = "_id=?";
+							let selectionArgs = [split[1]];
+							return getDataColumn(context, contentUri, selection, selectionArgs);
+						}
+					}
+					// MediaStore (and general)
+					else if ("content" == scheme) {
+						return getDataColumn(context, uri, null, null);
+					}
+					// File
+					else if ("file" == scheme) {
+						return uri.getPath();
+					}
+				}
+				// 4.4 以下 获取 绝对路径
+				function getRealPathFromURI(uri) {
+					let res = null
+					let proj = [MediaStore.Images.Media.DATA]
+					let cursor = contentResolver.query(uri, proj, null, null, null);
+					if (null != cursor && cursor.moveToFirst()) {						;
+						let column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+						res = cursor.getString(column_index);
+						cursor.close();
+					}
+					return res;
+				}
+				// 通过uri 查找出绝对路径
+				function getDataColumn(context, uri, selection, selectionArgs) {
+					let cursor = null;
+					let column = "_data";
+					let projection = [column];
+					// let contentResolver = context.getContentResolver()
+					// plus.android.importClass(contentResolver);
+					cursor = contentResolver.query(uri, projection, selection, selectionArgs, null);
+					if (cursor != null && cursor.moveToFirst()) {
+						let column_index = cursor.getColumnIndexOrThrow(column);
+						return cursor.getString(column_index);
+					}
+				}
+				function isExternalStorageDocument(uri) {
+					return "com.android.externalstorage.documents" == uri.getAuthority() ? true : false
+				}
+				function isDownloadsDocument(uri) {
+					return "com.android.providers.downloads.documents" == uri.getAuthority() ? true : false
+				}
+				function isMediaDocument(uri) {
+					return "com.android.providers.media.documents" == uri.getAuthority() ? true : false
+				}
+			}
+			// #endif
+			// #ifndef APP-PLUS
+			uni.showModal({
+				title: '提示',
+				content: '仅支持Android平台',
+				success: function (res) {
+
+				}
+			});
+			// #endif
+		},
+	},
+	onLoad() {
+		// 			plus.io.resolveLocalFileSystemURL( '/storage/emulated/0', function(fs) {
+		// 				var directoryReader = fs.createReader();
+		// 				directoryReader.readEntries(function(entries) {
+		// 					var i;
+		// 					for (i = 0; i < entries.length; i++) {
+		// 						console.log(entries[i].name);
+		// 					}
+		// 				}, function(e) {
+		// 					console.log("Read entries failed: " + e.message);
+		// 				});
+		// 			}, function(e) {
+		// 				console.log("Request file system failed: " + e.message);
+		// 			});
+	}
+}
+</script>
\ No newline at end of file
diff --git a/main.js b/main.js
index cb91b00..4c6e272 100644
--- a/main.js
+++ b/main.js
@@ -31,21 +31,21 @@ Vue.use(router)
 Vue.config.productionTip = false
 Vue.prototype.$store = store
 
-usqlite.connect({
+uni.$sql = usqlite.connect({
     name: 'zh-health', // 数据库名称
     path: '_doc/health.db', // 路径
-}, (err, res) => {
-    uni.getStorage({
-        key: 'FIRST_RUN',
-        fail: () => {
-            contactModel.create((err, res) => {
-                console.error('SQLITE 创建表格', err, res)
-                uni.setStorageSync('FIRST_RUN', true)
-            })
-        }
+}, (err, res) => {
+    uni.getStorage({
+        key: 'FIRST_RUN',
+        fail: () => {
+            contactModel.create((err, res) => {
+                console.error('SQLITE 创建表格', err, res)
+                uni.setStorageSync('FIRST_RUN', true)
+            })
+        }
     })
 })
-
+
 App.mpType = 'app'
 const app = new Vue({
     store,
diff --git a/pages/im/components/sent/sentEmoji.vue b/pages/im/components/sent/sentEmoji.vue
index cb08343..d3c8e4d 100644
--- a/pages/im/components/sent/sentEmoji.vue
+++ b/pages/im/components/sent/sentEmoji.vue
@@ -1,79 +1,87 @@
-<template>
-    <view class="emoji--lay" v-show="show">
-        <scroll-view class="scroll" :scroll-y="true">
-            <view class="emoji-flex">
-                <view class="item" v-for="(item, index) in emojiArr" :key="index" @click="$emit('onEmoji', item)">{{item.emoji}}</view>
-            </view>
-        </scroll-view>
-        <view class="tool">
-            <!-- <view class="item" @click="$emit('delete')">删除</view> -->
-            <view class="item sent" @click="$emit('sent')">发送</view>
-        </view>
-    </view>
-</template>
-
-<script>
-    import emoji from '@/static/im/emoji'
-    export default{
-        props:{
-            show: {
-                type: Boolean,
-                default: () => {
-                    return false
-                }
-            }
-        },
-        data(){
-            return {
-                emojiArr: emoji
-            }
-        }
-    }
-</script>
-
-<style lang="scss" scoped>
-    .emoji--lay{
-        height: 600rpx;
-        position: relative;
-        .scroll{
-            height: 600rpx;
-            .emoji-flex{
-                padding: 15rpx 15rpx 120rpx;
-                display: flex;
-                flex-wrap: wrap;
-                .item{
-                    margin: 10rpx 15rpx;
-                    font-size: 52rpx;
-                    width: calc(12.5% - 30rpx);
-                    box-sizing: border-box;
-                }
-            }
-        }
-        .tool{
-            position: absolute;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            background-image: linear-gradient(to top, #FFF, rgba(255, 255, 255, .0));
-            display: flex;
-            justify-content: flex-end;
-            padding: 20rpx 30rpx 30rpx;
-            .item{
-                line-height: 70rpx;
-                border-radius: 35rpx;
-                width: 140rpx;
-                text-align: center;
-                font-size: 28rpx;
-                margin-left: 20rpx;
-                background: white;
-                border: solid 1rpx #f5f5f5;
-                box-sizing: border-box;
-                &.sent{
-                    border-color: #34CE98;
-                    background: #34CE98;
-                    color: white;
-                }
-            }
-        }
-    }
+<template>
+    <view class="emoji--lay" v-show="show">
+        <scroll-view class="scroll" :scroll-y="true">
+            <view class="emoji-flex">
+                <view class="item" v-for="(item, index) in emojiArr" :key="index" @click="$emit('onEmoji', item)">
+                    {{item.emoji}}
+                </view>
+            </view>
+        </scroll-view>
+        <view class="tool">
+            <!-- <view class="item" @click="$emit('delete')">删除</view> -->
+            <view class="item sent" @click="$emit('sent')">发送</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import emoji from '@/static/im/emoji'
+    export default {
+        props: {
+            show: {
+                type: Boolean,
+                default: () => {
+                    return false
+                }
+            }
+        },
+        data() {
+            return {
+                emojiArr: emoji
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .emoji--lay {
+        height: 600rpx;
+        position: relative;
+
+        .scroll {
+            height: 600rpx;
+
+            .emoji-flex {
+                padding: 15rpx 15rpx 120rpx;
+                display: flex;
+                flex-wrap: wrap;
+
+                .item {
+                    margin: 10rpx 15rpx;
+                    font-size: 52rpx;
+                    width: calc(12.5% - 30rpx);
+                    box-sizing: border-box;
+                }
+            }
+        }
+
+        .tool {
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            background-image: linear-gradient(to top, #FFF, rgba(255, 255, 255, .0));
+            display: flex;
+            justify-content: flex-end;
+            padding: 20rpx 30rpx 30rpx;
+
+            .item {
+                line-height: 70rpx;
+                border-radius: 35rpx;
+                width: 140rpx;
+                text-align: center;
+                font-size: 28rpx;
+                margin-left: 20rpx;
+                background: white;
+                border: solid 1rpx #f5f5f5;
+                box-sizing: border-box;
+
+                &.sent {
+                    border-color: #34CE98;
+                    background: #34CE98;
+                    color: white;
+                }
+            }
+        }
+    }
 </style>
diff --git a/pages/im/components/sent/sentPopups.vue b/pages/im/components/sent/sentPopups.vue
index d4824a0..87c025a 100644
--- a/pages/im/components/sent/sentPopups.vue
+++ b/pages/im/components/sent/sentPopups.vue
@@ -25,6 +25,8 @@
             <text class="text">文件</text>
         </view>
 
+        <tki-file-manager ref="filemanager" @result="resultPath"></tki-file-manager>
+
         <u-action-sheet :actions="callActions" cancelText="取消" @close="callShow = false" @select="singleCall"
             :show="callShow">
         </u-action-sheet>
@@ -34,11 +36,15 @@
 <script>
     import im from '@/utils/im/index.js'
     import imBase from '../../mixins/imBase.js'
+    import tkiFileManager from "@/components/tki-file-manager/tki-file-manager.vue"
 
     export default {
         mixins: [
             imBase
         ],
+        components: [
+            tkiFileManager
+        ],
         data() {
             return {
                 callActions: [{
@@ -68,6 +74,11 @@
             }
         },
         methods: {
+            resultPath(path) {
+                im.sentFile(this.conversationType, this.targetId, path).then(res => {
+                    console.log('发送文件', res);
+                })
+            },
             singleCall(e) {
                 uni.navigateTo({
                     url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type +
@@ -81,10 +92,15 @@
                             count: 9,
                             sourceType: ['album'],
                             success: res => {
-                                im.sentImage(this.conversationType, this.targetId, res.tempFilePaths[0],
-                                    this.sender, (res) => {
-                                        this.success()
-                                    })
+                                let funs = []
+                                res.tempFilePaths.map((item, index) => {
+                                    funs[index] = im.sentImage(this.conversationType, this
+                                        .targetId, item)
+                                })
+
+                                Promise.all(funs).then(res => {
+                                    this.success()
+                                })
                             }
                         })
                         break;
@@ -92,8 +108,8 @@
                         uni.chooseImage({
                             sourceType: ['camera'],
                             success: res => {
-                                im.sentImage(this.conversationType, this.targetId, res.tempFilePaths[0],
-                                    this.sender, (res) => {
+                                im.sentImage(this.conversationType, this.targetId, res.tempFilePaths[0])
+                                    .then((res) => {
                                         this.success()
                                     })
                             }
@@ -116,10 +132,12 @@
                         })
                         break;
                     case 'file':
-                        uni.showToast({
-                            icon: 'none',
-                            title: '功能正在开发中'
-                        })
+                        this.$refs.filemanager._openFile()
+
+                        //    uni.showToast({
+                        //        icon: 'none',
+                        //        title: '功能正在开发中'
+                        //    })
                         break;
                 }
             },
diff --git a/pages/im/components/sent/sentText.vue b/pages/im/components/sent/sentText.vue
index 81eac2f..7ccab83 100644
--- a/pages/im/components/sent/sentText.vue
+++ b/pages/im/components/sent/sentText.vue
@@ -1,17 +1,7 @@
 <template>
     <view class="sent--text">
-        <input
-            class="input"
-            type="text"
-            :auto-blur="true"
-            :focus="focusState"
-            v-model="inputTxt"
-            confirm-type="send"
-            cursor-spacing="10"
-            @focus="focus"
-            @blur="blur"
-            @confirm="sent"
-        />
+        <input class="input" type="text" :auto-blur="true" :focus="focusState" v-model="inputTxt" confirm-type="send"
+            cursor-spacing="10" @focus="focus" @blur="blur" @confirm="sent" />
     </view>
 </template>
 
@@ -55,33 +45,33 @@
                 focusState: false,
                 inputTxt: ''
             }
-        },
-        created(){
-            uni.$on('emojiValue', res => {
-                this.inputTxt = res.value
-            })
-        },
-        
+        },
+        created() {
+            uni.$on('emojiValue', res => {
+                this.inputTxt = res.value
+            })
+        },
+
         methods: {
-            sent() {
+            sent() {
                 if (!this.disabled) {
-                    im.sentText(this.conversationType, this.targetId, this.inputTxt, this.sender, () => {
+                    im.sentText(this.conversationType, this.targetId, this.inputTxt).then(() => {
                         RongIMLib.clearTextMessageDraft(this.conversationType, this.targetId)
                         this.$emit('success')
                         this.inputTxt = ''
                     })
                 }
             },
-            focus() {
+            focus() {
                 this.$emit('focus')
             },
-            blur(e) {
+            blur(e) {
                 uni.hideKeyboard()
                 this.$emit('blur', e.detail)
             }
-        },
-        destroyed() {
-            uni.$off('emojiValue')
+        },
+        destroyed() {
+            uni.$off('emojiValue')
         }
     }
 </script>
@@ -91,6 +81,7 @@
         display: flex;
         flex-direction: row;
         justify-content: space-between;
+
         .input {
             background: #F3F6FB;
             height: 70rpx;
diff --git a/pages/im/components/sent/sentVoice.vue b/pages/im/components/sent/sentVoice.vue
index a9e3903..644c0f4 100644
--- a/pages/im/components/sent/sentVoice.vue
+++ b/pages/im/components/sent/sentVoice.vue
@@ -1,21 +1,22 @@
 <template>
     <view class="send--voice">
-        <view class="voice" hover-class="chat-hover" @touchstart="startRecord" @touchend="stopRecord" @touchmove="touchmove">
+        <view class="voice" hover-class="chat-hover" @touchstart="startRecord" @touchend="stopRecord"
+            @touchmove="touchmove">
             <text class="button">按住 说话</text>
-        </view>
-        <!-- 录音层 -->
-        <view class="lay" v-if="showRecordTip">
-            <view class="lay-header">
-                <view class="modal">
-                    <image class="icon" src="@/static/icon/record-icon.png" mode="widthFix"></image>
-                    <text class="text">录音中 {{recordTime}} s</text>
-                </view>
-            </view>
-            <view class="lay-toast">上滑取消</view>
-            <view class="lay-footer">
-                <image class="lay-footer-icon videoFlicker" src="@/static/icon/audio_green.png" mode="widthFix"></image>
-                <view class="lay-footer-text">松开发送</view>
-            </view>
+        </view>
+        <!-- 录音层 -->
+        <view class="lay" v-if="showRecordTip">
+            <view class="lay-header">
+                <view class="modal">
+                    <image class="icon" src="@/static/icon/record-icon.png" mode="widthFix"></image>
+                    <text class="text">录音中 {{recordTime}} s</text>
+                </view>
+            </view>
+            <view class="lay-toast">上滑取消</view>
+            <view class="lay-footer">
+                <image class="lay-footer-icon videoFlicker" src="@/static/icon/audio_green.png" mode="widthFix"></image>
+                <view class="lay-footer-text">松开发送</view>
+            </view>
         </view>
     </view>
 </template>
@@ -23,8 +24,8 @@
 <script>
     import im from '@/utils/im/index.js'
     import permision from '@/utils/permission.js'
-    import imBase from '../../mixins/imBase.js'
-    
+    import imBase from '../../mixins/imBase.js'
+
     export default {
         mixins: [
             imBase
@@ -41,15 +42,15 @@
         },
         data() {
             return {
-                showRecordTip: false,
+                showRecordTip: false,
                 recordTime: 60,
                 interval: 0,
                 maxRecordTime: 60,
-                recorderManager: null,
-                mp3AudioSrc: null,
-                isMoveCancel: false,
-                isBetaPlay: false, // 暂时无用
-                startOffsetTop: 0
+                recorderManager: null,
+                mp3AudioSrc: null,
+                isMoveCancel: false,
+                isBetaPlay: false, // 暂时无用
+                startOffsetTop: 0
             }
         },
         computed: {
@@ -57,20 +58,20 @@
                 return this.$store.getters.sender
             }
         },
-        created() {
+        created() {
             this.recorderManager = uni.getRecorderManager()
         },
-        methods: {
+        methods: {
             // 检查安卓录制权限
             async getAndroidPermission() {
                 return await permision.requestAndroidPermission('android.permission.RECORD_AUDIO')
             },
             // 录制语音消息
-            startRecord(e) {
+            startRecord(e) {
                 this.getAndroidPermission().then(code => {
                     switch (code) {
-                        case 1:
-                            this.startOffsetTop = e.target.offsetTop
+                        case 1:
+                            this.startOffsetTop = e.target.offsetTop
                             this.showRecordTip = true
                             this.recorderManager.start()
                             this.interval = setInterval(() => {
@@ -96,103 +97,103 @@
                 })
             },
             // 结束录音
-            stopRecord(e) {
-                if (!this.showRecordTip) return
-                // 延迟500毫秒结束录音
-                setTimeout(()=> {
-                    this.recorderManager.stop()
-                    clearInterval(this.interval)
-                    // 监听录音结束
-                    this.recorderManager.onStop(res => {
-                        if(this.isMoveCancel) {
-                            this.isMoveCancel = false
-                            return
-                        }
-                        if((this.maxRecordTime - this.recordTime) <= 0){
-                            uni.showToast({
-                                title: '说话时间太短',
-                                icon : 'none',
-                            })
-                            this.showRecordTip = false
-                            return
-                        }
-                        this.mp3AudioSrc = res.tempFilePath
-                        this.showRecordTip = false
-                        this.senVoice()
-                    })
-                },500)
-            },
-            // 发送语音消息
-            senVoice(){
-                if(this.mp3AudioSrc === null) {
-                    uni.showToast({
-                        title: '发送失败, 暂无音频信息',
-                        icon : 'none'
-                    })
-                    return
-                }
-                im.sentVoice(this.conversationType, this.targetId, this.mp3AudioSrc, (this.maxRecordTime -
-                    this.recordTime), this.sender, () => {
-                    this.recordTime = this.maxRecordTime
-                    this.mp3AudioSrc = null
-                    setTimeout(() => {
-                        this.$emit('success')
-                        this.toastAudiMp3()
-                    }, 500)
-                })
-            },
-            // 移动按钮
-            touchmove(e){
-                if(this.startOffsetTop - e.changedTouches[0].pageY > 100){
-                    if(this.showRecordTip){
-                        this.isMoveCancel = true
-                        this.showRecordTip = false
-                        this.recorderManager.stop()
-                        clearInterval(this.interval)
-                        this.recordTime = this.maxRecordTime
-                        this.mp3AudioSrc = null
-                        return
-                    }
-                }
-            },
-            // 试听语音
-            startPlay() {
-                let betaAudio = uni.createInnerAudioContext()
-                betaAudio.src = this.mp3AudioSrc;
-                // 在播放中
-                if(this.isBetaPlay){
-                    betaAudio.stop()
-                    betaAudio.onStop(() => {
-                        this.isBetaPlay = false;
-                        betaAudio.destroy()
-                    })
-                    return
-                }
-                // 监听音频播放中
-                betaAudio.play()
-                betaAudio.onPlay(() => {
-                    this.isBetaPlay = true;
-                })
-                // 监听音频结束
-                betaAudio.onEnded(() => {
-                    this.isBetaPlay = false;
-                    betaAudio.destroy()
-                })
-            },
-            // 播放提示音乐
-            toastAudiMp3(){
-                let toastAudio = uni.createInnerAudioContext()
-                toastAudio.src = require('@/static/im/toast/sentVoice.mp3')
-                toastAudio.autoplay = true
-                toastAudio.volume = .1
-                toastAudio.onEnded(() => {
-                    toastAudio.destroy()
-                })
+            stopRecord(e) {
+                if (!this.showRecordTip) return
+                // 延迟500毫秒结束录音
+                setTimeout(() => {
+                    this.recorderManager.stop()
+                    clearInterval(this.interval)
+                    // 监听录音结束
+                    this.recorderManager.onStop(res => {
+                        if (this.isMoveCancel) {
+                            this.isMoveCancel = false
+                            return
+                        }
+                        if ((this.maxRecordTime - this.recordTime) <= 0) {
+                            uni.showToast({
+                                title: '说话时间太短',
+                                icon: 'none',
+                            })
+                            this.showRecordTip = false
+                            return
+                        }
+                        this.mp3AudioSrc = res.tempFilePath
+                        this.showRecordTip = false
+                        this.senVoice()
+                    })
+                }, 500)
+            },
+            // 发送语音消息
+            senVoice() {
+                if (this.mp3AudioSrc === null) {
+                    uni.showToast({
+                        title: '发送失败, 暂无音频信息',
+                        icon: 'none'
+                    })
+                    return
+                }
+                im.sentVoice(this.conversationType, this.targetId, this.mp3AudioSrc, (this.maxRecordTime -
+                    this.recordTime)).then(() => {
+                    this.recordTime = this.maxRecordTime
+                    this.mp3AudioSrc = null
+                    setTimeout(() => {
+                        this.$emit('success')
+                        this.toastAudiMp3()
+                    }, 500)
+                })
+            },
+            // 移动按钮
+            touchmove(e) {
+                if (this.startOffsetTop - e.changedTouches[0].pageY > 100) {
+                    if (this.showRecordTip) {
+                        this.isMoveCancel = true
+                        this.showRecordTip = false
+                        this.recorderManager.stop()
+                        clearInterval(this.interval)
+                        this.recordTime = this.maxRecordTime
+                        this.mp3AudioSrc = null
+                        return
+                    }
+                }
+            },
+            // 试听语音
+            startPlay() {
+                let betaAudio = uni.createInnerAudioContext()
+                betaAudio.src = this.mp3AudioSrc;
+                // 在播放中
+                if (this.isBetaPlay) {
+                    betaAudio.stop()
+                    betaAudio.onStop(() => {
+                        this.isBetaPlay = false;
+                        betaAudio.destroy()
+                    })
+                    return
+                }
+                // 监听音频播放中
+                betaAudio.play()
+                betaAudio.onPlay(() => {
+                    this.isBetaPlay = true;
+                })
+                // 监听音频结束
+                betaAudio.onEnded(() => {
+                    this.isBetaPlay = false;
+                    betaAudio.destroy()
+                })
+            },
+            // 播放提示音乐
+            toastAudiMp3() {
+                let toastAudio = uni.createInnerAudioContext()
+                toastAudio.src = require('@/static/im/toast/sentVoice.mp3')
+                toastAudio.autoplay = true
+                toastAudio.volume = .1
+                toastAudio.onEnded(() => {
+                    toastAudio.destroy()
+                })
             }
         }
     }
-</script>
-
+</script>
+
 <style>
     @keyframes playFlicker {
         0% {
@@ -225,77 +226,86 @@
             width: 400rpx;
             border-radius: 10rpx;
             margin-right: 15rpx;
-            padding: 0 20rpx;
-            font-weight: bold;
+            padding: 0 20rpx;
+            font-weight: bold;
+
             .button {
                 font-size: 30rpx;
                 color: #333;
             }
-        }
-        .lay{
-            position: absolute;
-            left: 0;
-            top: 0;
-            z-index: 9;
-            background: rgba($color: #000000, $alpha: .5);
-            height: 100vh;
-            width: 100vw;
-            box-sizing: border-box;
-            .lay-header{
-                height: calc(100vh - 140px);
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                .modal {
-                    display: flex;
-                    background: rgba(0, 0, 0, .6);
-                    position: fixed;
-                    height: 200rpx;
-                    width: 300rpx;
-                    border-radius: 10rpx;
-                    z-index: 99;
-                    flex-direction: column;
-                    align-items: center;
-                    justify-content: center;
-                    .icon {
-                        width: 88rpx;
-                        height: 88rpx;
-                    }
-                
-                    .text {
-                        font-size: 28rpx;
-                        color: #FFFFFF;
-                    }
-                }
-            }
-            .lay-toast{
-                text-align: center;
-                color: rgba($color: #fff, $alpha: .8);
-                font-size: 28rpx;
-            }
-            .lay-footer{
-                background-color: white;
-                height: 100px;
-                border-radius: 50% 50% 0 0;
-                position: absolute;
-                bottom: 0;
-                left: 0;
-                right: 0;
-                text-align: center;
-                display: flex;
-                justify-content: center;
-                flex-direction: column;
-                align-items: center;
-                .lay-footer-icon{
-                    width: 58rpx;
-                    height: 58rpx;
-                }
-                .lay-footer-text{
-                    line-height: 40rpx;
-                    color: gray;
-                    font-size: 28rpx;
-                }
-            }
+        }
+
+        .lay {
+            position: absolute;
+            left: 0;
+            top: 0;
+            z-index: 9;
+            background: rgba($color: #000000, $alpha: .5);
+            height: 100vh;
+            width: 100vw;
+            box-sizing: border-box;
+
+            .lay-header {
+                height: calc(100vh - 140px);
+                display: flex;
+                justify-content: center;
+                align-items: center;
+
+                .modal {
+                    display: flex;
+                    background: rgba(0, 0, 0, .6);
+                    position: fixed;
+                    height: 200rpx;
+                    width: 300rpx;
+                    border-radius: 10rpx;
+                    z-index: 99;
+                    flex-direction: column;
+                    align-items: center;
+                    justify-content: center;
+
+                    .icon {
+                        width: 88rpx;
+                        height: 88rpx;
+                    }
+
+                    .text {
+                        font-size: 28rpx;
+                        color: #FFFFFF;
+                    }
+                }
+            }
+
+            .lay-toast {
+                text-align: center;
+                color: rgba($color: #fff, $alpha: .8);
+                font-size: 28rpx;
+            }
+
+            .lay-footer {
+                background-color: white;
+                height: 100px;
+                border-radius: 50% 50% 0 0;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                right: 0;
+                text-align: center;
+                display: flex;
+                justify-content: center;
+                flex-direction: column;
+                align-items: center;
+
+                .lay-footer-icon {
+                    width: 58rpx;
+                    height: 58rpx;
+                }
+
+                .lay-footer-text {
+                    line-height: 40rpx;
+                    color: gray;
+                    font-size: 28rpx;
+                }
+            }
         }
     }
 </style>
diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index 62c8741..ea4661a 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -1,6 +1,7 @@
 <template>
     <view class="chat">
-        <sent-message-bar id="msgbar" :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
+        <sent-message-bar id="msgbar" :conversationType="conversationType" :targetId="targetId"
+            @onSuccess="getNewMessage()" />
 
         <view class="shade" @click="hidePop" v-show="showPop">
             <view class="pop" :style="popStyle" :class="{'show':showPop}">
@@ -31,13 +32,13 @@
     import showMessageCell from '../components/showMessageCell'
     import utils from '@/utils/index.js'
     import onGroupDismiss from '../mixins/onGroupDismiss.js'
-    import imBase from '../mixins/imBase.js'
+    import imBase from '../mixins/imBase.js'
     import messageActions from '../mixins/messageActions.js'
 
     export default {
         mixins: [
             imBase,
-            onGroupDismiss,
+            onGroupDismiss,
             messageActions
         ],
         components: {
@@ -52,8 +53,8 @@
                 messages: [],
                 groupInfo: {
                     name: ''
-                },
-                placeHeight: uni.getSystemInfoSync().windowHeight,
+                },
+                placeHeight: uni.getSystemInfoSync().windowHeight,
                 bottomHeihgt: 56
             }
         },
@@ -71,21 +72,21 @@
         onShow() {
             this.initGroupInfo()
         },
-        onLoad(e) {
-            const query = uni.createSelectorQuery().in(this);
-            this.$nextTick(function() {
-                query.select('#msgbar').boundingClientRect(bottom => {
-                    this.bottomHeihgt = bottom.height
-                }).exec();
-            })
-            // 监听键盘高度变化
-            uni.onKeyboardHeightChange(keyboard => {
-                query.select('#scroll').boundingClientRect(scroll => {
-                    const placeHeight = this.windowHeight - scroll.height - keyboard.height - this
-                        .bottomHeihgt
-                    this.placeHeight = placeHeight > 0 ? placeHeight : 0
-                }).exec();
-            })
+        onLoad(e) {
+            const query = uni.createSelectorQuery().in(this);
+            this.$nextTick(function() {
+                query.select('#msgbar').boundingClientRect(bottom => {
+                    this.bottomHeihgt = bottom.height
+                }).exec();
+            })
+            // 监听键盘高度变化
+            uni.onKeyboardHeightChange(keyboard => {
+                query.select('#scroll').boundingClientRect(scroll => {
+                    const placeHeight = this.windowHeight - scroll.height - keyboard.height - this
+                        .bottomHeihgt
+                    this.placeHeight = placeHeight > 0 ? placeHeight : 0
+                }).exec();
+            })
             this.targetId = e.targetId
             // 获取历史消息列表
             this.getMessageList()
@@ -116,7 +117,7 @@
             })
             // 清理聊天记录
             uni.$once('cleanGroupMessage', this.getMessageList)
-            uni.$on('onRecallMessage_' + this.targetId, (message) => {
+            uni.$on('onRecallMessage_' + this.targetId, (message) => {
                 this.messages = this.messages.map(item => {
                     if (message.messageId == item.messageId) {
                         return message
@@ -175,12 +176,9 @@
                     20,
                     true,
                     (messages) => {
-                        console.log('获取消息列表', messages);
                         const msgs = messages.filter(item => item.receivedStatus == 0)
-                        console.log('未读消息', msgs);
                         if (msgs.length) {
                             RongIMLib.sendReadReceiptResponse(3, this.targetId, msgs, (res) => {
-                                console.error('发送群聊已读回执成功', res);
                                 msgs.map(item => {
                                     RongIMLib.setMessageReceivedStatus(item.messageId, 1)
                                 })
@@ -245,7 +243,7 @@
         height: 100%;
         z-index: 999;
 
-        .pop {
+        .pop {
             border-radius: 10rpx;
             position: fixed;
             z-index: 101;
diff --git a/utils/im/message.js b/utils/im/message.js
index 75fff1f..76d37d0 100644
--- a/utils/im/message.js
+++ b/utils/im/message.js
@@ -80,35 +80,37 @@ const getGroupPendinglist = (targetId, callback) => {
  * @param {string}  content 消息内容
  * @param {function}  callback 回调函数
  */
-const sentText = (conversationType, targetId, content, user, callback) => {
-    const msg = {
-        conversationType: conversationType,
-        targetId: String(targetId),
-        content: {
-            objectName: 'RC:TxtMsg',
-            content: content,
-            userInfo: user
-        }
-    }
-
-    RongIMLib.sendMessage(msg, ({
-        code,
-        messageId
-    }) => {
-        if (code === 0) {
-            if (conversationType == 3) {
-                RongIMLib.sendReadReceiptRequest(messageId, (res) => {
-                    console.log('发送回执请求', res);
-                })
+const sentText = (conversationType, targetId, content) => {
+    return new Promise((resolve, reject) => {
+        const msg = {
+            conversationType: conversationType,
+            targetId: String(targetId),
+            content: {
+                objectName: 'RC:TxtMsg',
+                content: content,
+                userInfo: store.getters.sender
             }
-            callback(messageId)
-        } else {
-            console.log('发送失败', msg);
-            uni.showToast({
-                icon: 'none',
-                title: '发送失败' + code
-            })
         }
+
+        RongIMLib.sendMessage(msg, ({
+            code,
+            messageId
+        }) => {
+            if (code === 0) {
+                if (conversationType == 3) {
+                    RongIMLib.sendReadReceiptRequest(messageId, (res) => {
+                        console.log('发送回执请求', res);
+                    })
+                }
+                resolve(messageId)
+            } else {
+                uni.showToast({
+                    icon: 'none',
+                    title: '发送失败' + code
+                })
+                reject(code)
+            }
+        })
     })
 }
 
@@ -118,112 +120,84 @@ const sentText = (conversationType, targetId, content, user, callback) => {
  * @param {string}  targetId 会话id
  * @param {string}  voiceUrl 录音的本地路径
  * @param {integer}  time 录音时长
- * @param {function}  callback 录音时长
+ * @param {function}  user 本人信息
  */
-const sentVoice = (conversationType, targetId, voiceUrl, time, user, callback) => {
-    const msg = {
-        conversationType: conversationType,
-        targetId: String(targetId),
-        content: {
-            objectName: 'RC:HQVCMsg',
-            local: 'file:///' + plus.io.convertLocalFileSystemURL(voiceUrl),
-            duration: time == 0 ? 1 : time,
-            userInfo: user
-        }
-    }
-    RongIMLib.sendMediaMessage(msg, {
-        success: (messageId) => {
-            callback(messageId);
-        },
-        progress: (progress, messageId) => {
-            console.log(messageId);
-        },
-        cancel: (messageId) => {
-            // 发送取消回调
-        },
-        error: (errorCode, messageId) => {
-            console.log(errorCode, messageId);
+const sentVoice = (conversationType, targetId, voiceUrl, time) => {
+    return new Promise((resolve, reject) => {
+        const msg = {
+            conversationType: conversationType,
+            targetId: String(targetId),
+            content: {
+                objectName: 'RC:HQVCMsg',
+                local: 'file://' + plus.io.convertLocalFileSystemURL(voiceUrl),
+                duration: time == 0 ? 1 : time,
+                userInfo: store.getters.sender
+            }
         }
+        RongIMLib.sendMediaMessage(msg, {
+            success: (messageId) => {
+                resolve(messageId);
+            },
+            progress: (progress, messageId) => {},
+            cancel: (messageId) => {},
+            error: (errorCode, messageId) => {
+                reject(errorCode);
+            }
+        })
     })
 }
 
-const sentImage = (conversationType, targetId, imageUrl, user, callback) => {
-    const msg = {
-        conversationType: conversationType,
-        targetId: String(targetId),
-        content: {
-            objectName: 'RC:ImgMsg',
-            local: 'file:///' + plus.io.convertLocalFileSystemURL(imageUrl),
-            userInfo: user
-        }
-    }
-    RongIMLib.sendMediaMessage(msg, {
-        success: (messageId) => {
-            callback(messageId);
-        },
-        progress: (progress, messageId) => {
-            console.log(messageId);
-        },
-        cancel: (messageId) => {
-            // 发送取消回调
-        },
-        error: (errorCode, messageId) => {
-            console.log(errorCode, messageId);
-        }
+// 发送的图片，可能会涉及到一次多张，用Promise来确保前端一次性清算
+const sentImage = (conversationType, targetId, imageUrl) => {
+    return new Promise((resolve, reject) => {
+        uni.getImageInfo({
+            src: imageUrl,
+            success: (imgInfo) => {
+                const msg = {
+                    conversationType: conversationType,
+                    targetId: String(targetId),
+                    content: {
+                        objectName: 'RC:ImgMsg',
+                        local: imgInfo.path,
+                        userInfo: store.getters.sender
+                    }
+                }
+                RongIMLib.sendMediaMessage(msg, {
+                    success: (messageId) => {
+                        resolve(messageId)
+                    },
+                    progress: (progress, messageId) => {},
+                    cancel: (messageId) => {},
+                    error: (errorCode, messageId) => {
+                        reject(errorCode)
+                    }
+                })
+            }
+        })
     })
 }
 
-const sentGif = (conversationType, targetId, gifUrl, time, user, callback) => {
-    const msg = {
-        conversationType: conversationType,
-        targetId: String(targetId),
-        content: {
-            objectName: 'RC:GIFMsg',
-            local: 'file:///' + plus.io.convertLocalFileSystemURL(gifUrl),
-            duration: time,
-            userInfo: user
-        }
-    }
-    RongIMLib.sendMediaMessage(msg, {
-        success: (messageId) => {
-            callback(messageId);
-        },
-        progress: (progress, messageId) => {
-            console.log(messageId);
-        },
-        cancel: (messageId) => {
-            // 发送取消回调
-        },
-        error: (errorCode, messageId) => {
-            console.log(errorCode, messageId);
-        }
-    })
-}
-
-const sendFile = (conversationType, targetId, fileUrl, time, user, callback) => {
-    const msg = {
-        conversationType: conversationType,
-        targetId: String(targetId),
-        content: {
-            objectName: 'RC:FileMsg',
-            local: 'file:///' + plus.io.convertLocalFileSystemURL(fileUrl),
-            duration: time,
-            userInfo: user
-        }
-    }
-    RongIMLib.sendMediaMessage(msg, {
-        success: (messageId) => {
-            callback(messageId);
-        },
-        progress: (progress, messageId) => {
-            console.log(messageId);
-        },
-        cancel: (messageId) => {
-            // 发送取消回调
-        },
-        error: (errorCode, messageId) => {
-            console.log(errorCode, messageId);
+const sentFile = (conversationType, targetId, fileUrl) => {
+    return new Promise((resolve, reject) => {
+        const msg = {
+            conversationType: conversationType,
+            targetId: String(targetId),
+            content: {
+                objectName: 'RC:FileMsg',
+                local: 'file:///' + plus.io.convertLocalFileSystemURL(fileUrl),
+                userInfo: store.getters.sender
+            }
         }
+        RongIMLib.sendMediaMessage(msg, {
+            success: (messageId) => {
+                resolve(messageId)
+            },
+            progress: (progress, messageId) => {},
+            cancel: (messageId) => {},
+            error: (errorCode, messageId) => {
+                reject(errorCode)
+            }
+        })
     })
 }
 
@@ -234,6 +208,5 @@ export default {
     sentText,
     sentVoice,
     sentImage,
-    sentGif,
-    sendFile
+    sentFile
 }
diff --git a/utils/im/models.js b/utils/im/models.js
index 58aa286..ffe5efc 100644
--- a/utils/im/models.js
+++ b/utils/im/models.js
@@ -1,6 +1,6 @@
 import {
     usqlite
-} from '@/uni_modules/onemue-USQLite/js_sdk/usqlite.js'
+} from '@/uni_modules/onemue-USQLite/js_sdk/usqlite.js'
 
 const contactModel = usqlite.model('contacts', {
     targetId: {

From bce7822e51e400d183052a05084ad574571f403f Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Mon, 28 Feb 2022 16:28:14 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=B0=E7=90=86=E4=BD=8D=E7=BD=AE=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tki-file-manager/tki-file-manager.vue     | 361 +++++++++---------
 manifest.json                                 |  45 +--
 pages/im/components/sent/sentPopups.vue       |  37 +-
 pages/im/components/show/showFile.vue         |  95 +++++
 pages/im/components/show/showLocation.vue     |  86 +++++
 pages/im/components/show/showNormal.vue       |  30 ++
 pages/im/components/showMessageCell.vue       |  13 +-
 pages/im/group/chat.vue                       |   1 +
 pages/im/index.vue                            |   4 +-
 utils/im/listeners.js                         |   3 +-
 utils/im/message.js                           |  53 ++-
 11 files changed, 505 insertions(+), 223 deletions(-)
 create mode 100644 pages/im/components/show/showFile.vue
 create mode 100644 pages/im/components/show/showLocation.vue
 create mode 100644 pages/im/components/show/showNormal.vue

diff --git a/components/tki-file-manager/tki-file-manager.vue b/components/tki-file-manager/tki-file-manager.vue
index 5ee1634..2d1f0c3 100644
--- a/components/tki-file-manager/tki-file-manager.vue
+++ b/components/tki-file-manager/tki-file-manager.vue
@@ -1,183 +1,188 @@
 <template xlang="wxml" minapp="mpvue">
-	<view>
-	</view>
+    <view>
+    </view>
 </template>
 <script>
-export default {
-	name: 'tki-file-manager',
-	props: {},
-	data() {
-		return {
-		}
-	},
-	methods: {
-		_openFile() {
-			// #ifdef APP-PLUS
-			if (plus.os.name.toLowerCase() != "android") {
-				uni.showModal({
-					title: '提示',
-					content: '仅支持Android平台',
-					success: function (res) {}
-				});
-				return false
-			}
-			let that = this
-			// java 代码来自 http://www.cnblogs.com/panhouye/archive/2017/04/23/6751710.html
-			let main = plus.android.runtimeMainActivity();
-			let Intent = plus.android.importClass("android.content.Intent");
+    export default {
+        name: 'tki-file-manager',
+        props: {},
+        data() {
+            return {}
+        },
+        methods: {
+            _openFile() {
+                // #ifdef APP-PLUS
+                if (plus.os.name.toLowerCase() != "android") {
+                    uni.showModal({
+                        title: '提示',
+                        content: '仅支持Android平台',
+                        success: function(res) {}
+                    });
+                    return false
+                }
+                let that = this
+                // java 代码来自 http://www.cnblogs.com/panhouye/archive/2017/04/23/6751710.html
+                let main = plus.android.runtimeMainActivity();
+                let Intent = plus.android.importClass("android.content.Intent");
 
-			// 
-			let fileIntent = new Intent(Intent.ACTION_GET_CONTENT)
-			//fileIntent.setType(“image/*”);//选择图片
-			//fileIntent.setType(“audio/*”); //选择音频
-			//fileIntent.setType(“video/*”); //选择视频 （mp4 3gp 是android支持的视频格式）
-			//fileIntent.setType(“video/*;image/*”);//同时选择视频和图片
-			fileIntent.setType("*/*"); //无类型限制
-			fileIntent.addCategory(Intent.CATEGORY_OPENABLE);
-			main.startActivityForResult(fileIntent, 1);
-			// 获取回调
-			main.onActivityResult = function (requestCode, resultCode, data) {
-				let Activity = plus.android.importClass("android.app.Activity");
-				let ContentUris = plus.android.importClass("android.content.ContentUris");
-				let Cursor = plus.android.importClass("android.database.Cursor");
-				let Uri = plus.android.importClass("android.net.Uri");
-				let Build = plus.android.importClass("android.os.Build");
-				let Environment = plus.android.importClass("android.os.Environment");
-				let DocumentsContract = plus.android.importClass("android.provider.DocumentsContract");
-				let MediaStore = plus.android.importClass("android.provider.MediaStore");
-				// 给系统导入 contentResolver
-				let contentResolver = main.getContentResolver()
-				plus.android.importClass(contentResolver);
-				// 返回路径
-				let path = '';
-				if (resultCode == Activity.RESULT_OK) {
-					let uri = data.getData()
-					if ("file" == uri.getScheme().toLowerCase()) { //使用第三方应用打开
-						path = uri.getPath();
-						return;
-					}
-					if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) { //4.4以后
-						path = getPath(this, uri);
-					} else { //4.4以下下系统调用方法
-						path = getRealPathFromURI(uri)
-					}
-					// 回调
-					that.$emit('result', path)
-				}
-				// 4.4 以上 从Uri 获取文件绝对路径
-				function getPath(context, uri) {
-					let isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
-					let scheme = uri.getScheme().toLowerCase()
-					if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
-						// ExternalStorageProvider
-						if (isExternalStorageDocument(uri)) {
-							let docId = DocumentsContract.getDocumentId(uri);
-							let split = docId.split(":");
-							let type = split[0];
-							// 如果是手机内部存储
-							if ("primary" == type.toLowerCase()) {
-								return Environment.getExternalStorageDirectory() + "/" + split[1];
-							} else {
-								return '/storage/' + type + "/" + split[1];
-							}
-						}
-						// DownloadsProvider
-						else if (isDownloadsDocument(uri)) {
-							let id = DocumentsContract.getDocumentId(uri);
-							let split = id.split(":");
-							return split[1]
-							// console.log(id)
-							// let contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), id);
-							// return getDataColumn(context, contentUri, null, null);
-						}
-						// MediaProvider
-						else if (isMediaDocument(uri)) {
-							let docId = DocumentsContract.getDocumentId(uri);
-							let split = docId.split(":");
-							let type = split[0];
-							let contentUri = null;
-							if ("image" == type.toLowerCase()) {
-								contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
-							} else if ("video" == type.toLowerCase()) {
-								contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
-							} else if ("audio" == type.toLowerCase()) {
-								contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
-							}
-							let selection = "_id=?";
-							let selectionArgs = [split[1]];
-							return getDataColumn(context, contentUri, selection, selectionArgs);
-						}
-					}
-					// MediaStore (and general)
-					else if ("content" == scheme) {
-						return getDataColumn(context, uri, null, null);
-					}
-					// File
-					else if ("file" == scheme) {
-						return uri.getPath();
-					}
-				}
-				// 4.4 以下 获取 绝对路径
-				function getRealPathFromURI(uri) {
-					let res = null
-					let proj = [MediaStore.Images.Media.DATA]
-					let cursor = contentResolver.query(uri, proj, null, null, null);
-					if (null != cursor && cursor.moveToFirst()) {						;
-						let column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
-						res = cursor.getString(column_index);
-						cursor.close();
-					}
-					return res;
-				}
-				// 通过uri 查找出绝对路径
-				function getDataColumn(context, uri, selection, selectionArgs) {
-					let cursor = null;
-					let column = "_data";
-					let projection = [column];
-					// let contentResolver = context.getContentResolver()
-					// plus.android.importClass(contentResolver);
-					cursor = contentResolver.query(uri, projection, selection, selectionArgs, null);
-					if (cursor != null && cursor.moveToFirst()) {
-						let column_index = cursor.getColumnIndexOrThrow(column);
-						return cursor.getString(column_index);
-					}
-				}
-				function isExternalStorageDocument(uri) {
-					return "com.android.externalstorage.documents" == uri.getAuthority() ? true : false
-				}
-				function isDownloadsDocument(uri) {
-					return "com.android.providers.downloads.documents" == uri.getAuthority() ? true : false
-				}
-				function isMediaDocument(uri) {
-					return "com.android.providers.media.documents" == uri.getAuthority() ? true : false
-				}
-			}
-			// #endif
-			// #ifndef APP-PLUS
-			uni.showModal({
-				title: '提示',
-				content: '仅支持Android平台',
-				success: function (res) {
+                // 
+                let fileIntent = new Intent(Intent.ACTION_GET_CONTENT)
+                //fileIntent.setType(“image/*”);//选择图片
+                //fileIntent.setType(“audio/*”); //选择音频
+                //fileIntent.setType(“video/*”); //选择视频 （mp4 3gp 是android支持的视频格式）
+                //fileIntent.setType(“video/*;image/*”);//同时选择视频和图片
+                fileIntent.setType("*/*"); //无类型限制
+                fileIntent.addCategory(Intent.CATEGORY_OPENABLE);
+                main.startActivityForResult(fileIntent, 1);
+                // 获取回调
+                main.onActivityResult = function(requestCode, resultCode, data) {
+                    let Activity = plus.android.importClass("android.app.Activity");
+                    let ContentUris = plus.android.importClass("android.content.ContentUris");
+                    let Cursor = plus.android.importClass("android.database.Cursor");
+                    let Uri = plus.android.importClass("android.net.Uri");
+                    let Build = plus.android.importClass("android.os.Build");
+                    let Environment = plus.android.importClass("android.os.Environment");
+                    let DocumentsContract = plus.android.importClass("android.provider.DocumentsContract");
+                    let MediaStore = plus.android.importClass("android.provider.MediaStore");
+                    // 给系统导入 contentResolver
+                    let contentResolver = main.getContentResolver()
+                    plus.android.importClass(contentResolver);
+                    // 返回路径
+                    let path = '';
+                    if (resultCode == Activity.RESULT_OK) {
+                        let uri = data.getData()
 
-				}
-			});
-			// #endif
-		},
-	},
-	onLoad() {
-		// 			plus.io.resolveLocalFileSystemURL( '/storage/emulated/0', function(fs) {
-		// 				var directoryReader = fs.createReader();
-		// 				directoryReader.readEntries(function(entries) {
-		// 					var i;
-		// 					for (i = 0; i < entries.length; i++) {
-		// 						console.log(entries[i].name);
-		// 					}
-		// 				}, function(e) {
-		// 					console.log("Read entries failed: " + e.message);
-		// 				});
-		// 			}, function(e) {
-		// 				console.log("Request file system failed: " + e.message);
-		// 			});
-	}
-}
-</script>
\ No newline at end of file
+                        if ("file" == uri.getScheme().toLowerCase()) { //使用第三方应用打开
+                            path = uri.getPath();
+                            return;
+                        }
+                        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) { //4.4以后
+                            path = getPath(this, uri);
+                        } else { //4.4以下下系统调用方法
+                            path = getRealPathFromURI(uri)
+                        }
+                        // 回调
+                        that.$emit('result', path)
+                    }
+                    // 4.4 以上 从Uri 获取文件绝对路径
+                    function getPath(context, uri) {
+                        let isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+                        let scheme = uri.getScheme().toLowerCase()
+
+                        if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
+                            // ExternalStorageProvider
+                            if (isExternalStorageDocument(uri)) {
+                                let docId = DocumentsContract.getDocumentId(uri);
+                                let split = docId.split(":");
+                                let type = split[0];
+                                // 如果是手机内部存储
+                                if ("primary" == type.toLowerCase()) {
+                                    return Environment.getExternalStorageDirectory() + "/" + split[1];
+                                } else {
+                                    return '/storage/' + type + "/" + split[1];
+                                }
+                            }
+                            // DownloadsProvider
+                            else if (isDownloadsDocument(uri)) {
+                                let docId = DocumentsContract.getDocumentId(uri);
+                                let split = docId.split(":");
+                                return split[1]
+                                // console.log(id)
+                                // let contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), id);
+                                // return getDataColumn(context, contentUri, null, null);
+                            }
+                            // MediaProvider
+                            else if (isMediaDocument(uri)) {
+                                let docId = DocumentsContract.getDocumentId(uri);
+                                let split = docId.split(":");
+                                let type = split[0];
+                                let contentUri = null;
+                                if ("image" == type.toLowerCase()) {
+                                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+                                } else if ("video" == type.toLowerCase()) {
+                                    contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+                                } else if ("audio" == type.toLowerCase()) {
+                                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+                                }
+                                let selection = "_id=?";
+                                let selectionArgs = [split[1]];
+                                return getDataColumn(context, contentUri, selection, selectionArgs);
+                            }
+                        }
+                        // MediaStore (and general)
+                        else if ("content" == scheme) {
+                            return getDataColumn(context, uri, null, null);
+                        }
+                        // File
+                        else if ("file" == scheme) {
+                            return uri.getPath();
+                        }
+                    }
+                    // 4.4 以下 获取 绝对路径
+                    function getRealPathFromURI(uri) {
+                        let res = null
+                        let proj = [MediaStore.Images.Media.DATA]
+                        let cursor = contentResolver.query(uri, proj, null, null, null);
+                        if (null != cursor && cursor.moveToFirst()) {
+                            ;
+                            let column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                            res = cursor.getString(column_index);
+                            cursor.close();
+                        }
+                        return res;
+                    }
+                    // 通过uri 查找出绝对路径
+                    function getDataColumn(context, uri, selection, selectionArgs) {
+                        let cursor = null;
+                        let column = "_data";
+                        let projection = [column];
+                        // let contentResolver = context.getContentResolver()
+                        // plus.android.importClass(contentResolver);
+                        cursor = contentResolver.query(uri, projection, selection, selectionArgs, null);
+                        if (cursor != null && cursor.moveToFirst()) {
+                            let column_index = cursor.getColumnIndexOrThrow(column);
+                            return cursor.getString(column_index);
+                        }
+                    }
+
+                    function isExternalStorageDocument(uri) {
+                        return "com.android.externalstorage.documents" == uri.getAuthority() ? true : false
+                    }
+
+                    function isDownloadsDocument(uri) {
+                        return "com.android.providers.downloads.documents" == uri.getAuthority() ? true : false
+                    }
+
+                    function isMediaDocument(uri) {
+                        return "com.android.providers.media.documents" == uri.getAuthority() ? true : false
+                    }
+                }
+                // #endif
+                // #ifndef APP-PLUS
+                uni.showModal({
+                    title: '提示',
+                    content: '仅支持Android平台',
+                    success: function(res) {
+
+                    }
+                });
+                // #endif
+            },
+        },
+        onLoad() {
+            // 			plus.io.resolveLocalFileSystemURL( '/storage/emulated/0', function(fs) {
+            // 				var directoryReader = fs.createReader();
+            // 				directoryReader.readEntries(function(entries) {
+            // 					var i;
+            // 					for (i = 0; i < entries.length; i++) {
+            // 						console.log(entries[i].name);
+            // 					}
+            // 				}, function(e) {
+            // 					console.log("Read entries failed: " + e.message);
+            // 				});
+            // 			}, function(e) {
+            // 				console.log("Request file system failed: " + e.message);
+            // 			});
+        }
+    }
+</script>
diff --git a/manifest.json b/manifest.json
index 3153cbb..66c6eac 100644
--- a/manifest.json
+++ b/manifest.json
@@ -47,6 +47,7 @@
                     "<uses-permission android:name=\"android.permission.INTERNET\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
@@ -112,33 +113,33 @@
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "",
-                    "xhdpi" : "",
-                    "xxhdpi" : "",
-                    "xxxhdpi" : ""
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                 },
                 "ios" : {
-                    "appstore" : "",
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
                     "ipad" : {
-                        "app" : "",
-                        "app@2x" : "",
-                        "notification" : "",
-                        "notification@2x" : "",
-                        "proapp@2x" : "",
-                        "settings" : "",
-                        "settings@2x" : "",
-                        "spotlight" : "",
-                        "spotlight@2x" : ""
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                     },
                     "iphone" : {
-                        "app@2x" : "",
-                        "app@3x" : "",
-                        "notification@2x" : "",
-                        "notification@3x" : "",
-                        "settings@2x" : "",
-                        "settings@3x" : "",
-                        "spotlight@2x" : "",
-                        "spotlight@3x" : ""
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
             },
diff --git a/pages/im/components/sent/sentPopups.vue b/pages/im/components/sent/sentPopups.vue
index 87c025a..b847a97 100644
--- a/pages/im/components/sent/sentPopups.vue
+++ b/pages/im/components/sent/sentPopups.vue
@@ -25,7 +25,7 @@
             <text class="text">文件</text>
         </view>
 
-        <tki-file-manager ref="filemanager" @result="resultPath"></tki-file-manager>
+        <tki-file-manager ref="filemanager" @result="sendFileMessage"></tki-file-manager>
 
         <u-action-sheet :actions="callActions" cancelText="取消" @close="callShow = false" @select="singleCall"
             :show="callShow">
@@ -42,9 +42,9 @@
         mixins: [
             imBase
         ],
-        components: [
+        components: {
             tkiFileManager
-        ],
+        },
         data() {
             return {
                 callActions: [{
@@ -74,10 +74,22 @@
             }
         },
         methods: {
-            resultPath(path) {
-                im.sentFile(this.conversationType, this.targetId, path).then(res => {
-                    console.log('发送文件', res);
-                })
+            sendFileMessage(path) {
+                if (path) {
+                    im.sentFile(this.conversationType, this.targetId, path).then(res => {
+                        this.success()
+                    }).catch(err => {
+                        uni.showToast({
+                            icon: 'none',
+                            title: '发送文件失败' + err
+                        })
+                    })
+                } else {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '选择文件失败'
+                    })
+                }
             },
             singleCall(e) {
                 uni.navigateTo({
@@ -120,8 +132,10 @@
                         break;
                     case 'location':
                         uni.chooseLocation({
-                            success: (c) => {
-                                console.log(c);
+                            success: (location) => {
+                                im.sentLocation(this.conversationType, this.targetId, location).then(() => {
+                                    this.success()
+                                })
                             }
                         })
                         break;
@@ -133,11 +147,6 @@
                         break;
                     case 'file':
                         this.$refs.filemanager._openFile()
-
-                        //    uni.showToast({
-                        //        icon: 'none',
-                        //        title: '功能正在开发中'
-                        //    })
                         break;
                 }
             },
diff --git a/pages/im/components/show/showFile.vue b/pages/im/components/show/showFile.vue
new file mode 100644
index 0000000..56e4951
--- /dev/null
+++ b/pages/im/components/show/showFile.vue
@@ -0,0 +1,95 @@
+<template>
+    <view class="msg--file">
+        <message-state :message="message" :isGroup="isGroup" :isRemote="isRemote" />
+
+        <view class="">
+            <view class="name" v-if="isGroup && isRemote">{{ contact(message.senderUserId).name }}</view>
+            <view class="file" :class="isRemote ? 'left': 'right'">
+                <view class="img">
+                    {{ content.fileType }}
+                    {{ content.name }}
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<!-- "content": {
+        "fileType": "jpg",
+        "remote": "https://rongcloud-spic.ronghub.com/Xl1PRVpHVldeRQAGVgEHAAcBBgYGBgcDAwMGMjA3MA%3D%3D.jpg?e=1661583313&token=livk5rb3__JZjCtEiMxXpQ8QscLxbNLehwhHySnX:t58hs4uvM1RFsBeKLTcDbVW-k5w=",
+        "size": 347062,
+        "objectName": "RC:FileMsg",
+        "name": "Screenshot_2022-02-25-14-44-55-886_io.zhhealth.app.jpg",
+        "local": "file:///storage/emulated/0/DCIM/Screenshots/Screenshot_2022-02-25-14-44-55-886_io.zhhealth.app.jpg",
+        "userInfo": {
+            "userId": "10051",
+            "name": "Jason.电信",
+            "extra": "",
+            "portraitUrl": "http://storage.zh.shangkelian.cn/uploads/2022/02/16/29b13f5301694721ad7acd8b8b67bbd9.jpg"
+        }
+    }, -->
+<script>
+    import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
+    import messageState from './messageState'
+    import imBase from '../../mixins/imBase.js'
+
+    export default {
+        mixins: [
+            imBase
+        ],
+        props: {
+            message: {
+                type: Object,
+                default: () => {
+                    return {}
+                }
+            },
+            isGroup: {
+                type: Boolean,
+                default: false
+            }
+        },
+        components: {
+            messageState
+        },
+        computed: {
+            isRemote() {
+                return this.message.messageDirection == 2
+            },
+            content() {
+                return this.message.content
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .msg--file {
+        display: flex;
+        align-items: flex-end;
+
+        .name {
+            font-size: 24rpx;
+            color: $text-gray-m;
+        }
+
+        .file {
+            .img {
+                width: 180rpx;
+            }
+
+            &.left {
+                .img {
+                    border-radius: 0 10rpx 10rpx 10rpx;
+                }
+            }
+
+            &.right {
+                .img {
+                    border-radius: 10rpx 0 10rpx 10rpx;
+                }
+            }
+        }
+
+    }
+</style>
diff --git a/pages/im/components/show/showLocation.vue b/pages/im/components/show/showLocation.vue
new file mode 100644
index 0000000..dbb74fb
--- /dev/null
+++ b/pages/im/components/show/showLocation.vue
@@ -0,0 +1,86 @@
+<template>
+    <view class="msg--location">
+        <message-state :message="message" :isGroup="isGroup" :isRemote="isRemote" />
+
+        <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>
+        </view>
+    </view>
+</template>
+
+<script>
+    import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
+    import messageState from './messageState'
+    import imBase from '../../mixins/imBase.js'
+
+    export default {
+        mixins: [
+            imBase
+        ],
+        name: 'showImage',
+        props: {
+            message: {
+                type: Object,
+                default: () => {
+                    return {}
+                }
+            },
+            isGroup: {
+                type: Boolean,
+                default: false
+            }
+        },
+        components: {
+            messageState
+        },
+        computed: {
+            isRemote() {
+                return this.message.messageDirection == 2
+            },
+            content() {
+                return this.message.content
+            }
+        },
+        methods: {
+            showLocation() {
+                console.log(this.content.customFields.longitude, this.content.customFields.latitude)
+
+            }
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+    .msg--location {
+        display: flex;
+        align-items: flex-end;
+
+        .name {
+            font-size: 24rpx;
+            color: $text-gray-m;
+        }
+
+        .location {
+            .image {
+                width: 180rpx;
+            }
+
+            &.left {
+                .image {
+                    border-radius: 0 10rpx 10rpx 10rpx;
+                }
+            }
+
+            &.right {
+                .image {
+                    border-radius: 10rpx 0 10rpx 10rpx;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/im/components/show/showNormal.vue b/pages/im/components/show/showNormal.vue
new file mode 100644
index 0000000..3b7ee73
--- /dev/null
+++ b/pages/im/components/show/showNormal.vue
@@ -0,0 +1,30 @@
+<template>
+    <view class="">
+        <show-location v-if="message.content.objectName == 'RC:LBSMsg'" :message="message" :isGroup="isGroup" />
+    </view>
+</template>
+
+<script>
+    import showLocation from './showLocation'
+
+    export default {
+        props: {
+            message: {
+                type: Object,
+                default: () => {
+                    return {}
+                }
+            },
+            isGroup: {
+                type: Boolean,
+                default: false
+            }
+        },
+        components: {
+            showLocation
+        }
+    }
+</script>
+
+<style>
+</style>
diff --git a/pages/im/components/showMessageCell.vue b/pages/im/components/showMessageCell.vue
index 0aed87b..86cad0c 100644
--- a/pages/im/components/showMessageCell.vue
+++ b/pages/im/components/showMessageCell.vue
@@ -15,7 +15,10 @@
                 <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" />
-                <show-call v-else-if="message.objectName === 'RC:InfoNtf'" :message="message" :isGroup="isGroup" />
+                <show-call v-else-if="message.objectName === 'RC:InfoNtf'" :message="message" :isGroup="isGroup" />
+                <show-file v-else-if="message.objectName === 'RC:FileMsg'" :message="message" :isGroup="isGroup" />
+                <show-normal v-else-if="message.objectName === 'RC:IWNormalMsg'" :message="message" :isGroup="isGroup" />
+                
                 <view v-else class="">
                     [未处理的消息类型 {{ message.objectName }}]
                 </view>
@@ -34,6 +37,8 @@
     import showImage from './show/showImage'
     import showText from './show/showText'
     import showCall from './show/showCall'
+    import showFile from './show/showFile'
+    import showNormal from './show/showNormal'
     import utils from '@/utils/index.js'
     import imBase from '../mixins/imBase.js'
 
@@ -45,8 +50,10 @@
             showCall,
             showVoice,
             showImage,
-            showText
-        },
+            showText,
+            showFile,
+            showNormal
+        },
         props: {
             message: {
                 type: Object,
diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index ea4661a..af8ff80 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -163,6 +163,7 @@
                     10,
                     false,
                     (messages) => {
+                        console.log('获取最新消息', messages);
                         this.messages.unshift(...messages)
                         this.scrollBottom()
                     })
diff --git a/pages/im/index.vue b/pages/im/index.vue
index 344ef48..55a7a07 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -106,8 +106,8 @@
                     code,
                     conversations
                 }) => {
-                    if (code === 0) {
-                        console.log(conversations,',,,,,')
+                    if (code === 0) {
+                        console.log('获取会话列表', conversations);
                         this.conversations = conversations
                     }
                 })
diff --git a/utils/im/listeners.js b/utils/im/listeners.js
index 62c6efc..5250e05 100644
--- a/utils/im/listeners.js
+++ b/utils/im/listeners.js
@@ -55,7 +55,8 @@ const notifyMsgTypes = [
     IMLib.ObjectName.Location,
     IMLib.ObjectName.Voice,
     IMLib.ObjectName.HQVoice,
-    IMLib.ObjectName.Sight
+    IMLib.ObjectName.Sight,
+    'RC:IWNormalMsg'
 ]
 
 const imLibListeners = () => {
diff --git a/utils/im/message.js b/utils/im/message.js
index 76d37d0..286a988 100644
--- a/utils/im/message.js
+++ b/utils/im/message.js
@@ -18,7 +18,8 @@ const getMessageList = (conversationType, targetId, timeStamp, count, isForward,
         'RC:CombineMsg',
         'RC:GrpNtf',
         'RC:InfoNtf',
-        'RC:RcNtf'
+        'RC:RcNtf',
+        'RC:IWNormalMsg'
     ]
 
     RongIMLib.getHistoryMessagesByTimestamp(
@@ -184,10 +185,13 @@ const sentFile = (conversationType, targetId, fileUrl) => {
             targetId: String(targetId),
             content: {
                 objectName: 'RC:FileMsg',
-                local: 'file:///' + plus.io.convertLocalFileSystemURL(fileUrl),
+                local: plus.io.convertLocalFileSystemURL(fileUrl),
                 userInfo: store.getters.sender
             }
         }
+
+        console.log('发送文件', msg);
+
         RongIMLib.sendMediaMessage(msg, {
             success: (messageId) => {
                 resolve(messageId)
@@ -201,6 +205,48 @@ const sentFile = (conversationType, targetId, fileUrl) => {
     })
 }
 
+// 发送地理位置
+const sentLocation = (conversationType, targetId, location) => {
+    return new Promise((resolve, reject) => {
+        const msg = {
+            conversationType: conversationType,
+            targetId: String(targetId),
+            objectName: 'RC:LBSMsg',
+            content: {
+                customType: 2,
+                objectName: 'RC:LBSMsg',
+                customFields: {
+                    name: location.name,
+                    latitude: Number(location.latitude),
+                    longitude: Number(location.longitude),
+                    thumbnail: ''
+                },
+                userInfo: store.getters.sender,
+            }
+        }
+
+        RongIMLib.sendMessage(msg, ({
+            code,
+            messageId
+        }) => {
+            if (code === 0) {
+                if (conversationType == 3) {
+                    RongIMLib.sendReadReceiptRequest(messageId, (res) => {
+                        console.log('发送回执请求', res);
+                    })
+                }
+                resolve(messageId)
+            } else {
+                uni.showToast({
+                    icon: 'none',
+                    title: '发送失败' + code
+                })
+                reject(code)
+            }
+        })
+    })
+}
+
 export default {
     getMessageList,
     getPendingList,
@@ -208,5 +254,6 @@ export default {
     sentText,
     sentVoice,
     sentImage,
-    sentFile
+    sentFile,
+    sentLocation
 }

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 5/8] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=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: ''

From dbda19870ff1ea70ac2500796e7ab318216ce675 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Tue, 1 Mar 2022 10:40:00 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=87=BD=E6=95=B0=EF=BC=8C=E8=AE=BE=E5=AE=9A?=
 =?UTF-8?q?=E9=9F=B3=E8=A7=86=E9=A2=91=E9=80=9A=E8=AF=9D=E7=9A=84=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=8F=91=E9=80=81=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conversation/messagePreview.vue           |  21 ++-
 pages/im/components/sent/sentPopups.vue       |  12 +-
 pages/im/components/sent/sentText.vue         |   2 +-
 pages/im/components/show/showAudio.vue        |  84 +++++++++
 pages/im/components/show/showLocation.vue     |  15 +-
 pages/im/components/show/showNormal.vue       |   8 +-
 pages/im/components/show/showVideo.vue        |  84 +++++++++
 pages/im/index.vue                            |   5 +
 pages/im/private/call.nvue                    |  32 +---
 static/imgs/map.jpeg                          | Bin 0 -> 6947 bytes
 utils/im/message.js                           | 163 +++++++++++-------
 11 files changed, 324 insertions(+), 102 deletions(-)
 create mode 100644 pages/im/components/show/showAudio.vue
 create mode 100644 pages/im/components/show/showVideo.vue
 create mode 100644 static/imgs/map.jpeg

diff --git a/pages/im/components/conversation/messagePreview.vue b/pages/im/components/conversation/messagePreview.vue
index 37dd25e..f2ac028 100644
--- a/pages/im/components/conversation/messagePreview.vue
+++ b/pages/im/components/conversation/messagePreview.vue
@@ -7,33 +7,36 @@
             <view class="preview" v-if="msg.objectName=='RC:TxtMsg'">
                 <text v-if="conversationType == 3">{{ user.name }}：</text>{{ msg.content || '' }}
             </view>
-            <view class="preview" v-if="msg.objectName=='RC:HQVCMsg'">
+            <view class="preview" v-else-if="msg.objectName=='RC:HQVCMsg'">
                 <text v-if="conversationType == 3">{{ user.name }}：</text>[语音]
             </view>
-            <view class="preview" v-if="msg.objectName=='RC:ImgMsg'">
+            <view class="preview" v-else-if="msg.objectName=='RC:ImgMsg'">
                 <text v-if="conversationType == 3">{{ user.name }}：</text>[图片]
             </view>
-            <view class="preview" v-if="msg.objectName=='RC:GIFMsg'">
+            <view class="preview" v-else-if="msg.objectName=='RC:GIFMsg'">
                 <text v-if="conversationType == 3">{{ user.name }}：</text>[表情]
             </view>
-            <view class="preview" v-if="msg.objectName=='RC:FileMsg'">
+            <view class="preview" v-else-if="msg.objectName=='RC:FileMsg'">
                 <text v-if="conversationType == 3">{{ user.name }}：</text>[文件]
             </view>
-            <view class="preview" v-if="msg.objectName=='RC:LBSMsg'">
+            <view class="preview" v-else-if="msg.objectName=='RC:LBSMsg'">
                 <text v-if="conversationType == 3">{{ user.name }}：</text>[位置]
             </view>
-            <view class="preview" v-if="msg.objectName=='RC:InfoNtf' && JSON.parse(msg.message).mediaType==0">
+            <view class="preview" v-else-if="msg.objectName=='RC:AudioMsg'">
                 <text v-if="conversationType == 3">{{ user.name }}：</text>[语音通话]
             </view>
-            <view class="preview" v-if="msg.objectName=='RC:InfoNtf' && JSON.parse(msg.message).mediaType==1">
+            <view class="preview" v-else-if="msg.objectName=='RC:VideoMsg'">
                 <text v-if="conversationType == 3">{{ user.name }}：</text>[视频通话]
             </view>
-            <view class="preview" v-if="msg.objectName=='RC:GrpNtf'">
+            <view class="preview" v-else-if="msg.objectName=='RC:GrpNtf'">
                 [{{ msg.message }}]
             </view>
-            <view class="preview" v-if="msg.objectName=='RC:RcNtf'">
+            <view class="preview" v-else-if="msg.objectName=='RC:RcNtf'">
                 <text v-if="conversationType == 3">{{ user.name }}：</text> 撤回了一条消息
             </view>
+            <view class="preview" v-else>
+                {{ msg.objectName }}
+            </view>
         </block>
     </view>
 </template>
diff --git a/pages/im/components/sent/sentPopups.vue b/pages/im/components/sent/sentPopups.vue
index 28ea991..f42e345 100644
--- a/pages/im/components/sent/sentPopups.vue
+++ b/pages/im/components/sent/sentPopups.vue
@@ -132,11 +132,13 @@
                         break;
                     case 'location':
                         uni.chooseLocation({
-                            success: (location) => {
-                                console.log(location);
-                                im.sentLocation(this.conversationType, this.targetId, location).then(() => {
-                                    this.success()
-                                })
+                            success: (location) => {
+                                const thumbnail = ''
+                                // 通过 location 的经纬度，合成一张图片，再把图片的base64发送出去
+                                im.sentLocation(this.conversationType, this.targetId, location, thumbnail)
+                                    .then(() => {
+                                        this.success()
+                                    })
                             }
                         })
                         break;
diff --git a/pages/im/components/sent/sentText.vue b/pages/im/components/sent/sentText.vue
index 7ccab83..0e745c5 100644
--- a/pages/im/components/sent/sentText.vue
+++ b/pages/im/components/sent/sentText.vue
@@ -59,7 +59,7 @@
                         RongIMLib.clearTextMessageDraft(this.conversationType, this.targetId)
                         this.$emit('success')
                         this.inputTxt = ''
-                    })
+                    })
                 }
             },
             focus() {
diff --git a/pages/im/components/show/showAudio.vue b/pages/im/components/show/showAudio.vue
new file mode 100644
index 0000000..323b299
--- /dev/null
+++ b/pages/im/components/show/showAudio.vue
@@ -0,0 +1,84 @@
+<template>
+    <view class="msg--call">
+        <view class="name" v-if="isGroup && isRemote">{{ contact(message.senderUserId).name }}</view>
+        <view class="im--text" :class="isRemote ? 'left': 'right'">
+            <uni-icons type="phone" size="44rpx"  />
+            {{ label }}
+        </view>
+    </view>
+</template>
+
+<script>
+    import utils from '@/utils/index.js'
+    import moment from 'moment'
+    import imBase from '../../mixins/imBase.js'
+
+    export default {
+        mixins: [
+            imBase
+        ],
+        props: {
+            message: {
+                type: Object,
+                default: () => {
+                    return {}
+                }
+            },
+            isGroup: {
+                type: Boolean,
+                default: false
+            }
+        },
+        computed: {
+            label() {
+                return this.message.content.customFields.status == 1 ? '通话时长：' + duration : '未接通'
+            },
+            isRemote() {
+                return this.message.messageDirection == 2
+            },
+            duration() {
+                if (this.message.content.customFields.duration > 3600) {
+                    return moment.utc(this.message.content.customFields.duration * 1000).format('HH:mm:ss')
+                } else {
+                    return moment.utc(this.message.content.customFields.duration * 1000).format('mm:ss')
+                }
+            }
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+    .msg--call {
+        .name {
+            font-size: 26rpx;
+            color: $text-gray-m;
+            display: inline-block;
+        }
+
+        .im--text {
+            max-width: 508rpx;
+            padding: 20rpx;
+            line-height: 46rpx;
+            font-size: 32rpx;
+            color: $text-color;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+
+            &.left {
+                border-radius: 0 20rpx 20rpx 20rpx;
+                background: white;
+            }
+
+            &.right {
+                border-radius: 20rpx 0 20rpx 20rpx;
+                background: $main-color;
+                color: white;
+
+                .uni-icons {
+                    color: white !important;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/im/components/show/showLocation.vue b/pages/im/components/show/showLocation.vue
index 80efb4c..3c14247 100644
--- a/pages/im/components/show/showLocation.vue
+++ b/pages/im/components/show/showLocation.vue
@@ -7,9 +7,11 @@
             <view class="location" :class="isRemote ? 'left': 'right'" @click="showLocation">
                 <view class="location--name">
                     {{ content.customFields.name }}
-                    {{ content.customFields.address }}
+                </view>
+                <view class="location--address">
+                    {{ content.customFields.address }}
                 </view>
-                <image class="map" :src="content.customFields.thumbnail" />
+                <image class="map" :src="require('@/static/imgs/map.jpeg')" mode="aspectFill" />
             </view>
         </view>
     </view>
@@ -81,9 +83,16 @@
             background: #FFFFFF;
             padding: 10rpx;
 
-            .location--name {
+            .location--name {
+                font-size: 32rpx;
                 overflow: hidden;
                 word-break: break-all;
+            }
+            
+            .location--address {
+                padding-bottom: 10rpx;
+                font-size: 24rpx;
+                color: $text-gray-m;
             }
 
             .map {
diff --git a/pages/im/components/show/showNormal.vue b/pages/im/components/show/showNormal.vue
index 3b7ee73..6d08131 100644
--- a/pages/im/components/show/showNormal.vue
+++ b/pages/im/components/show/showNormal.vue
@@ -1,11 +1,15 @@
 <template>
     <view class="">
         <show-location v-if="message.content.objectName == 'RC:LBSMsg'" :message="message" :isGroup="isGroup" />
+        <show-video v-else-if="message.content.objectName == 'RC:VideoMsg'" :message="message" :isGroup="isGroup" />
+        <show-audio v-else-if="message.content.objectName == 'RC:AudioMsg'" :message="message" :isGroup="isGroup" />
     </view>
 </template>
 
 <script>
     import showLocation from './showLocation'
+    import showAudio from './showAudio'
+    import showVideo from './showVideo'
 
     export default {
         props: {
@@ -21,7 +25,9 @@
             }
         },
         components: {
-            showLocation
+            showLocation,
+            showAudio,
+            showVideo
         }
     }
 </script>
diff --git a/pages/im/components/show/showVideo.vue b/pages/im/components/show/showVideo.vue
new file mode 100644
index 0000000..606991c
--- /dev/null
+++ b/pages/im/components/show/showVideo.vue
@@ -0,0 +1,84 @@
+<template>
+    <view class="msg--call">
+        <view class="name" v-if="isGroup && isRemote">{{ contact(message.senderUserId).name }}</view>
+        <view class="im--text" :class="isRemote ? 'left': 'right'">
+            <uni-icons type="videocam" size="44rpx"  />
+            {{ label }}
+        </view>
+    </view>
+</template>
+
+<script>
+    import utils from '@/utils/index.js'
+    import moment from 'moment'
+    import imBase from '../../mixins/imBase.js'
+
+    export default {
+        mixins: [
+            imBase
+        ],
+        props: {
+            message: {
+                type: Object,
+                default: () => {
+                    return {}
+                }
+            },
+            isGroup: {
+                type: Boolean,
+                default: false
+            }
+        },
+        computed: {
+            label() {
+                return this.message.content.customFields.status == 1 ? '通话时长：' + duration : '未接通'
+            },
+            isRemote() {
+                return this.message.messageDirection == 2
+            },
+            duration() {
+                if (this.message.content.customFields.duration > 3600) {
+                    return moment.utc(this.message.content.customFields.duration * 1000).format('HH:mm:ss')
+                } else {
+                    return moment.utc(this.message.content.customFields.duration * 1000).format('mm:ss')
+                }
+            }
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+    .msg--call {
+        .name {
+            font-size: 26rpx;
+            color: $text-gray-m;
+            display: inline-block;
+        }
+
+        .im--text {
+            max-width: 508rpx;
+            padding: 20rpx;
+            line-height: 46rpx;
+            font-size: 32rpx;
+            color: $text-color;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+
+            &.left {
+                border-radius: 0 20rpx 20rpx 20rpx;
+                background: white;
+            }
+
+            &.right {
+                border-radius: 20rpx 0 20rpx 20rpx;
+                background: $main-color;
+                color: white;
+
+                .uni-icons {
+                    color: white !important;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/im/index.vue b/pages/im/index.vue
index 55a7a07..7bf335e 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -55,6 +55,11 @@
             connectionStatus
         },
         onLoad() {
+            RongIMLib.getCurrentUserId(({
+                userId
+            }) => {
+                console.log('getCurrentUserId', userId);
+            })
             // 监听新的好友申请
             uni.$on('onNewContactConversation', () => {
                 console.log('更新好友申请数量');
diff --git a/pages/im/private/call.nvue b/pages/im/private/call.nvue
index bfb7884..d071fee 100644
--- a/pages/im/private/call.nvue
+++ b/pages/im/private/call.nvue
@@ -75,7 +75,7 @@
                 // 关闭扬声器
                 volumeOff: false,
                 // 通话时长
-                duration: 0,
+                duration: 0,
                 interval: null
             }
         },
@@ -83,7 +83,7 @@
             this.avatarSize = utils.rpx2px(200)
             this.targetId = e.targetId
             this.mediaType = e.mediaType
-            this.isCall = Boolean(e.isCall)
+            this.isCall = Boolean(e.isCall)
             // 进入页面开启外呼
             if (this.isCall) {
                 CallLib.startSingleCall(this.targetId, this.mediaType, '');
@@ -131,25 +131,9 @@
             }
         },
         methods: {
-            afterHangup() {
-                clearInterval(this.interval)
-                const targetId = this.targetId
-                const sentStatus = 30
-                const messageContent = {
-                    objectName: 'RC:InfoNtf',
-                    userInfo: this.$store.getters.sender,
-                    message: JSON.stringify({
-                        mediaType: this.mediaType,
-                        connected: this.connected,
-                        duration: this.duration
-                    })
-                }
-                const sentTime = 0
-                if (this.isCall) {
-                    IMLib.insertOutgoingMessage(1, targetId, sentStatus, messageContent, sentTime)
-                } else {
-                    IMLib.insertIncomingMessage(1, targetId, targetId, sentStatus, messageContent, sentTime)
-                }
+            afterHangup() {
+                clearInterval(this.interval)
+                // duration: this.duration
                 uni.$emit('onReceiveMessage_' + this.targetId, {
                     targetId: this.targetId
                 })
@@ -179,9 +163,9 @@
                         CallLib.setVideoView(session.targetId, this.$refs.bigVideoView.ref, 0, false)
                         CallLib.setVideoView(session.mine.userId, this.$refs.smallVideoView.ref, 0, true)
                     }, 200)
-                }
-                this.interval = setInterval(() => {
-                    this.duration++
+                }
+                this.interval = setInterval(() => {
+                    this.duration++
                 }, 1000)
             },
             // 切换主屏显示人
diff --git a/static/imgs/map.jpeg b/static/imgs/map.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..46a4fac38a3c7c635804e288b3690701040259cf
GIT binary patch
literal 6947
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

literal 0
HcmV?d00001

diff --git a/utils/im/message.js b/utils/im/message.js
index d05e88a..7bdcb55 100644
--- a/utils/im/message.js
+++ b/utils/im/message.js
@@ -83,7 +83,7 @@ const getGroupPendinglist = (targetId, callback) => {
  */
 const sentText = (conversationType, targetId, content) => {
     return new Promise((resolve, reject) => {
-        const msg = {
+        const message = {
             conversationType: conversationType,
             targetId: String(targetId),
             content: {
@@ -93,24 +93,10 @@ const sentText = (conversationType, targetId, content) => {
             }
         }
 
-        RongIMLib.sendMessage(msg, ({
-            code,
-            messageId
-        }) => {
-            if (code === 0) {
-                if (conversationType == 3) {
-                    RongIMLib.sendReadReceiptRequest(messageId, (res) => {
-                        console.log('发送回执请求', res);
-                    })
-                }
-                resolve(messageId)
-            } else {
-                uni.showToast({
-                    icon: 'none',
-                    title: '发送失败' + code
-                })
-                reject(code)
-            }
+        sendCommonMessage(message, (messageId) => {
+            resolve(messageId)
+        }, (errCode) => {
+            reject(errCode)
         })
     })
 }
@@ -136,11 +122,9 @@ const sentVoice = (conversationType, targetId, voiceUrl, time) => {
             }
         }
         RongIMLib.sendMediaMessage(msg, {
-            success: (messageId) => {
-                if (conversationType == 3) {
-                    RongIMLib.sendReadReceiptRequest(messageId, (res) => {
-                        console.log('发送回执请求', res);
-                    })
+            success: (messageId) => {
+                if (conversationType == 3) {
+                    RongIMLib.sendReadReceiptRequest(messageId)
                 }
                 resolve(messageId)
             },
@@ -169,11 +153,9 @@ const sentImage = (conversationType, targetId, imageUrl) => {
                     }
                 }
                 RongIMLib.sendMediaMessage(msg, {
-                    success: (messageId) => {
-                        if (conversationType == 3) {
-                            RongIMLib.sendReadReceiptRequest(messageId, (res) => {
-                                console.log('发送回执请求', res);
-                            })
+                    success: (messageId) => {
+                        if (conversationType == 3) {
+                            RongIMLib.sendReadReceiptRequest(messageId)
                         }
                         resolve(messageId)
                     },
@@ -201,11 +183,9 @@ const sentFile = (conversationType, targetId, fileUrl) => {
         }
 
         RongIMLib.sendMediaMessage(msg, {
-            success: (messageId) => {
-                if (conversationType == 3) {
-                    RongIMLib.sendReadReceiptRequest(messageId, (res) => {
-                        console.log('发送回执请求', res);
-                    })
+            success: (messageId) => {
+                if (conversationType == 3) {
+                    RongIMLib.sendReadReceiptRequest(messageId)
                 }
                 resolve(messageId)
             },
@@ -219,48 +199,111 @@ const sentFile = (conversationType, targetId, fileUrl) => {
 }
 
 // 发送地理位置
-const sentLocation = (conversationType, targetId, location) => {
+const sentLocation = (conversationType, targetId, location, thumbnail) => {
     return new Promise((resolve, reject) => {
-        const msg = {
+        const message = {
             conversationType: conversationType,
             targetId: String(targetId),
-            objectName: 'RC:LBSMsg',
             content: {
                 customType: 2,
                 objectName: 'RC:LBSMsg',
                 customFields: {
-                    name: location.name,
+                    name: location.name,
                     address: location.address,
                     latitude: Number(location.latitude),
-                    longitude: Number(location.longitude),
-                    thumbnail: ''
+                    longitude: Number(location.longitude),
+                    thumbnail: thumbnail
                 },
                 userInfo: store.getters.sender,
             }
         }
 
-        RongIMLib.sendMessage(msg, ({
-            code,
-            messageId
-        }) => {
-            if (code === 0) {
-                if (conversationType == 3) {
-                    RongIMLib.sendReadReceiptRequest(messageId, (res) => {
-                        console.log('发送回执请求', res);
-                    })
-                }
-                resolve(messageId)
-            } else {
-                uni.showToast({
-                    icon: 'none',
-                    title: '发送失败' + code
-                })
-                reject(code)
-            }
+        sendCommonMessage(message, (messageId) => {
+            resolve(messageId)
+        }, (errCode) => {
+            reject(errCode)
         })
     })
 }
 
+/**
+ * 发送视频通话结果
+ */
+const sentVideo = (conversationType, targetId, status, time) => {
+    return new Promise((resolve, reject) => {
+        const message = {
+            conversationType: conversationType,
+            targetId: String(targetId),
+            content: {
+                customType: 2,
+                objectName: 'RC:VideoMsg',
+                customFields: {
+                    status: status,
+                    duration: time
+                },
+                userInfo: store.getters.sender,
+            }
+        }
+
+        sendCommonMessage(message, (messageId) => {
+            resolve(messageId)
+        }, (errCode) => {
+            reject(errCode)
+        })
+    })
+}
+
+/**
+ * 发送语音通话结果
+ */
+const sentAudio = (conversationType, targetId, status, time) => {
+    return new Promise((resolve, reject) => {
+        const message = {
+            conversationType: conversationType,
+            targetId: String(targetId),
+            content: {
+                customType: 2,
+                objectName: 'RC:AudioMsg',
+                customFields: {
+                    status: status,
+                    duration: time
+                },
+                userInfo: store.getters.sender,
+            }
+        }
+
+        sendCommonMessage(message, (messageId) => {
+            resolve(messageId)
+        }, (errCode) => {
+            reject(errCode)
+        })
+    })
+}
+
+/**
+ * 发送普通消息
+ */
+const sendCommonMessage = (message, success, fail) => {
+    RongIMLib.sendMessage(message, ({
+        code,
+        messageId
+    }) => {
+        if (code === 0) {
+            if (message.conversationType == 3) {
+                RongIMLib.sendReadReceiptRequest(messageId)
+            }
+
+            success(messageId)
+        } else {
+            uni.showToast({
+                icon: 'none',
+                title: '发送失败' + code
+            })
+            fail(code)
+        }
+    })
+}
+
 export default {
     getMessageList,
     getPendingList,
@@ -269,5 +312,7 @@ export default {
     sentVoice,
     sentImage,
     sentFile,
-    sentLocation
+    sentLocation,
+    sentVideo,
+    sentAudio
 }

From 9628c8ccec5980fd2ffc2d3e6e09d2f3a3db7438 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Tue, 1 Mar 2022 10:40:59 +0800
Subject: [PATCH 7/8] clean

---
 pages/im/components/show/showCall.vue   | 91 -------------------------
 pages/im/components/showMessageCell.vue |  3 -
 2 files changed, 94 deletions(-)
 delete mode 100644 pages/im/components/show/showCall.vue

diff --git a/pages/im/components/show/showCall.vue b/pages/im/components/show/showCall.vue
deleted file mode 100644
index b373326..0000000
--- a/pages/im/components/show/showCall.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-    <view class="msg--call">
-        <view class="name" v-if="isGroup && isRemote">{{ contact(message.senderUserId).name }}</view>
-        <view class="im--text" :class="isRemote ? 'left': 'right'">
-            <uni-icons type="videocam" size="44rpx" v-if="msg.mediaType == 1" />
-            <uni-icons type="phone" size="40rpx" v-else  />
-            {{ label }}
-        </view>
-    </view>
-</template>
-
-<script>
-    import utils from '@/utils/index.js'
-    import moment from 'moment'
-    import imBase from '../../mixins/imBase.js'
-
-    export default {
-        mixins: [
-            imBase
-        ],
-        name: 'showText',
-        props: {
-            message: {
-                type: Object,
-                default: () => {
-                    return {}
-                }
-            },
-            isGroup: {
-                type: Boolean,
-                default: false
-            }
-        },
-        mounted() {
-        },
-        computed: {
-            msg() {
-                return JSON.parse(this.message.content.message)
-            },
-            label() {
-                return this.msg.connected ? '通话时长：' + duration : '未接通'
-            },
-            isRemote() {
-                return this.message.messageDirection == 2
-            },
-            duration() {
-                if (this.message.duration > 3600) {
-                    return moment.utc(this.message.duration * 1000).format('HH:mm:ss')
-                } else {
-                    return moment.utc(this.message.duration * 1000).format('mm:ss')
-                }
-            }
-        }
-    }
-</script>
-
-<style scoped lang="scss">
-    .msg--call {
-        .name {
-            font-size: 26rpx;
-            color: $text-gray-m;
-            display: inline-block;
-        }
-
-        .im--text {
-            max-width: 508rpx;
-            padding: 20rpx;
-            line-height: 46rpx;
-            font-size: 32rpx;
-            color: $text-color;
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-
-            &.left {
-                border-radius: 0 20rpx 20rpx 20rpx;
-                background: white;
-            }
-
-            &.right {
-                border-radius: 20rpx 0 20rpx 20rpx;
-                background: $main-color;
-                color: white;
-
-                .uni-icons {
-                    color: white !important;
-                }
-            }
-        }
-    }
-</style>
diff --git a/pages/im/components/showMessageCell.vue b/pages/im/components/showMessageCell.vue
index 86cad0c..5ed7e7b 100644
--- a/pages/im/components/showMessageCell.vue
+++ b/pages/im/components/showMessageCell.vue
@@ -15,7 +15,6 @@
                 <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" />
-                <show-call v-else-if="message.objectName === 'RC:InfoNtf'" :message="message" :isGroup="isGroup" />
                 <show-file v-else-if="message.objectName === 'RC:FileMsg'" :message="message" :isGroup="isGroup" />
                 <show-normal v-else-if="message.objectName === 'RC:IWNormalMsg'" :message="message" :isGroup="isGroup" />
                 
@@ -36,7 +35,6 @@
     import showVoice from './show/showVoice'
     import showImage from './show/showImage'
     import showText from './show/showText'
-    import showCall from './show/showCall'
     import showFile from './show/showFile'
     import showNormal from './show/showNormal'
     import utils from '@/utils/index.js'
@@ -47,7 +45,6 @@
             imBase
         ],
         components: {
-            showCall,
             showVoice,
             showImage,
             showText,

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 8/8] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=97=B4=E9=9A=9430?=
 =?UTF-8?q?=E5=88=86=E9=92=9F=EF=BC=8C=E6=8F=92=E5=85=A5=E4=B8=80=E6=9D=A1?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=B6=88=E6=81=AF=EF=BC=8C=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=A4=A7=E6=A6=82=E7=9A=84=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=97=B6=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()
                     })
             },