From 4eaddcfc1cf6206c7d339dea5c641f7591da1418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Wed, 26 Nov 2025 20:51:26 +0800
Subject: [PATCH] fix: bug

---
 .env.development                |   4 +-
 .env.development.yh             |   2 +-
 src/manifest.json               |   3 +-
 src/pages/sparring/result.vue   |   7 +-
 src/pages/sparring/talk.vue     |   2 +-
 src/pages/sparring/talkCom.nvue | 137 ++++++++++++++++++++++++++++++++
 src/pages/sparring/talkCom.vue  | 124 -----------------------------
 7 files changed, 149 insertions(+), 130 deletions(-)
 create mode 100644 src/pages/sparring/talkCom.nvue
 delete mode 100644 src/pages/sparring/talkCom.vue

diff --git a/.env.development b/.env.development
index cf5bbd49..8723b259 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ ENV = 'development'
 
 # VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
 
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
 
 # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
@@ -23,7 +23,7 @@ VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
 # DEV
 # app入口
 
-# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
+VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 # VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786'
 # VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
 
diff --git a/.env.development.yh b/.env.development.yh
index 0e2f8894..e9359d3e 100644
--- a/.env.development.yh
+++ b/.env.development.yh
@@ -4,7 +4,7 @@ ENV = 'development.yh'
 
 VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 
-# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
+VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604'
 # VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603'
 # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601'
diff --git a/src/manifest.json b/src/manifest.json
index 05f2606c..0a4b6c05 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -35,7 +35,8 @@
             "Camera" : {},
             "Barcode" : {},
             "Record" : {},
-            "VideoPlayer" : {}
+            "VideoPlayer" : {},
+            "LivePusher" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue
index ae72030d..c8819362 100644
--- a/src/pages/sparring/result.vue
+++ b/src/pages/sparring/result.vue
@@ -250,7 +250,7 @@
 				isLoading.value = false
 				setTimeout(() => {
 					showLoading.value = false
-					if(isPass.value && isOver.value){
+					if(isPass.value && isOver.value && canLoad.value){
 						pointAndBadgesRun(talkingType.value === '01' ? '07': '08', '', ()=>{})
 					}
 				}, 800)
@@ -280,7 +280,9 @@
 			common.navigateBack()
 		}
 	}
+	const canLoad= ref(false)
 	onLoad((params) => {
+		canLoad.value= true
 		traId.value = params.traId;
 		execId.value = params.execId
 		talkingType.value = params.type;
@@ -289,6 +291,9 @@
 		isOver.value = params.isOver === '1'
 		getData()
 	});
+	onUnload(()=>{
+		canLoad.value= false
+	})
 	onMounted(() => {})
 	onBackPress((res) => res.from === 'backbutton');
 </script>
diff --git a/src/pages/sparring/talk.vue b/src/pages/sparring/talk.vue
index 970ee47a..f696c2b2 100644
--- a/src/pages/sparring/talk.vue
+++ b/src/pages/sparring/talk.vue
@@ -2,5 +2,5 @@
 	<talkCom/>
 </template>
 <script setup>
-	import talkCom from './talkCom.vue'
+	import talkCom from './talkCom.nvue'
 </script>
\ No newline at end of file
diff --git a/src/pages/sparring/talkCom.nvue b/src/pages/sparring/talkCom.nvue
new file mode 100644
index 00000000..098c07b0
--- /dev/null
+++ b/src/pages/sparring/talkCom.nvue
@@ -0,0 +1,137 @@
+<template>
+	<view>
+		<!-- <video :is-live="true" :src="videoSrc" :autoplay="true" @error="error"></video> -->
+    <live-pusher 
+		id="pusher-box" 
+		:enable-camera="false"></live-pusher>
+
+		<button class="btn" @click="prepare">预热</button>
+		<button class="btn" @click="start">开始推流1</button>
+		<button class="btn" @click="pause">暂停推流</button>
+		<button class="btn" @click="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 >
+	import {
+		prepareApi
+	} from "@/api/talk.js";
+	 var pusher = null;
+	export default {
+			data() {
+				return {
+					baseName: 'wangwu',
+					context: null
+				}
+			},
+		computed: {
+			videoSrc() {
+				return 'rtmp://25.18.122.148:9605/voice_out/' + this.baseName;
+			},
+		},
+		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() {
+				console.log('start');
+				console.log('start', pusher.start);
+				pusher.start(a => {
+					console.log('livePusher.start:');
+				}, b => {
+					console.log('livePusher.start.err:');
+				}
+				);
+			},
+			close() {
+				pusher.close({
+					success: a => {
+						console.log('livePusher.close:' + JSON.stringify(a));
+					}
+				});
+			},
+			snapshot() {
+				pusher.snapshot({
+					success: e => {
+						console.log(JSON.stringify(e));
+					}
+				});
+			},
+			resume() {
+				pusher.resume({
+					success: e => {
+						console.log(JSON.stringify(e));
+					}
+				});
+			},
+			pause() {
+				pusher.pause({
+					success: a => {
+						console.log('livePusher.pause:' + JSON.stringify(a))
+					}
+				})
+			},
+			stop() {
+				pusher.stop({
+					success: a => {
+						console.log(JSON.stringify(a))
+					}
+				})
+			},
+			switchCamera() {
+				pusher.switchCamera({
+					success: a => {
+						console.log('livePusher.switchCamera:' + JSON.stringify(a))
+					}
+				})
+			},
+			startPreview() {
+				pusher.startPreview({
+					success: a => {
+						console.log('livePusher.startPreview:' + JSON.stringify(a))
+					}
+				})
+			},
+			stopPreview() {
+				pusher.stopPreview({
+					success: a => {
+						console.log('livePusher.stopPreview:' + JSON.stringify(a))
+					}
+				})
+			},
+			prepare() {
+				prepareApi(this.baseName).then(res => {
+					console.log(res)
+				}).catch(err => {
+					console.log(err)
+					if (err === 'prepare') {
+						this.initPusher()
+					}
+				})
+			},
+			initPusher() {
+				console.log(1)
+				pusher = new plus.video.LivePusher('pusher-box', {
+					url: 'rtmp://25.18.122.148:9605/voice_in/' + this.baseName,
+					"enable-camera": false,
+					"min-bitrate": 16,
+					"max-bitrate": 16,
+				})
+				pusher.addEventListener('statechange', this.statechange)
+				pusher.addEventListener('netstatus', this.netstatus)
+				pusher.addEventListener('error', this.error)
+				console.log(pusher)
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/src/pages/sparring/talkCom.vue b/src/pages/sparring/talkCom.vue
deleted file mode 100644
index 280ed09d..00000000
--- a/src/pages/sparring/talkCom.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-	<view>
-		<video :is-live="true" :src="videoSrc" :autoplay="true" @error="error"></video>
-		<view id="pusher-box" class="pusher-box"></view>
-		<button class="btn" @click="start">开始推流1</button>
-		<button class="btn" @click="pause">暂停推流</button>
-		<button class="btn" @click="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>
-	// import {
-	// 	prepareApi
-	// } from "@/api/talk.js";
-	// var pusher;
-	// export default ({
-	// 	data() {
-	// 		return {
-	// 			baseName: 'zhangsan',
-	// 			context: null
-	// 		}
-	// 	},
-	// 	computed: {
-	// 		videoSrc() {
-	// 			return 'rtmp://25.18.122.148:9605/voice_out/' + this.baseName;
-	// 		},
-	// 	},
-	// 	onReady() {},
-	// 	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() {
-	// 			console.log('start');
-	// 			console.log('start', pusher.start);
-	// 			pusher.start(a => {
-	// 				console.log('livePusher.start:');
-	// 			}, b => {
-	// 				console.log('livePusher.start.err:');
-	// 			});
-	// 		},
-	// 		close: function() {
-	// 			pusher.close({
-	// 				success: a => {
-	// 					console.log('livePusher.close:' + JSON.stringify(a));
-	// 				}
-	// 			});
-	// 		},
-	// 		snapshot: function() {
-	// 			pusher.snapshot({
-	// 				success: e => {
-	// 					console.log(JSON.stringify(e));
-	// 				}
-	// 			});
-	// 		},
-	// 		resume: function() {
-	// 			prepareApi(this.baseName).then(res => {
-	// 				console.log(res)
-	// 			}).catch(err => {
-	// 				console.log(err)
-	// 				if (err === 'prepare') {
-	// 					this.initPusher()
-	// 				}
-	// 			})
-	// 		},
-	// 		pause: function() {
-	// 			pusher.pause({
-	// 				success: a => {
-	// 					console.log('livePusher.pause:' + JSON.stringify(a))
-	// 				}
-	// 			})
-	// 		},
-	// 		stop: function() {
-	// 			pusher.stop({
-	// 				success: a => {
-	// 					console.log(JSON.stringify(a))
-	// 				}
-	// 			})
-	// 		},
-	// 		switchCamera: function() {
-	// 			pusher.switchCamera({
-	// 				success: a => {
-	// 					console.log('livePusher.switchCamera:' + JSON.stringify(a))
-	// 				}
-	// 			})
-	// 		},
-	// 		startPreview: function() {
-	// 			pusher.startPreview({
-	// 				success: a => {
-	// 					console.log('livePusher.startPreview:' + JSON.stringify(a))
-	// 				}
-	// 			})
-	// 		},
-	// 		stopPreview: function() {
-	// 			pusher.stopPreview({
-	// 				success: a => {
-	// 					console.log('livePusher.stopPreview:' + JSON.stringify(a))
-	// 				}
-	// 			})
-	// 		},
-	// 		initPusher() {
-	// 			console.log(1)
-	// 			pusher = new plus.video.LivePusher('pusher-box', {
-	// 				url: 'rtmp://25.18.122.148:9605/voice_in/' + this.baseName,
-	// 				"enable-camera": false
-	// 			})
-	// 			pusher.addEventListener('statechange', this.statechange)
-	// 			pusher.addEventListener('netstatus', this.netstatus)
-	// 			pusher.addEventListener('error', this.error)
-	// 			console.log(pusher)
-	// 		}
-	// 	}
-	// })
-</script>
\ No newline at end of file