diff --git a/src/pages/measure/components/MeasureAction.tsx b/src/pages/measure/components/MeasureAction.tsx index 5106958..b798618 100644 --- a/src/pages/measure/components/MeasureAction.tsx +++ b/src/pages/measure/components/MeasureAction.tsx @@ -127,12 +127,14 @@ export default function MeasureAction() { }); }; + const [startLoading, setStartLoading] = useState(false) // 开始/重新测量按钮点击事件 const onStart = useCallback(() => { - if (!deviceInfo.isConnected) { - message.error("请先连接设备"); - return; - } + // if (!deviceInfo.isConnected) { + // message.error("请先连接设备"); + // return; + // } + setStartLoading(true) setAudioList([]) // if(deviceInfo.power < 20){ // message.error('电量低于20%,请充电后再测量!') @@ -149,6 +151,9 @@ export default function MeasureAction() { canvasRef.current?.clearShapes(); canvasRef.current?.resetCanvas(); startMeasurement().then(res => { + setTimeout(()=>{ + setStartLoading(false) + }, 1000) if (res.status !== 0) { message.error(res.data.info); } else { @@ -246,7 +251,6 @@ export default function MeasureAction() { const [audioList, setAudioList] = useState([]) const pauseAudio = () => { audioList.forEach(audio => { - console.log('-----------111-------------') audio.pause() }) } @@ -323,7 +327,7 @@ export default function MeasureAction() { updated[5].color = STEP_COLOR_GREEN; setMeasurementFinished(true); pauseAudio() - const audio4 = new Audio("/audio/measure_end.mp3"); + const audio4 = new Audio("/audio/side_end.mp3");//measure_end // 播放音频 audio4 .play() @@ -333,6 +337,18 @@ export default function MeasureAction() { .catch(err => { console.error("播放音频时出错:", err); }); + break; + case "FINISH_RECORD": + const audioFinish= new Audio("/audio/measure_end.mp3");//measure_end + // 播放音频 + audioFinish + .play() + .then(() => { + console.log("音频开始播放"); + }) + .catch(err => { + console.error("播放音频时出错:", err); + }); setCaLoading(true) setLoadingText('正在处理测量数据...') break; @@ -624,7 +640,7 @@ export default function MeasureAction() { ))}
-