From 6fbaa6d890a5f921c09f3ccf2c60a03182359356 Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Sun, 17 Mar 2024 23:56:19 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=A5=BD=E5=8F=8B?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-ui/src/components/chat/ChatPrivateVideo.vue | 2 +-
 im-uniapp/pages/chat/chat-video.vue            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/im-ui/src/components/chat/ChatPrivateVideo.vue b/im-ui/src/components/chat/ChatPrivateVideo.vue
index 445eaf7..74b3d78 100644
--- a/im-ui/src/components/chat/ChatPrivateVideo.vue
+++ b/im-ui/src/components/chat/ChatPrivateVideo.vue
@@ -139,7 +139,7 @@
 					type: 'PRIVATE',
 					targetId: this.rtcInfo.friend.id,
 					showName: this.rtcInfo.friend.nickName,
-					headImage: this.rtcInfo.friend.headImageThumb,
+					headImage: this.rtcInfo.friend.headImage,
 				};
 				this.$store.commit("openChat", chat);
 				// 插入消息
diff --git a/im-uniapp/pages/chat/chat-video.vue b/im-uniapp/pages/chat/chat-video.vue
index 66a8dc0..ab8b2e7 100644
--- a/im-uniapp/pages/chat/chat-video.vue
+++ b/im-uniapp/pages/chat/chat-video.vue
@@ -25,7 +25,7 @@
 					type: 'PRIVATE',
 					targetId: this.friend.id,
 					showName: this.friend.nickName,
-					headImage: this.friend.headImageThumb,
+					headImage: this.friend.headImage,
 				};
 				this.$store.commit("openChat",chat);
 				this.$store.commit("insertMessage", msgInfo);

From 3c75e6b4a7f135c83177478f2c677c522d553c26 Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Mon, 18 Mar 2024 22:46:35 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-ui/src/components/chat/ChatBox.vue          | 2 +-
 im-ui/src/components/chat/ChatPrivateVideo.vue | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/im-ui/src/components/chat/ChatBox.vue b/im-ui/src/components/chat/ChatBox.vue
index 3d74536..2b77a72 100644
--- a/im-ui/src/components/chat/ChatBox.vue
+++ b/im-ui/src/components/chat/ChatBox.vue
@@ -13,7 +13,7 @@
 							<div class="im-chat-box">
 								<ul>
 									<li v-for="(msgInfo, idx) in chat.messages" :key="idx">
-										<chat-message-item v-show="idx >= showMinIdx" 
+										<chat-message-item v-if="idx >= showMinIdx" 
 											@call="onCall(msgInfo.type)"
 											:mine="msgInfo.sendId == mine.id"
 											:headImage="headImage(msgInfo)" :showName="showName(msgInfo)" :msgInfo="msgInfo"
diff --git a/im-ui/src/components/chat/ChatPrivateVideo.vue b/im-ui/src/components/chat/ChatPrivateVideo.vue
index 74b3d78..c85a932 100644
--- a/im-ui/src/components/chat/ChatPrivateVideo.vue
+++ b/im-ui/src/components/chat/ChatPrivateVideo.vue
@@ -424,7 +424,8 @@
 				video {
 					width: 100%;
 					height: 100%;
-					object-fit: fill;
+					object-fit: cover;
+					transform: rotateY(180deg);
 				}
 			}
 
@@ -439,6 +440,8 @@
 
 				video {
 					width: 100%;
+					object-fit: cover;
+					transform: rotateY(180deg);
 				}
 			}
 		}

From d1b9fed151f6d83a2f4757452678bd5c5e867d45 Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Mon, 18 Mar 2024 23:25:40 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=BB=B6=E8=BF=9F=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-ui/src/components/chat/ChatBox.vue         | 2 +-
 im-ui/src/components/chat/ChatMessageItem.vue | 2 +-
 im-ui/src/components/common/HeadImage.vue     | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/im-ui/src/components/chat/ChatBox.vue b/im-ui/src/components/chat/ChatBox.vue
index 2b77a72..06639fd 100644
--- a/im-ui/src/components/chat/ChatBox.vue
+++ b/im-ui/src/components/chat/ChatBox.vue
@@ -75,7 +75,7 @@
 							</div>
 						</el-footer>
 					</el-container>
-					<el-aside class="chat-group-side-box" width="300px" v-show="showSide">
+					<el-aside class="chat-group-side-box" width="300px" v-if="showSide">
 						<chat-group-side :group="group" :groupMembers="groupMembers" @reload="loadGroup(group.id)">
 						</chat-group-side>
 					</el-aside>
diff --git a/im-ui/src/components/chat/ChatMessageItem.vue b/im-ui/src/components/chat/ChatMessageItem.vue
index 04ab953..9a466a7 100644
--- a/im-ui/src/components/chat/ChatMessageItem.vue
+++ b/im-ui/src/components/chat/ChatMessageItem.vue
@@ -28,7 +28,7 @@
 							<div class="img-load-box" v-loading="loading" element-loading-text="上传中.."
 								element-loading-background="rgba(0, 0, 0, 0.4)">
 								<img class="send-image" :src="JSON.parse(msgInfo.content).thumbUrl"
-									@click="showFullImageBox()" />
+									@click="showFullImageBox()" loading="lazy"/>
 							</div>
 							<span title="发送失败" v-show="loadFail" @click="onSendFail"
 								class="send-fail el-icon-warning"></span>
diff --git a/im-ui/src/components/common/HeadImage.vue b/im-ui/src/components/common/HeadImage.vue
index 084ab50..0ca2985 100644
--- a/im-ui/src/components/common/HeadImage.vue
+++ b/im-ui/src/components/common/HeadImage.vue
@@ -1,6 +1,7 @@
 <template>
 	<div class="head-image" @click="showUserInfo($event)">
-		<img class="avatar-image" v-show="url" :src="url" :style="avatarImageStyle" />
+		<img class="avatar-image" v-show="url" :src="url" 
+			:style="avatarImageStyle" loading="lazy" />
 		<div class="avatar-text" v-show="!url" :style="avatarTextStyle">
 			{{name.substring(0,1).toUpperCase()}}</div>
 		<div v-show="online" class="online" title="用户当前在线"></div>

From f18a8e62ebc1edb19fced1a72e0a9e52f60e244c Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Sat, 30 Mar 2024 13:49:11 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=96=AD=E7=BA=BF?=
 =?UTF-8?q?=E9=87=8D=E8=BF=9E=E6=97=B6=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E6=B6=88=E6=81=AF=E4=B9=B1=E5=BA=8F=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-ui/src/store/chatStore.js | 12 ++++++++++--
 im-uniapp/store/chatStore.js | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/im-ui/src/store/chatStore.js b/im-ui/src/store/chatStore.js
index 4bc504e..505cc70 100644
--- a/im-ui/src/store/chatStore.js
+++ b/im-ui/src/store/chatStore.js
@@ -174,8 +174,16 @@ export default {
 				});
 				chat.lastTimeTip = msgInfo.sendTime;
 			}
-			// 新的消息
-			chat.messages.push(msgInfo);
+			// 根据id顺序插入，防止消息乱序
+			let insertPos = chat.messages.length;
+			for (let idx in chat.messages) {
+				if (chat.messages[idx].id && msgInfo.id < chat.messages[idx].id) {
+					insertPos = idx;
+					console.log(`消息出现乱序,位置:${chat.messages.length},修正至:${insertPos}`);
+					break;
+				}
+			}
+			chat.messages.splice(insertPos, 0, msgInfo);
 			this.commit("saveToStorage");
 		},
 		updateMessage(state, msgInfo) {
diff --git a/im-uniapp/store/chatStore.js b/im-uniapp/store/chatStore.js
index b959ab6..005ec61 100644
--- a/im-uniapp/store/chatStore.js
+++ b/im-uniapp/store/chatStore.js
@@ -176,8 +176,16 @@ export default {
 				});
 				chat.lastTimeTip = msgInfo.sendTime;
 			}
-			// 新的消息
-			chat.messages.push(msgInfo);
+			// 根据id顺序插入，防止消息乱序
+			let insertPos = chat.messages.length;
+			for (let idx in chat.messages) {
+				if (chat.messages[idx].id && msgInfo.id < chat.messages[idx].id) {
+					insertPos = idx;
+					console.log(`消息出现乱序,位置:${chat.messages.length},修正至:${insertPos}`);
+					break;
+				}
+			}
+			chat.messages.splice(insertPos, 0, msgInfo);
 			this.commit("saveToStorage");
 		},
 		updateMessage(state, msgInfo) {

From 8cc3ed9352ebcd557b15a7b1cb93f2f1b4889c0d Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Sun, 31 Mar 2024 17:38:32 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AF=AD=E9=9F=B3=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/common/recorder-app.js              |  62 +++++
 im-uniapp/common/recorder-h5.js               |  54 +++++
 .../chat-message-item/chat-message-item.vue   |  96 +++++---
 .../components/chat-record/chat-record.vue    | 227 ++++++++++++++++++
 im-uniapp/main.js                             |   8 +
 im-uniapp/package.json                        |  10 +-
 im-uniapp/pages/chat/chat-box.vue             |  78 ++++--
 im-uniapp/static/icon/iconfont.css            |  14 +-
 im-uniapp/static/icon/iconfont.ttf            | Bin 6696 -> 7216 bytes
 9 files changed, 497 insertions(+), 52 deletions(-)
 create mode 100644 im-uniapp/common/recorder-app.js
 create mode 100644 im-uniapp/common/recorder-h5.js
 create mode 100644 im-uniapp/components/chat-record/chat-record.vue

diff --git a/im-uniapp/common/recorder-app.js b/im-uniapp/common/recorder-app.js
new file mode 100644
index 0000000..dce0cbf
--- /dev/null
+++ b/im-uniapp/common/recorder-app.js
@@ -0,0 +1,62 @@
+import UNI_APP from '@/.env.js';
+
+const rc = uni.getRecorderManager();
+// 录音开始时间
+let startTime = null;
+
+let start = () => {
+	return new Promise((resolve, reject) => {
+		rc.onStart(() => {
+			startTime = new Date();
+			resolve()
+		});
+		rc.onError((e) => {
+			console.log(e);
+			reject(e)
+		})
+		rc.start({
+			format: 'mp3' // 录音格式，可选值：aac/mp3
+		});
+	})
+}
+
+let pause = () => {
+	rc.stop();
+}
+
+let close = () => {
+	rc.stop();
+}
+
+let upload = () => {
+	return new Promise((resolve, reject) => {
+		rc.onStop((wavFile, a, b) => {
+			uni.uploadFile({
+				url: UNI_APP.BASE_URL + '/file/upload',
+				header: {
+					accessToken: uni.getStorageSync("loginInfo").accessToken
+				},
+				filePath: wavFile.tempFilePath,
+				name: 'file',
+				success: (res) => {
+					const duration = (new Date().getTime() - startTime.getTime()) / 1000
+					const data = {
+						duration: Math.round(duration),
+						url: JSON.parse(res.data).data
+					}
+					resolve(data);
+				},
+				fail: (e) => {
+					reject(e);
+				}
+			})
+		});
+	})
+}
+
+export {
+	start,
+	pause,
+	close,
+	upload
+}
\ No newline at end of file
diff --git a/im-uniapp/common/recorder-h5.js b/im-uniapp/common/recorder-h5.js
new file mode 100644
index 0000000..1f435ca
--- /dev/null
+++ b/im-uniapp/common/recorder-h5.js
@@ -0,0 +1,54 @@
+import Recorder from 'js-audio-recorder';
+import UNI_APP from '@/.env.js';
+
+let rc = null;
+let start = () => {
+	if(rc != null){
+		close();
+	}
+	rc = new Recorder();
+	return rc.start();
+}
+
+let pause = () => {
+	rc.pause();
+}
+
+let close = () => {
+	rc.destroy();
+	rc = null;
+}
+
+let upload = () => {
+	return new Promise((resolve, reject) => {
+		const wavBlob = rc.getWAVBlob();
+		const newbolb = new Blob([wavBlob], { type: 'audio/wav'})
+		const name = new Date().getDate() + '.wav';
+		const file = new File([newbolb], name)
+		uni.uploadFile({
+			url: UNI_APP.BASE_URL + '/file/upload',
+			header: {
+				accessToken: uni.getStorageSync("loginInfo").accessToken
+			},
+			file: file,
+			name: 'file',
+			success: (res) => {
+				const data = {
+					duration: parseInt(rc.duration),
+					url: JSON.parse(res.data).data
+				}
+				resolve(data);
+			},
+			fail: (e) => {
+				reject(e);
+			}
+		})
+	})
+}
+
+export {
+	start,
+	pause,
+	close,
+	upload
+}
\ No newline at end of file
diff --git a/im-uniapp/components/chat-message-item/chat-message-item.vue b/im-uniapp/components/chat-message-item/chat-message-item.vue
index 74be926..6f69044 100644
--- a/im-uniapp/components/chat-message-item/chat-message-item.vue
+++ b/im-uniapp/components/chat-message-item/chat-message-item.vue
@@ -1,13 +1,16 @@
 <template>
 	<view class="chat-msg-item">
-		<view class="chat-msg-tip" v-if="msgInfo.type==$enums.MESSAGE_TYPE.RECALL||msgInfo.type == $enums.MESSAGE_TYPE.TIP_TEXT">{{msgInfo.content}}</view>
+		<view class="chat-msg-tip"
+			v-if="msgInfo.type==$enums.MESSAGE_TYPE.RECALL||msgInfo.type == $enums.MESSAGE_TYPE.TIP_TEXT">
+			{{msgInfo.content}}</view>
 		<view class="chat-msg-tip" v-if="msgInfo.type==$enums.MESSAGE_TYPE.TIP_TIME">
 			{{$date.toTimeText(msgInfo.sendTime)}}
 		</view>
 
 		<view class="chat-msg-normal" v-if="msgInfo.type>=0 && msgInfo.type<10"
 			:class="{'chat-msg-mine':msgInfo.selfSend}">
-			<head-image class="avatar" @longpress.prevent="$emit('longPressHead')" :id="msgInfo.sendId" :url="headImage" :name="showName" :size="80"></head-image>
+			<head-image class="avatar" @longpress.prevent="$emit('longPressHead')" :id="msgInfo.sendId" :url="headImage"
+				:name="showName" :size="80"></head-image>
 			<view class="chat-msg-content" @longpress="onShowMenu($event)">
 				<view v-if="msgInfo.groupId && !msgInfo.selfSend" class="chat-msg-top">
 					<text>{{showName}}</text>
@@ -26,7 +29,6 @@
 						<text title="发送失败" v-if="loadFail" @click="onSendFail"
 							class="send-fail iconfont icon-warning-circle-fill"></text>
 					</view>
-
 					<view class="chat-msg-file" v-if="msgInfo.type==$enums.MESSAGE_TYPE.FILE">
 						<view class="chat-file-box">
 							<view class="chat-file-info">
@@ -40,31 +42,28 @@
 						<text title="发送失败" v-if="loadFail" @click="onSendFail"
 							class="send-fail iconfont icon-warning-circle-fill"></text>
 					</view>
-					<view class="chat-realtime chat-msg-text" v-if="isRTMessage" 
-						@click="$emit('call')">
-						<text v-if="msgInfo.type==$enums.MESSAGE_TYPE.RT_VOICE"
-							class="iconfont icon-chat-voice"></text>
-						<text v-if="msgInfo.type==$enums.MESSAGE_TYPE.RT_VIDEO"
-							class="iconfont icon-chat-video"></text>
+					<view class="chat-msg-audio chat-msg-text" v-if="msgInfo.type==$enums.MESSAGE_TYPE.AUDIO"
+						@click="onPlayAudio()">
+						<text class="iconfont icon-voice-play"></text>
+						<text class="chat-audio-text">{{JSON.parse(msgInfo.content).duration+'"'}}</text>
+						<text v-if="audioPlayState=='PAUSE'" class="iconfont icon-play"></text>
+						<text v-if="audioPlayState=='PLAYING'" class="iconfont icon-pause"></text>
+					</view>
+					<view class="chat-realtime chat-msg-text" v-if="isRTMessage" @click="$emit('call')">
+						<text v-if="msgInfo.type==$enums.MESSAGE_TYPE.RT_VOICE" class="iconfont icon-chat-voice"></text>
+						<text v-if="msgInfo.type==$enums.MESSAGE_TYPE.RT_VIDEO" class="iconfont icon-chat-video"></text>
 						<text>{{msgInfo.content}}</text>
 					</view>
-
 					<view class="chat-msg-status" v-if="!isRTMessage">
 						<text class="chat-readed" v-show="msgInfo.selfSend && !msgInfo.groupId
 								&& msgInfo.status==$enums.MESSAGE_STATUS.READED">已读</text>
 						<text class="chat-unread" v-show="msgInfo.selfSend && !msgInfo.groupId 
 								&& msgInfo.status!=$enums.MESSAGE_STATUS.READED">未读</text>
 					</view>
-
 					<view class="chat-receipt" v-show="msgInfo.receipt" @click="onShowReadedBox">
 						<text v-if="msgInfo.receiptOk" class="tool-icon iconfont icon-ok"></text>
 						<text v-else>{{msgInfo.readedCount}}人已读</text>
 					</view>
-					<!--
-					<view class="chat-msg-voice" v-if="msgInfo.type==$enums.MESSAGE_TYPE.AUDIO" @click="onPlayVoice()">
-						<audio controls :src="JSON.parse(msgInfo.content).url"></audio>
-					</view>
-					-->
 				</view>
 			</view>
 		</view>
@@ -97,6 +96,7 @@
 		data() {
 			return {
 				audioPlayState: 'STOP',
+				innerAudioContext: null,
 				menu: {
 					show: false,
 					style: ""
@@ -135,13 +135,27 @@
 					icon: "none"
 				})
 			},
-			onPlayVoice() {
-				if (!this.audio) {
-					this.audio = new Audio();
+			onPlayAudio() {
+				// 初始化音频播放器
+				if (!this.innerAudioContext) {
+					this.innerAudioContext = uni.createInnerAudioContext();
+					let url = JSON.parse(this.msgInfo.content).url
+					this.innerAudioContext.src = url;
+					this.innerAudioContext.onEnded((e) => {
+						console.log('停止')
+						this.audioPlayState = "STOP"
+					})
+				}
+				if (this.audioPlayState == 'STOP') {
+					this.innerAudioContext.play();
+					this.audioPlayState = "PLAYING";
+				} else if (this.audioPlayState == 'PLAYING') {
+					this.innerAudioContext.pause();
+					this.audioPlayState = "PAUSE"
+				} else if (this.audioPlayState == 'PAUSE') {
+					this.innerAudioContext.play();
+					this.audioPlayState = "PLAYING"
 				}
-				this.audio.src = JSON.parse(this.msgInfo.content).url;
-				this.audio.play();
-				this.handlePlayVoice = 'RUNNING';
 			},
 			onSelectMenu(item) {
 				this.$emit(item.key.toLowerCase(), this.msgInfo);
@@ -357,12 +371,24 @@
 
 					}
 
+					.chat-msg-audio {
+						display: flex;
+						align-items: center;
 
-					
+						.chat-audio-text {
+							padding-right: 8px;
+						}
+
+						.icon-voice-play {
+							font-size: 20px;
+							padding-right: 8px;
+						}
+					}
 
 					.chat-realtime {
 						display: flex;
 						align-items: center;
+
 						.iconfont {
 							font-size: 20px;
 							padding-right: 8px;
@@ -373,13 +399,13 @@
 						display: block;
 
 						.chat-readed {
-							font-size: 10px;
-							color: #ccc;
+							font-size: 12px;
+							color: #888;
 							font-weight: 600;
 						}
-						
+
 						.chat-unread {
-							font-size: 10px;
+							font-size: 12px;
 							color: #f23c0f;
 							font-weight: 600;
 						}
@@ -436,14 +462,28 @@
 						.chat-msg-file {
 							flex-direction: row-reverse;
 						}
-						
+
+						.chat-msg-audio {
+							flex-direction: row-reverse;
+
+							.chat-audio-text {
+								padding-right: 0;
+								padding-left: 8px;
+							}
+							.icon-voice-play {
+								transform: rotateY(180deg);
+							}
+						}
+
 						.chat-realtime {
 							display: flex;
 							flex-direction: row-reverse;
+
 							.iconfont {
 								transform: rotateY(180deg);
 							}
 						}
+
 					}
 				}
 			}
diff --git a/im-uniapp/components/chat-record/chat-record.vue b/im-uniapp/components/chat-record/chat-record.vue
new file mode 100644
index 0000000..623333a
--- /dev/null
+++ b/im-uniapp/components/chat-record/chat-record.vue
@@ -0,0 +1,227 @@
+<template>
+	<view class="chat-record">
+		<view class="chat-record-bar" id="chat-record-bar" :style="recordBarStyle" @touchstart="onStartRecord"
+			@touchmove="onTouchMove" @touchend.prevent="onEndRecord">{{recording?'正在录音':'长按 说话'}}</view>
+		<view v-if="recording" class="chat-record-window" :style="recordWindowStyle">
+			<view class="rc-wave">
+				<text class="note" style="--d: 0"></text>
+				<text class="note" style="--d: 1"></text>
+				<text class="note" style="--d: 2"></text>
+				<text class="note" style="--d: 3"></text>
+				<text class="note" style="--d: 4"></text>
+				<text class="note" style="--d: 5"></text>
+				<text class="note" style="--d: 6"></text>
+			</view>
+			<view class="rc-tip">{{recordTip}}</view>
+			<view class="cancel-btn">
+				<uni-icons :class="moveToCancel?'red':'black'" type="clear" 
+				:size="moveToCancel?45:40"></uni-icons>
+			</view>
+			<view class="opt-tip" :class="moveToCancel?'red':'black'">{{moveToCancel? '松手取消':'松手发送,上划取消'}}</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "chat-record",
+		data() {
+			return {
+				recording: false,
+				moveToCancel: false,
+				recordBarTop: 0,
+				druation: 0,
+				rcTimer: null
+			}
+		},
+		methods: {
+			onTouchMove(e) {
+				const moveY = e.touches[0].clientY;
+				this.moveToCancel = moveY < this.recordBarTop-40;
+			},
+			onStartRecord() {
+				console.log("开始录音")
+				this.moveToCancel = false;
+				this.initRecordBar();
+				this.$rc.start().then(() => {
+					this.recording = true;
+					console.log("开始录音成功")
+					// 开始计时
+					this.startTimer();
+				}).catch((e) => {
+					console.log("录音失败"+JSON.stringify(e))
+					uni.showToast({
+						title: "录音失败",
+						icon: "none"
+					});
+				});
+			},
+			onEndRecord() {
+				this.recording = false;
+				// 停止录音
+				this.$rc.pause();
+				// 停止计时
+				this.StopTimer();
+				// 触屏位置是否移动到了取消区域
+				if (this.moveToCancel) {
+					this.$rc.close();
+					console.log("录音取消")
+					return;
+				}
+				// 小于1秒不发送
+				if (this.druation == 0) {
+					uni.showToast({
+						title: "说话时间太短",
+						icon: 'none'
+					})
+					this.$rc.close();
+					return;
+				}
+				this.$rc.upload().then((data) => {
+					this.$emit("send", data);
+				}).catch((e) => {
+					uni.showToast({
+						title: e,
+						icon: 'none'
+					})
+				}).finally(() => {
+					this.$rc.close();
+					console.log("录音完成")
+				})
+			},
+			startTimer() {
+				this.druation = 0;
+				this.StopTimer();
+				this.rcTimer = setInterval(() => {
+					this.druation++;
+					// 大于60s,直接结束
+					if(this.druation >= 60 ){
+						this.onEndRecord();
+					}
+				}, 1000)
+			},
+			StopTimer() {
+				this.rcTimer && clearInterval(this.rcTimer);
+				this.rcTimer = null;
+			},
+			initRecordBar() {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#chat-record-bar').boundingClientRect((rect) => {
+					// 顶部高度位置
+					this.recordBarTop = rect.top;
+				}).exec()
+			}
+		},
+		computed: {
+			recordWindowStyle() {
+				const windowHeight = uni.getSystemInfoSync().windowHeight;
+				const bottom = windowHeight - this.recordBarTop + 12;
+				return `bottom:${bottom}px;`
+			},
+			recordBarStyle() {
+				const bgColor = this.recording ? "royalblue" : "#f8f8f8";
+				return `background-color:${bgColor};`
+			},
+			recordTip(){
+				if(this.druation > 50){
+					return `${60-this.druation}s后将停止录音`;
+				}
+				return `录音时长:${this.druation}s`;
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.chat-record {
+		.rc-wave {
+			display: flex;
+			align-items: flex-end;
+			justify-content: center;
+			position: relative;
+			height: 80rpx;
+
+			.note {
+				background: linear-gradient(to top, #395ff3 0%, #89aff3 100%);
+				width: 4px;
+				height: 50%;
+				border-radius: 5rpx;
+				margin-right: 4px;
+				animation: loading 0.5s infinite linear;
+				animation-delay: calc(0.1s * var(--d));
+
+				@keyframes loading {
+					0% {
+						background-image: linear-gradient(to right, #395ff3 0%, #89aff3 100%);
+						height: 20%;
+						border-radius: 5rpx;
+					}
+
+					50% {
+						background-image: linear-gradient(to top, #395ff3 0%, #a9cff3 100%);
+						height: 80%;
+						border-radius: 5rpx;
+					}
+
+					100% {
+						background-image: linear-gradient(to top, #395ff3 0%, #a9cff3 100%);
+						height: 20%;
+						border-radius: 5rpx;
+					}
+				}
+			}
+		}
+
+		.chat-record-bar {
+			padding: 10rpx;
+			margin: 10rpx;
+			border-radius: 10rpx;
+			text-align: center;
+		}
+
+		.chat-record-window {
+			position: fixed;
+			left: 0;
+			height: 360rpx;
+			width: 100%;
+			background-color:  rgba(255, 255, 255, 0.95);
+			padding: 30rpx;
+
+			.icon-microphone {
+				text-align: center;
+				font-size: 80rpx;
+				padding: 10rpx;
+
+			}
+
+			.rc-tip {
+				text-align: center;
+				font-size: 30rpx;
+				margin-top: 20rpx;
+			}
+
+			.cancel-btn {
+				text-align: center;
+				margin-top: 40rpx;
+				height: 80rpx;
+
+			}
+
+			.opt-tip {
+				text-align: center;
+				font-size: 30rpx;
+				padding: 20rpx;
+			}
+
+			.red {
+				color: red !important;
+			}
+
+			.black {
+				color: gray;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/im-uniapp/main.js b/im-uniapp/main.js
index 62747fa..f3f3774 100644
--- a/im-uniapp/main.js
+++ b/im-uniapp/main.js
@@ -6,6 +6,13 @@ import * as date from './common/date';
 import * as socketApi from './common/wssocket';
 import store from './store';
 import { createSSRApp } from 'vue'
+// #ifdef H5
+import * as recorder from './common/recorder-h5';
+// #endif
+// #ifndef H5
+import * as recorder from './common/recorder-app';
+// #endif
+
 
 export function createApp() {
   const app = createSSRApp(App)
@@ -15,6 +22,7 @@ export function createApp() {
   app.config.globalProperties.$emo = emotion;
   app.config.globalProperties.$enums = enums;
   app.config.globalProperties.$date = date;
+  app.config.globalProperties.$rc = recorder;
   return {
     app
   }
diff --git a/im-uniapp/package.json b/im-uniapp/package.json
index bb25321..680d46c 100644
--- a/im-uniapp/package.json
+++ b/im-uniapp/package.json
@@ -1,6 +1,10 @@
 {
+	"name": "盒子IM",
 	"uni-app": {
-		"scripts": {
-		}
+		"scripts": {}
+	},
+	"dependencies": {
+		"js-audio-recorder": "^1.0.7",
+		"recorder-core": "^1.3.23122400"
 	}
-}
\ No newline at end of file
+}
diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue
index ff6d7d1..36836ba 100644
--- a/im-uniapp/pages/chat/chat-box.vue
+++ b/im-uniapp/pages/chat/chat-box.vue
@@ -9,8 +9,7 @@
 			<scroll-view class="scroll-box" scroll-y="true" @scrolltoupper="onScrollToTop"
 				:scroll-into-view="'chat-item-'+scrollMsgIdx">
 				<view v-for="(msgInfo,idx) in chat.messages" :key="idx">
-					<chat-message-item v-if="idx>=showMinIdx" :headImage="headImage(msgInfo)"
-						@call="onRtCall(msgInfo)"
+					<chat-message-item v-if="idx>=showMinIdx" :headImage="headImage(msgInfo)" @call="onRtCall(msgInfo)"
 						:showName="showName(msgInfo)" @recall="onRecallMessage" @delete="onDeleteMessage"
 						@longPressHead="onLongPressHead(msgInfo)" @download="onDownloadFile" :id="'chat-item-'+idx"
 						:msgInfo="msgInfo" :groupMembers="groupMembers">
@@ -29,7 +28,10 @@
 			</scroll-view>
 		</view>
 		<view class="send-bar">
-			<view class="send-text">
+			<view v-if="!showRecord" class="iconfont icon-voice-circle" @click="onVoiceInput()"></view>
+			<view v-else class="iconfont icon-keyboard" @click="onKeyboardInput()"></view>
+			<chat-record v-if="showRecord" class="chat-record" @send="onSendRecord" ></chat-record>
+			<view v-else class="send-text">
 				<textarea class="send-text-area" v-model="sendText" auto-height :show-confirm-bar="false"
 					:placeholder="isReceipt?'[回执消息]':''" :adjust-position="false" @confirm="sendTextMessage()"
 					@keyboardheightchange="onKeyboardheightchange" @input="onTextInput" confirm-type="send" confirm-hold
@@ -69,19 +71,19 @@
 					<view class="tool-name">文件</view>
 				</view>
 				<!-- #endif -->
-				<view class="chat-tools-item" @click="showTip()">
+				<view class="chat-tools-item" @click="onVoiceInput()">
 					<view class="tool-icon iconfont icon-microphone"></view>
-					<view class="tool-name">语音输入</view>
-				</view>			
+					<view class="tool-name">语音消息</view>
+				</view>
 				<view v-if="chat.type == 'GROUP'" class="chat-tools-item" @click="switchReceipt()">
 					<view class="tool-icon iconfont icon-receipt" :class="isReceipt?'active':''"></view>
 					<view class="tool-name">回执消息</view>
 				</view>
-				<view v-if="chat.type == 'PRIVATE'" class="chat-tools-item"  @click="onVideoCall()">
+				<view v-if="chat.type == 'PRIVATE'" class="chat-tools-item" @click="onVideoCall()">
 					<view class="tool-icon iconfont icon-video"></view>
 					<view class="tool-name">视频通话</view>
 				</view>
-				<view v-if="chat.type == 'PRIVATE'" class="chat-tools-item"  @click="onVoiceCall()">
+				<view v-if="chat.type == 'PRIVATE'" class="chat-tools-item" @click="onVoiceCall()">
 					<view class="tool-icon iconfont icon-call"></view>
 					<view class="tool-name">语音通话</view>
 				</view>
@@ -101,6 +103,7 @@
 </template>
 
 <script>
+	import UNI_APP from '@/.env.js';
 	export default {
 		data() {
 			return {
@@ -110,36 +113,68 @@
 				groupMembers: [],
 				sendText: "",
 				isReceipt: false, // 是否回执消息
-				showVoice: false, // 是否显示语音录制弹窗
 				scrollMsgIdx: 0, // 滚动条定位为到哪条消息
 				chatTabBox: 'none',
 				showKeyBoard: false,
+				showRecord: false,
 				keyboardHeight: 322,
 				atUserIds: [],
+				recordText: "",
 				showMinIdx: 0 // 下标小于showMinIdx的消息不显示，否则可能很卡
 			}
 		},
 		methods: {
-			showTip() {
-				uni.showToast({
-					title: "暂未支持...",
-					icon: "none"
+			onVoiceInput() {
+				this.showRecord = true;
+				this.switchChatTabBox('none',true);
+			},
+			onKeyboardInput() {
+				this.showRecord = false;
+				this.switchChatTabBox('none',false);
+			},
+			onSendRecord(data) {
+				console.log(data);
+				let msgInfo = {
+					content: JSON.stringify(data),
+					type: this.$enums.MESSAGE_TYPE.AUDIO,
+					receipt: this.isReceipt
+				}
+				// 填充对方id
+				this.fillTargetId(msgInfo, this.chat.targetId);
+				this.$http({
+					url: this.messageAction,
+					method: 'POST',
+					data: msgInfo
+				}).then((id) => {
+					msgInfo.id = id;
+					msgInfo.sendTime = new Date().getTime();
+					msgInfo.sendId = this.$store.state.userStore.userInfo.id;
+					msgInfo.selfSend = true;
+					msgInfo.status = this.$enums.MESSAGE_STATUS.UNSEND;
+					msgInfo.readedCount = 0;
+					this.$store.commit("insertMessage", msgInfo);
+					// 会话置顶
+					this.moveChatToTop();
+					// 滚动到底部
+					this.scrollToBottom();
+					this.isReceipt = false;
+					
 				})
 			},
-			onRtCall(msgInfo){
-				if(msgInfo.type == this.$enums.MESSAGE_TYPE.RT_VOICE){
+			onRtCall(msgInfo) {
+				if (msgInfo.type == this.$enums.MESSAGE_TYPE.RT_VOICE) {
 					this.onVoiceCall();
-				}else if(msgInfo.type == this.$enums.MESSAGE_TYPE.RT_VIDEO){
+				} else if (msgInfo.type == this.$enums.MESSAGE_TYPE.RT_VIDEO) {
 					this.onVideoCall();
 				}
 			},
-			onVideoCall(){
+			onVideoCall() {
 				const friendInfo = encodeURIComponent(JSON.stringify(this.friend));
 				uni.navigateTo({
 					url: `/pages/chat/chat-video?mode=video&friend=${friendInfo}&isHost=true`
 				})
 			},
-			onVoiceCall(){
+			onVoiceCall() {
 				const friendInfo = encodeURIComponent(JSON.stringify(this.friend));
 				uni.navigateTo({
 					url: `/pages/chat/chat-video?mode=voice&friend=${friendInfo}&isHost=true`
@@ -721,6 +756,11 @@
 				margin: 3rpx;
 			}
 
+			.chat-record {
+				flex: 1;
+
+			}
+
 			.send-text {
 				flex: 1;
 				background-color: #f8f8f8 !important;
@@ -728,8 +768,6 @@
 				padding: 20rpx;
 				background-color: #fff;
 				border-radius: 20rpx;
-				max-height: 300rpx;
-				min-height: 85rpx;
 				font-size: 30rpx;
 				box-sizing: border-box;
 
diff --git a/im-uniapp/static/icon/iconfont.css b/im-uniapp/static/icon/iconfont.css
index 49c38ed..c3ed695 100644
--- a/im-uniapp/static/icon/iconfont.css
+++ b/im-uniapp/static/icon/iconfont.css
@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4272106 */
-  src: url('iconfont.ttf?t=1710556421604') format('truetype');
+  src: url('iconfont.ttf?t=1711870080646') format('truetype');
 }
 
 .iconfont {
@@ -11,6 +11,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-pause:before {
+  content: "\e669";
+}
+
+.icon-play:before {
+  content: "\e620";
+}
+
+.icon-voice-play:before {
+  content: "\e675";
+}
+
 .icon-chat-video:before {
   content: "\e73b";
 }
diff --git a/im-uniapp/static/icon/iconfont.ttf b/im-uniapp/static/icon/iconfont.ttf
index 7d64c3642e0765886afe598ce679ece69571da56..060b3e5346d29bdd346959bb39b8a845be259ff3 100644
GIT binary patch
delta 1304
zcmaizU1(cn7{~wb`AVCtS(-FyPpn-U)}9WwkY;JS*{xSC48bweT}TavxMpizVl%r+
zi@K8=uXLmAfG`{?6GU%h;MhPEKPJ1HAY%wpk)iN(f)|21H*q;WZ{B@48F)^9=REK8
ze*OQ?dGmh$?2gr}``7BlVL;ml=+7Rit{lAZ=BNFDc^!yeo~x8+o#jg=fNRX?947*6
z`r90T!fc+a9bKMn_kRb(FWjE3E*vQ5PL4gs^UrZRUn?)yMFy9+zlYnY=gYN9<lS9o
zfgbMH4%HVH-J?_At@8qp^zxt>1j}gn4HON_zv26aB{L6Pb}PeKvv#q+v~kxT2pO#b
zKW4tT_vX2;7?%DTC)%LhnJ-te@i9WJw#)_*^fKZr&G)^CmiB_$6H__0q1Xz&70Gvy
zwdP>7lw^^Dfe3*#icp-Al%nl4PJ3vYW@w(ObcB|?H?&Q$hvmQ2#=XylRT0SEyL0&e
z8;G#%E>;plfDM_5q6gh<PM`xDSYsRsSm<PJ?FeHd7t`{}`c3awE#z*HhDEkzn@bN6
zhZ0_ueJEsENVXZ?2^3dI_hc)0cTiHnIzTCfEHQ0Yur|=Rf>na{xbne^%8jQLEFCnX
zU=yHug)BK$6>JQ2M8Ot8OA0m%T2ZiVkX)bP0)Spsa4A6VDByMi>#Rt^^}+fN3a%8c
zvoHzQ3_tHy$m+GOy;#L%(I-~Lw^~YTXidGKpEml8*NrP?#H^dAEz3F+m~7k8cD22?
z{UCJT_ZtQuV79uMzb`~O5EcQ~>gw(j-HF`TgcuvmI~m~&>RncPaHKOonoGoE|B5xt
zm5L{vp&{o)vGmRT@Qm%){JWZzucY4iZ@(IPds{df4U6~WvpI7&cB5>Lk1)XML`$7>
zSKC9R#R67F>=yY6v5CD~8s<yI<5JP_V(H5L@Ts-fmfqeiv9)MNht%_6uNrv!>tmrn
zznl0wo@xso3k?m)Z|67kTPz~PXCTG@VrN1dbjA|VpcqhLp9qVA^q?$Fm!$^_&pc<A
zpDrAJ!F;KCe*ex%Yv)K|>Tzp-^ZRr*J2^bucyiyhKYyAo%r<{(t~GDGJe{gF76%F=
zZ+&>`l<c3(3Vd|Z{46GHuV8O|RP+d2Bw^OeON$kwUM;T#UtE|!P}wF!&$U1J2W==O
A>i_@%

delta 789
zcmaKpKWGzC9LK-!-Q{v#ZIjw0wCT_cqNuSHTSS_uONTB(X&q`2B-q*viES}MI%uN!
zXK)eEMMY3lsFQ{2B7zD<9XmO65GnGj1=rRwe&0PDx_HOu-tYIj-`)57dvE!~($Kwu
zMzHns6QD-`CpTMJyfpmfSq+Fi06K@tGo|T+W3Lkcevsp37UJv96UOh!{&KZepY&VX
zfcnjRvNCtEbW{#C`TaEW{%WZ{ua4j|-*+?5T`pB;lFy6FK;|noXXodxG-@{=KWqbf
z2H5ZiiZ+_9CeFKFYX@*WQ`vQ8q6(`w?!WB2kSK1W&5as1vTtvhz^tvE)>YSY?lSeE
zqu2DnHG_Ac8ZT1~5QP0|H9VlZ!;C(2I%U;V2b?I%a}C&<f{P9IA4ZN*AP_A{NlR7+
zr68j+AyZP3g>XstwePO1>%uw3@BZC+{O<<Z>9-ScB&nm3KpH8;=wT1`p^I)h=*!~-
zdpVA`a^2CYVPa;{lR+8~E(ZRMPA&W|Bx#`n#PktrL3%7yg=8(%hYVWGUP-}1Pmobd
zq}7;ULTD5+WuawA#bP#47AzbCvS{HzkcNe$L3nru4heZ`;kekOu)!S2=64IX0KaI$
zP&DVcb<$$@0^?X!fjX<+=wte}UUSBskFMvAxG&tb*l_HdSC3bG-yicItz3(L=u(;R
MRBv7(ywm&YFLFnquK)l5


From a9577e8d4969eb06ee4d5060ae14d7a1f02c2af4 Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Sun, 31 Mar 2024 17:39:08 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AF=AD=E9=9F=B3=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/im-uniapp/manifest.json b/im-uniapp/manifest.json
index 29db5e8..f74a80f 100644
--- a/im-uniapp/manifest.json
+++ b/im-uniapp/manifest.json
@@ -2,8 +2,8 @@
     "name" : "盒子IM",
     "appid" : "__UNI__69DD57A",
     "description" : "",
-    "versionName" : "1.0.6",
-    "versionCode" : 106,
+    "versionName" : "1.0.7",
+    "versionCode" : 107,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

From 8591eb30e12f37b0ab22a2b7a65596e7ee3017d5 Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Sun, 31 Mar 2024 21:52:08 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feat:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AF=AD=E9=9F=B3=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   3 +--
 im-ui/src/assets/iconfont/iconfont.css        |   6 ++++-
 im-ui/src/assets/iconfont/iconfont.ttf        | Bin 4836 -> 5040 bytes
 im-ui/src/view/Home.vue                       |   6 +++--
 im-ui/src/view/Login.vue                      |  22 +++++++-----------
 im-uniapp/App.vue                             |   4 ++++
 .../chat-message-item/chat-message-item.vue   |   6 ++++-
 im-uniapp/manifest.json                       |   1 +
 im-uniapp/pages/chat/chat-box.vue             |  20 ++++++++++++----
 9 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index cdc506e..9af1974 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@
 
 ![输入图片说明](%E6%88%AA%E5%9B%BE/wx%E5%B0%8F%E7%A8%8B%E5%BA%8F%E4%BA%8C%E7%BB%B4%E7%A0%81.jpg)
 
-
+注:由于每次发布小程序都需要经过严格且繁琐的审核，当前线上微信小程序并非最新版本，最后一次更新时间是2023年12月
 
 
 #### 相关项目
@@ -260,5 +260,4 @@ wsApi.onClose((e) => {
 1. 本系统允许用于商业用途，且不收费（自愿投币）。**但切记不要用于任何非法用途** ，本软件作者不会为此承担任何责任
 1. 基于本系统二次开发后再次开源的项目，请注明引用出处，以避免引发不必要的误会
 1. 如果您也想体验开源(bei bai piao)的快感，成为本项目的贡献者，欢迎提交PR。开发前最好提前联系作者，避免功能重复开发
-1. 如果您不具备搭建本系统的能力，作者可以提供付费搭建服务，收费标准：150~200元/次。需自备服务器(必要)、域名和ssl证书(可选)、企业主体小程序账号(可选)
 
diff --git a/im-ui/src/assets/iconfont/iconfont.css b/im-ui/src/assets/iconfont/iconfont.css
index af7aa38..dbe25ef 100644
--- a/im-ui/src/assets/iconfont/iconfont.css
+++ b/im-ui/src/assets/iconfont/iconfont.css
@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3791506 */
-  src: url('iconfont.ttf?t=1710567233281') format('truetype');
+  src: url('iconfont.ttf?t=1711892447736') format('truetype');
 }
 
 .iconfont {
@@ -11,6 +11,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-exit:before {
+  content: "\e9e4";
+}
+
 .icon-chat-video:before {
   content: "\e73b";
 }
diff --git a/im-ui/src/assets/iconfont/iconfont.ttf b/im-ui/src/assets/iconfont/iconfont.ttf
index b1d7cb7f0e66038175edc55436fe539bd269dea0..81a162396ade1cbd65631cb744e9a14d9aaf3a3e 100644
GIT binary patch
delta 795
zcmZ{hUr5tY6vw~k{_ZwQ_uDjcGIWV<E-(zzT+np$#p)#jr$S^lmb#qFK||(44YCIb
z@lQV=s;5Zlr2?ZKBBWlzmmqvHA0#BkPlX;5`t#O0*I&?6_wxDObIv{YobSEALSQ*K
z*N}e&&@_N6iF7>kOFk_F#8GBucywYYG<)#^AUA;0<>X-eYVc<EIp=OMZAlI|K5KJq
zuQ2{(I-3i#!S%lKCp<cqh*ws5PVxEI?AN8^xePVp0q<8U|9U(<=w9@OmjU+_HyqB4
z-N<%biroS#zH!34`IUx<3&bXK|MBLB0ay43N+kz?FUP9~{;kDn32lh|5(pLLq0YGs
zAHAT0u|~0bLK=Q?D7e1A0jxpWw~q08kh9kzvBXDwaC1aAE(@=Hw@@qs%9P49_C#%j
zIOG2laKa87S8#AuiBgtxfJNyjQ{BkExF;yjZTOXWsCQ9A2TYp<7l6sT3N8iHYr#cf
zwpeg^nCC3G5zM<5>LTVd3vLecrv=Nv_Gt?il*jgWb{N)%9bOcy5<71#l%U;i3ng{8
zVDb0ufEb=oHQk|)VoAK$>a{nrS8m$8w%fK1^#h8Zw1-+9w+-=~TTYxTZ*8Lb!{wEM
zW(qdi^R-mz@d;hjH;WDmwY5`gqr<Ldm4|0rh$n4DrHo2i@TIzh6rDXaf&R&b$^Jl1
zPbd3{NPC&Hw=XuFT8(z-Iz5t<lk)eJOr04$LPDGs<R71z%|s%Z*_m-aaX?U0Uo1JY
k8f|wt^`5@&<jBhvIqxKwalWFagxrvWxocS?RWU*M0|76irvLx|

delta 630
zcmZ{fO-NKx6vzMPzV~KE=gY4}PB8?d*g_-_L>M931n$JCwLQ#n7EVs&Vr-EuT!@G|
z+?CQM+Qlr4HZDXA#6?KB4=N(=jNsDT6ixp-H)z#){N6qH-1G52dqdv`w{t5wKsEq8
zoGpiy!<qaWKn;-U{K9f^zrX$q@DG4^tTY!s8hYS8VeVHlR$?If+1sMecMO!uOVx2Y
z?03Q6_`>3B*mu$Wf%PwW&z8e#MFz3M_iMc0d>oeNx?X1{_JH&;2hLX(pDvw^)cSy)
zVJ7U?4sv%=5W3{&r_G+3^u!OueFlJUnJ@4EovjTYUXk}0l#SACT}o%=trYZ`+}F2M
z@7>dO6gYv`_J(<OGW8TbcA0+zU5q45U=k){M$M#IH+6H>$Tu#VXda#y^mCO}t(JbJ
zuIGj6|NDRh0yb5MprbuRC@qR4;v5&z;{Db~66lr}S*csKv?O2x2diQJ!agt=2Rp)y
zI_#om(!nV(>kiI?VNVMu!(2J+qK&-6F5kFx+@mlwnQNg$?&+|C&I=AJn>LMOxh>Ds
xl&YwYUeQ<nntu|E1gpTi7eOtVO^Fgud<i5XQHe>1bV^(jl9ZIBp~rfc{{W#Yh64Zq

diff --git a/im-ui/src/view/Home.vue b/im-ui/src/view/Home.vue
index d23677b..6ad830a 100644
--- a/im-ui/src/view/Home.vue
+++ b/im-ui/src/view/Home.vue
@@ -29,7 +29,7 @@
 				</el-menu-item>
 			</el-menu>
 			<div class="exit-box" @click="onExit()" title="退出">
-				<span class="el-icon-circle-close"></span>
+				<span class="icon iconfont icon-exit"></span>
 			</div>
 		</el-aside>
 		<el-main class="content-box">
@@ -372,10 +372,12 @@
 			width: 60px;
 			bottom: 40px;
 			color: #aaaaaa;
-			font-size: 24px;
 			text-align: center;
 			cursor: pointer;
 
+			.icon {
+				font-size: 28px;
+			}
 			&:hover {
 				color: white !important;
 			}
diff --git a/im-ui/src/view/Login.vue b/im-ui/src/view/Login.vue
index f4031ec..f3d8b2f 100644
--- a/im-ui/src/view/Login.vue
+++ b/im-ui/src/view/Login.vue
@@ -5,35 +5,31 @@
 				<div>
 					<h3>盒子IM 2.0版本已上线：</h3>
 					<ul>
-						<li>加入uniapp移动版本，支持移动端和web端同时在线，多端消息同步</li>
-						<li>目前移动端仅兼容h5和微信小程序，后续会继续兼容更多终端类型</li>
+						<li>加入uniapp移动端,支持移动端和web端同时在线，多端消息同步</li>
+						<li>目前uniapp移动端支持安卓、ios、h5、微信小程序</li>
 						<li>聊天窗口支持粘贴截图、@群成员、已读未读显示</li>
-						<li>页面风格升级:表情包更新、自动生成文字头像等</li>
 						<li>支持群聊已读显示(回执消息)</li>
 						<li>语雀文档
 							<a href="https://www.yuque.com/u1475064/mufu2a" target="_blank">盒子IM详细介绍文档</a>,目前限时免费开放中
 						</li>
 					</ul>
 				</div>
-				<div>
-					<h3>最近更新(2024-02-24)：</h3>
-					<ul>
-						<li>uniapp端兼容ios和andriod,
-							<a href="https://www.boxim.online/download/boxim.apk" target="_blank">点击下载安卓客户端</a>
-						</li>
-						<li>uniapp端的启动和打包方式有所变化，具体请参考语雀文档</li>
-					</ul>
-				</div>
 				<div>
 					<h3>最近更新(2024-03-17)：</h3>
 					<ul>
 						<li>web端音视频功能优化:支持语音呼叫、会话中加入通话状态消息</li>
 						<li>uniapp端支持音视频通话，并与web端打通</li>
 						<li>uniapp端音视频源码通话源码暂未开源，需付费获取:
-							<a href="https://www.yuque.com/u1475064/oncgyg/vi7engzluty594s2" target="_blank">uniapp端音视频通话源码购买说明</a>
+							<a href="https://www.yuque.com/u1475064/oncgyg/vi7engzluty594s2" target="_blank">uniapp端音视频通源码购买说明</a>
 						</li>
 					</ul>
 				</div>
+				<div>
+					<h3>最近更新(2024-03-31)：</h3>
+					<ul>
+						<li>uniapp移动端支持发送语音消息</li>
+					</ul>
+				</div>
 				<div>
 					<h3>如果本项目对您有帮助,请在gitee上帮忙点个star</h3>
 				</div>
diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue
index 49665dd..5a3a7fe 100644
--- a/im-uniapp/App.vue
+++ b/im-uniapp/App.vue
@@ -106,6 +106,10 @@
 				// webrtc 信令
 				if (msg.type >= enums.MESSAGE_TYPE.RTC_CALL_VOICE &&
 					msg.type <= enums.MESSAGE_TYPE.RTC_CANDIDATE) {
+					// #ifdef MP-WEIXIN
+						// 小程序不支持音视频
+						return;
+					// #endif
 					// 被呼叫，弹出视频页面
 					if(msg.type == enums.MESSAGE_TYPE.RTC_CALL_VOICE 
 						|| msg.type == enums.MESSAGE_TYPE.RTC_CALL_VIDEO){
diff --git a/im-uniapp/components/chat-message-item/chat-message-item.vue b/im-uniapp/components/chat-message-item/chat-message-item.vue
index 6f69044..43dc856 100644
--- a/im-uniapp/components/chat-message-item/chat-message-item.vue
+++ b/im-uniapp/components/chat-message-item/chat-message-item.vue
@@ -139,12 +139,16 @@
 				// 初始化音频播放器
 				if (!this.innerAudioContext) {
 					this.innerAudioContext = uni.createInnerAudioContext();
-					let url = JSON.parse(this.msgInfo.content).url
+					let url = JSON.parse(this.msgInfo.content).url;
 					this.innerAudioContext.src = url;
 					this.innerAudioContext.onEnded((e) => {
 						console.log('停止')
 						this.audioPlayState = "STOP"
 					})
+					this.innerAudioContext.onError((e) =>{
+						console.log("播放音频出错");
+						console.log(e)
+					});
 				}
 				if (this.audioPlayState == 'STOP') {
 					this.innerAudioContext.play();
diff --git a/im-uniapp/manifest.json b/im-uniapp/manifest.json
index f74a80f..e5d7646 100644
--- a/im-uniapp/manifest.json
+++ b/im-uniapp/manifest.json
@@ -100,6 +100,7 @@
     /* 小程序特有相关 */
     "mp-weixin" : {
         "appid" : "wxda94f40bfad0262c",
+		"libVersion": "latest",  
         "setting" : {
             "urlCheck" : false
         },
diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue
index 36836ba..ffd421b 100644
--- a/im-uniapp/pages/chat/chat-box.vue
+++ b/im-uniapp/pages/chat/chat-box.vue
@@ -28,7 +28,7 @@
 			</scroll-view>
 		</view>
 		<view class="send-bar">
-			<view v-if="!showRecord" class="iconfont icon-voice-circle" @click="onVoiceInput()"></view>
+			<view v-if="!showRecord" class="iconfont icon-voice-circle" @click="onRecorderInput()"></view>
 			<view v-else class="iconfont icon-keyboard" @click="onKeyboardInput()"></view>
 			<chat-record v-if="showRecord" class="chat-record" @send="onSendRecord" ></chat-record>
 			<view v-else class="send-text">
@@ -38,8 +38,8 @@
 					:hold-keyboard="true"></textarea>
 			</view>
 			<view v-if="chat.type=='GROUP'" class="iconfont icon-at" @click="openAtBox()"></view>
-			<view class="iconfont icon-icon_emoji" @click="switchChatTabBox('emo',true)"></view>
-			<view v-if="sendText==''" class="iconfont icon-add" @click="switchChatTabBox('tools',true)">
+			<view class="iconfont icon-icon_emoji" @click="onShowEmoChatTab()"></view>
+			<view v-if="sendText==''" class="iconfont icon-add" @click="onShowToolsChatTab()">
 			</view>
 			<button v-if="sendText!=''||atUserIds.length>0" class="btn-send" type="primary"
 				@touchend.prevent="sendTextMessage()" size="mini">发送</button>
@@ -79,6 +79,8 @@
 					<view class="tool-icon iconfont icon-receipt" :class="isReceipt?'active':''"></view>
 					<view class="tool-name">回执消息</view>
 				</view>
+				<!-- #ifndef MP-WEIXIN -->
+				<!-- 音视频不支持小程序 -->
 				<view v-if="chat.type == 'PRIVATE'" class="chat-tools-item" @click="onVideoCall()">
 					<view class="tool-icon iconfont icon-video"></view>
 					<view class="tool-name">视频通话</view>
@@ -87,6 +89,7 @@
 					<view class="tool-icon iconfont icon-call"></view>
 					<view class="tool-name">语音通话</view>
 				</view>
+				<!-- #endif -->
 			</view>
 			<scroll-view v-if="chatTabBox==='emo'" class="chat-emotion" scroll-y="true">
 				<view class="emotion-item-list">
@@ -124,7 +127,7 @@
 			}
 		},
 		methods: {
-			onVoiceInput() {
+			onRecorderInput() {
 				this.showRecord = true;
 				this.switchChatTabBox('none',true);
 			},
@@ -299,10 +302,19 @@
 				});
 
 			},
+			onShowEmoChatTab(){
+				this.showRecord = false;
+				this.switchChatTabBox('emo',true)
+			},
+			onShowToolsChatTab(){
+				this.showRecord = false;
+				this.switchChatTabBox('tools',true)
+			},
 			switchChatTabBox(chatTabBox, hideKeyBoard) {
 				this.chatTabBox = chatTabBox;
 				if (hideKeyBoard) {
 					uni.hideKeyboard();
+					this.showKeyBoard = false;
 				}
 			},
 			selectEmoji(emoText) {