Browse Source

优化测量数据

master
LiLongLong 2 months ago
parent
commit
39463dd18f
  1. 1
      src/App.tsx
  2. 7
      src/pages/Measure.tsx
  3. 6
      src/store/features/measureSlice.ts

1
src/App.tsx

@ -34,7 +34,6 @@ function App() {
// 监听推送消息,更新store // 监听推送消息,更新store
useEffect(() => { useEffect(() => {
const subscription = bridgeOb.subscribe((datagram) => { const subscription = bridgeOb.subscribe((datagram) => {
// console.log('datagram.type--', datagram.type)
if (datagram.type === 'measure-event') { if (datagram.type === 'measure-event') {
dispatch(updateTaskState(datagram.data)); dispatch(updateTaskState(datagram.data));
} else if (datagram.type === 'measure-point') { } else if (datagram.type === 'measure-point') {

7
src/pages/Measure.tsx

@ -89,13 +89,13 @@ export default function Measure() {
// 左右两测量完成,转换后的测量线(两线合一线) // 左右两测量完成,转换后的测量线(两线合一线)
useEffect(() => { useEffect(() => {
if (canvasRef.current) {
canvasRef.current?.setMeasurementCalibrationData(measureState.measureData);
if (canvasRef.current && measureState.measureFinishData.length) {
canvasRef.current?.setMeasurementCalibrationData(measureState.measureFinishData);
// setshowCalibration(true); // setshowCalibration(true);
setShowMeasureFinish(true) setShowMeasureFinish(true)
setCaloading(false) setCaloading(false)
} }
}, [measureState.measureData])
}, [measureState.measureFinishData])
useEffect(() => { useEffect(() => {
if(measureState.measureStatus === 'FINISH_RECORD'){ if(measureState.measureStatus === 'FINISH_RECORD'){
@ -137,6 +137,7 @@ export default function Measure() {
const [initStart, setInitStart] = useState(false); const [initStart, setInitStart] = useState(false);
const onStartClick = () => { const onStartClick = () => {
setshowCalibration(false); setshowCalibration(false);
setShowMeasureFinish(false)
dispatch(updateMeasureData([])); dispatch(updateMeasureData([]));
if (!contextState.device.connected) { if (!contextState.device.connected) {
Dialog.alert({ Dialog.alert({

6
src/store/features/measureSlice.ts

@ -7,7 +7,8 @@ export interface MeasureState {
leftPoints: TrackRecordSig['data'][]; leftPoints: TrackRecordSig['data'][];
rightPoints: TrackRecordSig['data'][]; rightPoints: TrackRecordSig['data'][];
measureData:[], measureData:[],
measureStatus: string
measureStatus: string,
measureFinishData: []
} }
const initialState: MeasureState = { const initialState: MeasureState = {
taskState: undefined, taskState: undefined,
@ -16,6 +17,7 @@ const initialState: MeasureState = {
rightPoints: [], rightPoints: [],
measureData: [], measureData: [],
measureStatus: '', measureStatus: '',
measureFinishData: [],
}; };
function isLeftFinished(state: MeasureState) { function isLeftFinished(state: MeasureState) {
@ -82,7 +84,7 @@ export const measureSlice = createSlice({
// if(payload.outline2 && payload.outline2.length){ // if(payload.outline2 && payload.outline2.length){
// state.leftPoints = payload.outline2 // state.leftPoints = payload.outline2
// } // }
state.measureData = payload
state.measureFinishData = payload
}, },
}, },
}); });

Loading…
Cancel
Save