From 9f7a3d4970bb55d8c0ae69d04e3190ef40a1bad7 Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Wed, 3 Apr 2024 16:01:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=87=E6=A1=A3=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-ui/src/view/Login.vue                      |  2 +-
 .../components/chat-record/chat-record.vue    | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/im-ui/src/view/Login.vue b/im-ui/src/view/Login.vue
index f3d8b2f..c64b6d4 100644
--- a/im-ui/src/view/Login.vue
+++ b/im-ui/src/view/Login.vue
@@ -20,7 +20,7 @@
 						<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/mufu2a/vi7engzluty594s2" target="_blank">uniapp端音视频通源码购买说明</a>
 						</li>
 					</ul>
 				</div>
diff --git a/im-uniapp/components/chat-record/chat-record.vue b/im-uniapp/components/chat-record/chat-record.vue
index 623333a..77de146 100644
--- a/im-uniapp/components/chat-record/chat-record.vue
+++ b/im-uniapp/components/chat-record/chat-record.vue
@@ -1,7 +1,10 @@
 <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 class="chat-record-bar" id="chat-record-bar" :style="recordBarStyle" 
+			@click.stop=""
+			@touchstart.prevent="onStartRecord"
+			@touchmove.prevent="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>
@@ -13,7 +16,7 @@
 				<text class="note" style="--d: 6"></text>
 			</view>
 			<view class="rc-tip">{{recordTip}}</view>
-			<view class="cancel-btn">
+			<view class="cancel-btn" @click="onCancel">
 				<uni-icons :class="moveToCancel?'red':'black'" type="clear" 
 				:size="moveToCancel?45:40"></uni-icons>
 			</view>
@@ -40,7 +43,19 @@
 				const moveY = e.touches[0].clientY;
 				this.moveToCancel = moveY < this.recordBarTop-40;
 			},
+			onCancel(){
+				if(this.recording){
+					this.moveToCancel = true;
+					this.onEndRecord();
+				}
+			},
 			onStartRecord() {
+				/* 用户第一次使用语音会唤醒录音权限请求，此时会导致@touchend失效，
+					一直处于录音状态，这里允许用户再次点击发送语音并结束录音 */
+				if(this.recording){
+					this.onEndRecord();
+					return;
+				}
 				console.log("开始录音")
 				this.moveToCancel = false;
 				this.initRecordBar();