From a0325bfb583814a76ce5957ed360afc83c157bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 25 Nov 2025 16:25:35 +0800
Subject: [PATCH] fix: bug

---
 src/pages.json                |   1 +
 src/pages/sparring/talk.vue   | 114 ++++++++++++++++++++++++++++++++--
 src/pages/sparring/talk1.nvue | 112 +++++++++++++++++++++++++++++++++
 src/pages/sparring/tip.vue    |  59 ++++++++----------
 src/pagesB.json               |   1 +
 5 files changed, 248 insertions(+), 39 deletions(-)
 create mode 100644 src/pages/sparring/talk1.nvue

diff --git a/src/pages.json b/src/pages.json
index 6909ab85..8d0ca400 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -488,6 +488,7 @@
             "path": "pages/sparring/tip",
             "style": {
                 "navigationBarTitleText": "AI陪练提示",
+                "disableSwipeBack": true,
                 "app-plus": {
                     "titleNView": false
                 }
diff --git a/src/pages/sparring/talk.vue b/src/pages/sparring/talk.vue
index c163da20..b5ca06b4 100644
--- a/src/pages/sparring/talk.vue
+++ b/src/pages/sparring/talk.vue
@@ -1,10 +1,112 @@
-<template>
-	<!-- 通话 -->
+<!-- <template>
 	<view>通话</view>
+	<live-pusher
+		url="rtmp://25.18.122.148:9605/voice_in/aa"
+		:enable-camera="true"
+		@statechange="statechange"
+		@netstatus="netstatus"
+		@error="errorFnc"
+	></live-pusher>
+</template> -->
+<template>
+  <view>
+    <video :is-live="true" :src="videoSrc" :autoplay="true"></video>
+    <live-pusher id="livePusher" ref="livePusher" class="livePusher" url="rtmp://25.18.122.148:9605/voice_in/aa" mode="SD" :muted="true" :enable-camera="false" :auto-focus="true" :beauty="1" whiteness="2" aspect="9:16" @statechange="statechange" @netstatus="netstatus" @error="error"></live-pusher>
+    <button class="btn" @click="start">开始推流</button>
+    <button class="btn" @click="pause">暂停推流</button>
+    <button class="btn" @click="resume">resume</button>
+    <button class="btn" @click="stop">停止推流</button>
+    <button class="btn" @click="snapshot">快照</button>
+    <button class="btn" @click="startPreview">开启摄像头预览1</button>
+    <button class="btn" @click="stopPreview">关闭摄像头预览</button>
+    <button class="btn" @click="switchCamera">切换摄像头</button>
+  </view>
 </template>
-
 <script>
+export default {
+  data() {
+    return {
+      videoSrc: 'rtmp://25.18.122.148:9605/voice_out/aa'
+    }
+  },
+  onReady() {
+    // 注意：需要在onReady中 或 onLoad 延时
+    this.context = uni.createLivePusherContext('livePusher', this)
+  },
+  methods: {
+    statechange(e) {
+      console.log('statechange:', e, JSON.stringify(e))
+    },
+    netstatus(e) {
+      console.log('netstatus:' + JSON.stringify(e))
+    },
+    error(e) {
+      console.log('error:' + JSON.stringify(e))
+    },
+    start: function () {
+      this.context.start({
+        success: a => {
+          console.log('livePusher.start:' + JSON.stringify(a))
+        }
+      })
+    },
+    close: function () {
+      this.context.close({
+        success: a => {
+          console.log('livePusher.close:' + JSON.stringify(a))
+        }
+      })
+    },
+    snapshot: function () {
+      this.context.snapshot({
+        success: e => {
+          console.log(JSON.stringify(e))
+        }
+      })
+    },
+    resume: function () {
+      this.context.resume({
+        success: a => {
+          console.log('livePusher.resume:' + JSON.stringify(a))
+        }
+      })
+    },
+    pause: function () {
+      this.context.pause({
+        success: a => {
+          console.log('livePusher.pause:' + JSON.stringify(a))
+        }
+      })
+    },
+    stop: function () {
+      this.context.stop({
+        success: a => {
+          console.log(JSON.stringify(a))
+        }
+      })
+    },
+    switchCamera: function () {
+      this.context.switchCamera({
+        success: a => {
+          console.log('livePusher.switchCamera:' + JSON.stringify(a))
+        }
+      })
+    },
+    startPreview: function () {
+      this.context.startPreview({
+        success: a => {
+          console.log('livePusher.startPreview:' + JSON.stringify(a))
+        }
+      })
+    },
+    stopPreview: function () {
+      this.context.stopPreview({
+        success: a => {
+          console.log('livePusher.stopPreview:' + JSON.stringify(a))
+        }
+      })
+    }
+  }
+}
 </script>
-
-<style>
-</style>
\ No newline at end of file
+<style></style>
diff --git a/src/pages/sparring/talk1.nvue b/src/pages/sparring/talk1.nvue
new file mode 100644
index 00000000..ed73cf88
--- /dev/null
+++ b/src/pages/sparring/talk1.nvue
@@ -0,0 +1,112 @@
+<!-- <template>
+	<view>通话</view>
+	<live-pusher
+		url="rtmp://25.18.122.148:9605/voice_in/aa"
+		:enable-camera="true"
+		@statechange="statechange"
+		@netstatus="netstatus"
+		@error="errorFnc"
+	></live-pusher>
+</template> -->
+<template>
+  <div>
+    <video :is-live="true" :src="videoSrc" :autoplay="true"></video>
+    <live-pusher id="livePusher" ref="livePusher" class="livePusher" url="rtmp://25.18.122.148:9605/voice_in/aa" mode="SD" :muted="true" :enable-camera="false" :auto-focus="true" :beauty="1" whiteness="2" aspect="9:16" @statechange="statechange" @netstatus="netstatus" @error="error"></live-pusher>
+    <text class="btn" @click="start">开始推流</text>
+    <text class="btn" @click="pause">暂停推流</text>
+    <text class="btn" @click="resume">resume</text>
+    <text class="btn" @click="stop">停止推流</text>
+    <text class="btn" @click="snapshot">快照</text>
+    <text class="btn" @click="startPreview">开启摄像头预览1</text>
+    <text class="btn" @click="stopPreview">关闭摄像头预览</text>
+    <text class="btn" @click="switchCamera">切换摄像头</text>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      videoSrc: 'rtmp://25.18.122.148:9605/voice_out/aa'
+    }
+  },
+  onReady() {
+    // 注意：需要在onReady中 或 onLoad 延时
+    this.context = uni.createLivePusherContext('livePusher', this)
+  },
+  methods: {
+    statechange(e) {
+      console.log('statechange:', e, JSON.stringify(e))
+    },
+    netstatus(e) {
+      console.log('netstatus:' + JSON.stringify(e))
+    },
+    error(e) {
+      console.log('error:' + JSON.stringify(e))
+    },
+    start: function () {
+      this.context.start({
+        success: a => {
+          console.log('livePusher.start:' + JSON.stringify(a))
+        }
+      })
+    },
+    close: function () {
+      this.context.close({
+        success: a => {
+          console.log('livePusher.close:' + JSON.stringify(a))
+        }
+      })
+    },
+    snapshot: function () {
+      this.context.snapshot({
+        success: e => {
+          console.log(JSON.stringify(e))
+        }
+      })
+    },
+    resume: function () {
+      this.context.resume({
+        success: a => {
+          console.log('livePusher.resume:' + JSON.stringify(a))
+        }
+      })
+    },
+    pause: function () {
+      this.context.pause({
+        success: a => {
+          console.log('livePusher.pause:' + JSON.stringify(a))
+        }
+      })
+    },
+    stop: function () {
+      this.context.stop({
+        success: a => {
+          console.log(JSON.stringify(a))
+        }
+      })
+    },
+    switchCamera: function () {
+      this.context.switchCamera({
+        success: a => {
+          console.log('livePusher.switchCamera:' + JSON.stringify(a))
+        }
+      })
+    },
+    startPreview: function () {
+      this.context.startPreview({
+        success: a => {
+          console.log('livePusher.startPreview:' + JSON.stringify(a))
+        }
+      })
+    },
+    stopPreview: function () {
+      this.context.stopPreview({
+        success: a => {
+          console.log('livePusher.stopPreview:' + JSON.stringify(a))
+        }
+      })
+    }
+  }
+}
+</script>
+<style></style>
diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue
index 17494741..37784c21 100644
--- a/src/pages/sparring/tip.vue
+++ b/src/pages/sparring/tip.vue
@@ -7,7 +7,7 @@
 		<view class="sparring-detail-body">
 			<view class="top-box">
 				<view class="top-title">
-					<view class="back-icon" @click="common.navigateBack()"></view>
+					<view class="back-icon" @click="goBack()"></view>
 					{{ detailInfo.traName }}
 				</view>
 				<view class="top-desc">内容由AI生成</view>
@@ -100,7 +100,8 @@
 	import {
 		onShow,
 		onLoad,
-		onUnload
+		onUnload,
+		onBackPress
 	} from '@dcloudio/uni-app';
 	import common from '@/common/common';
 	import TouchBtn from './components/touchBtn.vue';
@@ -404,40 +405,31 @@
 		});
 		watchFlag.value += 1;
 	};
-
+	const goBack = () => {
+		if (detailInfo.value.traInterTyp === '01') {
+			overTalking()
+		}else{
+			common.navigateBack()
+		}
+	}
 	const overTalking = () => {
-		partnerChatReportTrigger({
-			execId: execId.value,
-			traId: traId.value,
-			talkingType: isPreview.value? 'preview' : 'practice'
-		}).then(res=>{
-			watchFlag.value = 1;
-			socketStore?.closeSocket();
-			changePlayItemId('')
-			pointAndBadgesRun(talkingType.value === '01'? '07': '08', null, ()=>{
-				common.navigateTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ?'1':''))
-			})
+		common.show('提示','确定结束陪练吗？').then(res => {
+			if (res) {
+				partnerChatReportTrigger({
+					execId: execId.value,
+					traId: traId.value,
+					talkingType: isPreview.value? 'preview' : 'practice'
+				}).then(res=>{
+					watchFlag.value = 1;
+					socketStore?.closeSocket();
+					changePlayItemId('')
+					pointAndBadgesRun(talkingType.value === '01'? '07': '08', null, ()=>{
+						common.navigateTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ?'1':''))
+					})
+				})
+			}
 		})
 	}
-	const getPointsList = (pointsList = [], badgesList = []) => {
-		pointsRef.value.open(pointsList, badgesList);
-		
-	}
-	const badgeConfirm = (status, pointsList = [], badgesList = []) => {
-		badgeRef.value.close();
-		overTalking()
-	};
-	// 积分确认
-	const pointsConfirm = (status, pointsList = [], badgesList = []) => {
-		pointsRef.value.close();
-		if (badgesList.length > 0) {
-			nextTick(() => {
-				setTimeout(() => {
-					badgeRef.value.open(pointsList, badgesList);
-				}, 500);
-			});
-		}
-	};
 	const sendMessage = (data) => {
 		unref(SocketObj).send(data);
 	};
@@ -458,6 +450,7 @@
 	onMounted(() => {
 		// getDetailInfo()
 	})
+	onBackPress((res) => res.from === 'backbutton');
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pagesB.json b/src/pagesB.json
index e3df178e..2b2f0445 100644
--- a/src/pagesB.json
+++ b/src/pagesB.json
@@ -76,6 +76,7 @@
 			"path": "pages/sparring/tip",
 			"style": {
 				"navigationBarTitleText": "AI陪练提示",
+				"disableSwipeBack": true,
 				"app-plus": {
 					"titleNView": false
 				}