liushengqiang пре 2 година
родитељ
комит
0ba0bfea8c
3 измењених фајлова са 8 додато и 29 уклоњено
  1. 8 15
      src/view/evaluating/index.tsx
  2. 0 1
      src/view/evaluating/recordAudio.ts
  3. 0 13
      src/view/evaluating/websocket.ts

+ 8 - 15
src/view/evaluating/index.tsx

@@ -214,17 +214,13 @@ export const handleStartBegin = async () => {
 		// console.log("🚀 ~ content:", evaluatingData.contentData, JSON.stringify(evaluatingData.contentData));
 	} catch (error) {}
 	const res = await startEvaluating(evaluatingData.contentData);
-	startRecordingAudio();
-	playMusic()
-	evaluatingData.backtime = Date.now();
-	evaluatingData.startBegin = true
-	// if (res?.api !== "startEvaluating") {
-	// 	Snackbar.error("请在APP端进行评测");
-	// 	evaluatingData.startBegin = false;
-	// 	return;
-	// }
-	// 开始录音
-	// api_startRecording();
+	if (res?.api !== "startEvaluating") {
+		Snackbar.error("请在APP端进行评测");
+		evaluatingData.startBegin = false;
+		return;
+	}
+	//开始录音
+	api_startRecording();
 	
 };
 
@@ -312,8 +308,7 @@ export const handleEndEvaluat = (isComplete = false) => {
 	if (!evaluatingData.startBegin || state.modeType !== "evaluating") return;
 	evaluatingData.startBegin = false;
 	// 结束录音
-	// api_stopRecording();
-	stopRecordingAudio();
+	api_stopRecording();
 	// 结束评测
 	endEvaluating({
 		musicScoreId: state.examSongId,
@@ -447,8 +442,6 @@ export default defineComponent({
 				clearSelection();
 			}
 			console.log("加载评测模块成功");
-
-			createRecordAudio();
 		});
 		onUnmounted(() => {
 			removeResult(handleScoreResult);

+ 0 - 1
src/view/evaluating/recordAudio.ts

@@ -1,7 +1,6 @@
 import JsRecorder from "js-audio-recorder";
 import Recorder from "recorder-core/recorder.mp3.min";
 // import Recorder from "recorder-core/recorder.wav.min";
-import { register } from "./websocket";
 import request from "umi-request";
 let mediaRecorder: JsRecorder | null;
 let chunks: Blob[] = [];

+ 0 - 13
src/view/evaluating/websocket.ts

@@ -1,13 +0,0 @@
-// import WebSocket from "ws";
-
-let ws: WebSocket;
-export const createSocket = () => {
-	ws = new WebSocket("wss://mstutest.dayaedu.com/audioAnalysis");
-	ws.onopen = function () {
-		console.log("连接成功");
-		ws.send("发送数据");
-	};
-	ws.onmessage = function (evt) {
-		console.log("接收到的数据:" + evt.data);
-	};
-};