Browse Source

只有在测量完成时,保存按钮可用

master
zhangjiming 4 months ago
parent
commit
93c5afbfdf
  1. 14
      src/pages/Measure.tsx
  2. 2
      src/services/socket.ts

14
src/pages/Measure.tsx

@ -98,10 +98,10 @@ export default function Measure() {
Dialog.alert({ Dialog.alert({
content: '蓝牙未连接,请先连接蓝牙', content: '蓝牙未连接,请先连接蓝牙',
onConfirm: () => { onConfirm: () => {
navigate("/home/bluetooth");
navigate('/home/bluetooth');
}, },
})
return
});
return;
} }
Bridge.startMeasure().then((res) => { Bridge.startMeasure().then((res) => {
if (res.success) { if (res.success) {
@ -219,9 +219,13 @@ export default function Measure() {
<div className="btn-contained rounded-md text-sm h-10 flex-1" onClick={onStartClick}> <div className="btn-contained rounded-md text-sm h-10 flex-1" onClick={onStartClick}>
{measureState.leftPoints.length > 0 ? '重新测量' : '开始测量'} {measureState.leftPoints.length > 0 ? '重新测量' : '开始测量'}
</div> </div>
<div className="btn-contained rounded-md text-sm h-10 flex-1" onClick={onSaveClick}>
<button
className="btn-contained rounded-md text-sm h-10 flex-1"
disabled={measureState.taskState !== 'FINISH_RECORD_RIGHT'}
onClick={onSaveClick}
>
</div>
</button>
</section> </section>
<section className="grid grid-cols-2 gap-[10px] px-3"> <section className="grid grid-cols-2 gap-[10px] px-3">

2
src/services/socket.ts

@ -7,7 +7,7 @@ class WebSocketClient {
private ws: WebSocket | null = null; private ws: WebSocket | null = null;
private url: string; private url: string;
private reconnectAttempts: number = -1; private reconnectAttempts: number = -1;
private maxReconnectAttempts: number = 5;
private maxReconnectAttempts: number = 50;
private reconnectInterval: number = 3000; private reconnectInterval: number = 3000;
private dataSub = new Subject<MobileDatagram>(); private dataSub = new Subject<MobileDatagram>();

Loading…
Cancel
Save