Merge branch 'master' of http://192.168.1.3:3000/zhangjiming/outline-mobile

src/components/CustomNavBar.tsx

@@ -2,15 +2,28 @@ import icon_bluetooth from '../assets/icon_bluetooth.svg';
 import icon_arr_d from '../assets/icon_arr_down.svg';
 import power_icon from '../assets/power.svg';
 import './CustomNavBar.scss';
-import { useState } from 'react';
+import {useEffect, useRef, useState} from 'react';
 import { useAppSelector } from '../utils/hooks';
 import { useNavigate } from 'react-router-dom';
+import {Dialog} from "antd-mobile";
 
 export default function CustomNavBar({ title }: { title: string }) {
   const navigate = useNavigate();
   const device = useAppSelector((state) => state.context.device);
   const [showDetail, setShowDetail] = useState(false);
 
+    const hasWarned = useRef(false);
+    useEffect(() => {
+        if (device.connected && device.power< 20  && !hasWarned.current) {
+            Dialog.alert({
+                content: '设备电量过低，请及时充电',
+                onConfirm: () => {
+                },
+             }).then(r => {});
+            hasWarned.current = true; // 标记已弹窗
+        }
+    }, [device]);
+
   return (
     <div className="relative bg-white h-[--navBarHeight] border-b border-[#D8D8D8]">
       {/** 温度，水平仪 */}

src/components/MeasurementItem.tsx

@@ -16,6 +16,9 @@ export default function MeasurementItem({
   onDetail?: () => void;
   onSelected?: () => void;
 }) {
+  const padNumber = (num: string, length: number = 4): string => {
+    return num.toString().padStart(length, '0');
+  }
   return (
     <div className="flex mx-2 gap-3" onClick={editMode ? onSelected : undefined}>
       {editMode && (
@@ -25,7 +28,7 @@ export default function MeasurementItem({
       )}
       <main className="flex-1">
         <header className="flex items-center gap-2">
-          <span className="text-sm text-[#606266]">{item.todayNumber}.</span>
+          <span className="text-sm text-[#606266]">{padNumber(item.todayNumber)}.</span>
           <h1 className="text-[15px] font-medium ">{item.name}</h1>
           {item.syncStatus === 'finish' && <span className="text-[#04CA17] text-xs">已上传</span>}
         </header>

src/components/konva/MeasurementCanvas.tsx

@@ -83,6 +83,7 @@ export interface MeasurementCanvasRef {
     setMeasurementData: (data: Point[]) => void;
     setAnalysisData: (data: AnalysisData[]) => void;
     redraw: () => void;
+    setCustomScale: (data: number) => void;
 }
 
 interface PinchData {
@@ -212,6 +213,9 @@ const MeasurementCanvas = forwardRef<MeasurementCanvasRef, MeasurementCanvasProp
                     origin
                 }
             },
+            setCustomScale: (newScale: number) => {
+                setScale(newScale);
+            },
         }));
 
         const stageRef = useRef<any>(null);

src/pages/Measure.tsx

@@ -31,6 +31,7 @@ export default function Measure() {
   const measureState = useAppSelector((state) => state.measure);
   const contextState = useAppSelector((state) => state.context);
   const baseState = useAppSelector((state) => state.baseData);
+  const device = useAppSelector((state) => state.context.device);
   const [railPickerVisible, setRailPickerVisible] = useState(false);
   const [railId, setRailId] = useState<(number | string | null)[]>([]);
   const canvasRef = useRef<MeasurementCanvasRef>(null);
@@ -54,6 +55,8 @@ export default function Measure() {
     }
   }
 
+
+
   // 检查轨型有没有坐标，如果有，绘制轨型基准线，如果没，拉取再绘制其线
   useEffect(() => {
     if (railId.length > 0) {
@@ -135,7 +138,22 @@ export default function Measure() {
   };
 
   const [initStart, setInitStart] = useState(false);
+
+  const [measurementCanvasKey, setMeasurementCanvasKey] = useState(0);
+
+
+  const [state, setState] = useState({
+    left_ready: 'none',
+    right_ready: 'none',
+    left_begin: 'none',
+    right_begin: 'none',
+    left_end: 'none',
+    right_end: 'none',
+  });
+
+
   const onStartClick = () => {
+    setMeasurementCanvasKey(measurementCanvasKey+1)
     setshowCalibration(false);
     setShowMeasureFinish(false)
     dispatch(updateMeasureData([]));
@@ -201,14 +219,6 @@ export default function Measure() {
     }
   };
 
-  const [state, setState] = useState({
-    left_ready: 'none',
-    right_ready: 'none',
-    left_begin: 'none',
-    right_begin: 'none',
-    left_end: 'none',
-    right_end: 'none',
-  });
   const [status, setStatus] = useState(0)
   useEffect(() => {
     console.log(measureState.taskState)
@@ -454,6 +464,7 @@ export default function Measure() {
                 showCoordinates={false}
                 showCalibration={showCalibration || showMeasureFinish}
                 ref={canvasRef}
+                key={measurementCanvasKey}
               />
 
               {/**选择轨型区 */}

src/pages/Setting.tsx

@@ -87,6 +87,21 @@ export default function Setting() {
             </div>
           </section>
         )}
+        {!context.device.connected && (
+            <section>
+              <div className="h-[42px] px-5">
+                <h1 className="h-[42px] leading-[42px] text-base text-text font-medium">设备设置</h1>
+              </div>
+              <div className="bg-white px-5 text-sm text-text">
+                <div className="h-12 flex items-center" onClick={() => Toast.show('连接设备后可设置')}>
+                  <span>自动待机</span>
+                  <span className="ml-auto mr-4">
+                 --分钟
+                </span>
+                </div>
+              </div>
+            </section>
+        )}
 
         <div
           className="btn-contained rounded-md h-12 mx-9 my-8 text-base font-medium"

src/store/features/contextSlice.ts

@@ -35,7 +35,7 @@ const initialState: ContextState = {
   device: {
     flag: 0,
     connected: true, //是否已连接蓝牙
-    power: 0, //电量
+    power: 100, //电量
     inclinatorX: 0.276, //x轴倾斜
     inclinatorY: 3.019, //y轴倾斜
     temperature: 32.026, //温度