From 14ce12f9417b98c434976b039bb4e58d47541044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Mon, 22 Dec 2025 16:52:02 +0800
Subject: [PATCH] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E=E5=90=89?=
 =?UTF-8?q?=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI=E6=99=BA?=
 =?UTF-8?q?=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=5F=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E4=B8=80=E4=BB=B6=E8=AF=BB=E5=8F=96=E5=90=8E=E7=BA=A2?=
 =?UTF-8?q?=E7=82=B9=E4=B8=8D=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.en.md                            |  2 ++
 src/pages/messageNotification/index.vue |  2 +-
 src/pages/sparring/talk.vue             | 45 ++++++++++++++-----------
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/README.en.md b/README.en.md
index cb85303e..2d7a6e86 100644
--- a/README.en.md
+++ b/README.en.md
@@ -5,5 +5,7 @@ npm 淘宝源下载 ：npm config set registry https://registry.npmmirror.com
 npm config set registry http://25.12.10.69:8081/repository/aliyun-npm/
 
 
+npm install @dcloudio/uni-uts-v1 http://25.12.10.69:8081/repository/npm/
+
 npm install --registry=https://registry.npmmirror.com
 
diff --git a/src/pages/messageNotification/index.vue b/src/pages/messageNotification/index.vue
index 38dd8b03..0716c8ad 100644
--- a/src/pages/messageNotification/index.vue
+++ b/src/pages/messageNotification/index.vue
@@ -99,7 +99,7 @@
 		oneTimeRead()
 			.then((res) => {
 				data_list.value.forEach((item) => {
-					item.isRead = '02';
+					item.isMsg = 'N';
 				});
 				common.hideLoading();
 				setTimeout(() => {
diff --git a/src/pages/sparring/talk.vue b/src/pages/sparring/talk.vue
index b28a48ba..5c45c0c7 100644
--- a/src/pages/sparring/talk.vue
+++ b/src/pages/sparring/talk.vue
@@ -19,11 +19,11 @@
 				{{ dataInfo.sceneDesc }}
 			</view>
 			<view class="close-btn" @click="closeTalking"></view>
-			<canvas canvas-id="firstCanvas" style="width: 176px; height: 144px;"></canvas>
+			<!-- <canvas canvas-id="firstCanvas" style="width: 176px; height: 144px;"></canvas> -->
 		</view>
 		<talk-microphone ref="talkMicrophoneRef" @noPermission="microphoneNoPermission"></talk-microphone>
 		<talk-speaker ref="talkSpeakerRef" @playOver="playOver"></talk-speaker>
-		<!-- <talk-camera ref="talkCameraRef" v-if="isVideo"></talk-camera> -->
+		<talk-camera ref="talkCameraRef" v-if="isVideo"></talk-camera>
 	</view>
 </template>
 <script setup>
@@ -43,7 +43,7 @@
 	const { initConnection, close, send, isRecording } = useWebSocket();
 	const isVideo = ref(false);
 	const isVideoStyle = computed(() => dataInfo.traInterTyp === '03');
-	const context = uni.createCanvasContext('firstCanvas');
+	// const context = uni.createCanvasContext('firstCanvas');
 	const dataInfo = reactive({
 		traId: '',
 		chaId: '',
@@ -71,7 +71,7 @@
 		});
 	};
 	const test = () => {
-		// isVideo.value && talkCameraRef.value.switchCamera();
+		isVideo.value && talkCameraRef.value.switchCamera();
 	};
 	const clearAutomaticEndTimeTimer = () => {
 		if (automaticEndTimeTimer){
@@ -83,7 +83,7 @@
 	const destroy = (type = 0) => {
 		clearAutomaticEndTimeTimer()
 		if (type <= 0) {
-			// isVideo.value && talkCameraRef.value.stopPreview();
+			isVideo.value && talkCameraRef.value.stopPreview();
 			talkMicrophoneRef.value.stop();
 			talkSpeakerRef.value.close();
 		}
@@ -165,11 +165,12 @@
 		// 当ws连接成功时候
 		console.log('连接成功开始' + dataInfo.traInterTypDesc);
 		isRecording.value = true;
-		// isVideo.value && talkCameraRef.value.startPreview();
+		isVideo.value && talkCameraRef.value.startPreview();
 		if (timer) clearInterval(timer); // 清除旧的定时器，避免多个定时器叠加
 		timer = setInterval(updateRemaining, 400);
 		// 立即执行一次
 		updateRemaining();
+		startAutomaticEndTimeTimer()
 		talkMicrophoneRef.value.start({
 			sampleRate: 16000,
 			frameSize: 1024,
@@ -188,13 +189,19 @@
 						lock: id
 					})
 				);
-				// 打开一个计时器，时间到了就中断
-				automaticEndTimeTimer = setTimeout(() => {
-					destroy();
-				}, automaticEndTime);
+				startAutomaticEndTimeTimer()
 			}, 300);
 		}
 	};
+	
+	// 启动没人说话定时器
+	const startAutomaticEndTimeTimer = () => {
+		// 打开一个计时器，时间到了就中断
+		
+		automaticEndTimeTimer = setTimeout(() => {
+			destroy();
+		}, automaticEndTime);
+	}
 	const onError = (error) => {
 		// websocket错误处理
 		console.log('websocket错误处理', error.code);
@@ -270,16 +277,16 @@
 	onReady(() => {
 		if (isVideo.value) {
 			// const context = uni.createCanvasContext('firstCanvas');
-			startCameraPreview((base64) => {
-				context.drawImage(base64, 0, 0, 176, 144);
-				context.draw(true); 
-			})
+			// startCameraPreview((base64) => {
+			// 	context.drawImage(base64, 0, 0, 176, 144);
+			// 	context.draw(true); 
+			// })
 				
-			// const instance = getCurrentInstance();
-			// const componentProxy = instance.ctx;
-			// nextTick(() => {
-			// 	talkCameraRef.value.init(componentProxy);
-			// });
+			const instance = getCurrentInstance();
+			const componentProxy = instance.ctx;
+			nextTick(() => {
+				talkCameraRef.value.init(componentProxy);
+			});
 		}
 	});
 	onUnmounted(() => {