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] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8F=91=E9=80=81=E6=B6=88?=
 =?UTF-8?q?=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: {