diff --git a/public/audio/alert_left.mp3 b/public/audio/alert_left.mp3 deleted file mode 100644 index f597e87..0000000 Binary files a/public/audio/alert_left.mp3 and /dev/null differ diff --git a/public/audio/begin_left.mp3 b/public/audio/begin_left.mp3 deleted file mode 100644 index 084b48e..0000000 Binary files a/public/audio/begin_left.mp3 and /dev/null differ diff --git a/public/audio/begin_right.mp3 b/public/audio/begin_right.mp3 deleted file mode 100644 index 7d741aa..0000000 Binary files a/public/audio/begin_right.mp3 and /dev/null differ diff --git a/public/audio/end_left.mp3 b/public/audio/end_left.mp3 deleted file mode 100644 index 965b171..0000000 Binary files a/public/audio/end_left.mp3 and /dev/null differ diff --git a/public/audio/end_right.mp3 b/public/audio/end_right.mp3 deleted file mode 100644 index cd7bd18..0000000 Binary files a/public/audio/end_right.mp3 and /dev/null differ diff --git a/public/audio/measure_end.mp3 b/public/audio/measure_end.mp3 deleted file mode 100644 index 83c8634..0000000 Binary files a/public/audio/measure_end.mp3 and /dev/null differ diff --git a/public/audio/measuring.mp3 b/public/audio/measuring.mp3 deleted file mode 100644 index 9c52945..0000000 Binary files a/public/audio/measuring.mp3 and /dev/null differ diff --git a/public/audio/ready.mp3 b/public/audio/ready.mp3 deleted file mode 100644 index 0db85af..0000000 Binary files a/public/audio/ready.mp3 and /dev/null differ diff --git a/public/audio/side_end.mp3 b/public/audio/side_end.mp3 deleted file mode 100644 index 0df0a16..0000000 Binary files a/public/audio/side_end.mp3 and /dev/null differ diff --git a/src/App.tsx b/src/App.tsx index ea2b6e1..51349bb 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -34,6 +34,7 @@ function App() { // 监听推送消息,更新store useEffect(() => { const subscription = bridgeOb.subscribe((datagram) => { + console.log('datagram.type--', datagram.type) if (datagram.type === 'measure-event') { dispatch(updateTaskState(datagram.data)); } else if (datagram.type === 'measure-point') { @@ -47,7 +48,6 @@ function App() { } else if (datagram.type === 'update-base-progress') { dispatch(updateSyncBaseProgress(datagram.data)); }else if (datagram.type === 'measure-finished') { - console.log('measure-finished---------', datagram.data) dispatch(updateMeasureFinish(datagram.data)); } }); diff --git a/src/pages/Measure.tsx b/src/pages/Measure.tsx index 5eac133..01e9b91 100644 --- a/src/pages/Measure.tsx +++ b/src/pages/Measure.tsx @@ -37,6 +37,7 @@ export default function Measure() { const canvasRef = useRef(null); const [railSize, setRailSize] = useState(); const iconWidth = 35; + const [showStandard, setShowStandard] = useState(false); // 默认选中第一个轨型 useEffect(() => { @@ -156,23 +157,10 @@ export default function Measure() { Toast.show(res.message); } setInitStart(true); - openAudio(); + setShowStandard(false) }); }; - const openAudio = () => { - // const audioReady = new Audio('/audio/ticking.wav'); - // // 播放音频 - // audioReady - // .play() - // .then(() => { - // console.log('音频开始播放 已准备好'); - // }) - // .catch((err) => { - // console.error('播放音频时出错:', err); - // }); - }; - const onOrgBarClick = async () => { if (baseState.ktjOrgs.length === 0) { Dialog.alert({ @@ -281,6 +269,8 @@ export default function Measure() { left_end: 'done', right_end: 'done', }); + // 测量完成,显示基线 + setShowStandard(true) break; default: setState({ @@ -435,7 +425,7 @@ export default function Measure() { pixelPerMm={window.innerWidth / 90} maxZoom={8} showGrid={true} - showBenchmark={true} + showBenchmark={showStandard} showAnalysis={false} showScale={false} scaleInterval={1} diff --git a/src/store/features/measureSlice.ts b/src/store/features/measureSlice.ts index e3b46c5..f6a881f 100644 --- a/src/store/features/measureSlice.ts +++ b/src/store/features/measureSlice.ts @@ -25,13 +25,7 @@ function isLeftFinished(state: MeasureState) { return true; return false; } -const audioList: HTMLAudioElement[] = [] -function pauseAudio(){ - audioList.forEach(audio => { - audio.pause() - }) -} - +let status: 1| 2 ; export const measureSlice = createSlice({ name: 'measure', initialState, @@ -48,27 +42,15 @@ export const measureSlice = createSlice({ state.leftPoints = []; state.rightPoints = []; } - if(action.payload === 'WAITING_FOR_RECORD_THE_2ND_SIDE'){ - const audio3 = new Audio('/audio/ticking.wav'); - audio3.play().then(() => {}); - audioList.push(audio3) - } else { - if (action.payload === 'START_RECORD_LEFT') { - const audio1 = new Audio('/audio/ticking.wav'); - audio1.play().then(() => {}); - audioList.push(audio1) - } else if (action.payload === 'START_RECORD_RIGHT') { - // const audio3 = new Audio('/audio/ticking.wav'); - // audio3.play().then(() => {}); - // audioList.push(audio3) - } else if (action.payload === 'FINISH_RECORD') { - const audio4 = new Audio('/audio/ticking.wav'); - audio4.play().then(() => {}); - audioList.push(audio4) - } else if (action.payload === 'WRONG_SIDE') { - const audio5 = new Audio('/audio/ticking.wav'); - audio5.play().then(() => {}); - } + + if(action.payload === 'WAITING_FOR_RECORD_THE_1ST_SIDE') { + status = 1 + }else if(action.payload === 'WAITING_FOR_RECORD_THE_2ND_SIDE') { + status = 2 + } + if((['START_RECORD_LEFT', 'START_RECORD_RIGHT'].includes(action.payload) && status === 1) || (['FINISH_RECORD_LEFT', 'FINISH_RECORD_RIGHT'].includes(action.payload) && status === 1) || ['FINISH_RECORD'].includes(action.payload)) { + const audio = new Audio('/audio/ticking.wav'); + audio.play().then(() => {}); } }, addNewPoint: (state, action: PayloadAction) => {