Merge branch 'master' of http://192.168.0.115:3000/bill/traffic-laser

src/sdk/laser/core/enter.js

@@ -305,6 +305,7 @@ var enter = ({
                         type: "measure",
                         measurement: measure,
                         hideMarkers: true,
+                        hideMeasures:true,
                         ifGetPose: true,
                     },
                         width,

src/sdk/types/sdk.ts

@@ -69,7 +69,7 @@ export type Measure = {
     dataUrl: string;
     pose: Pose;
   };
-  bus: Emitter<{ update: Measure; highlight: boolean }>;
+  bus: Emitter<{ update: Measure; highlight: boolean, firstClickMarker: void }>;
   getDatasets: () => Array<string>;
   getDatasetId: () => string;
   getDatasetLocations: () => Array<Pos3D>;

src/views/scene/linkage/measure.ts

@@ -12,7 +12,7 @@ type TempCanvasMeasureAtom = Omit<CanvasMeasureAtom, "canvas"> & {
 
 let prevMeasure: TempCanvasMeasureAtom
 
-export const startMeasure = (type: MeasureType) => {
+export const startMeasure = (type: MeasureType, firstClickMarker?: () => void) => {
   if (prevMeasure) {
     prevMeasure.canvas.bus.emit("quit")
     prevMeasure = null;
@@ -57,6 +57,7 @@ export const startMeasure = (type: MeasureType) => {
       currentMeasure.canvas.bus.off("end", endHandler);
       currentMeasure.canvas.bus.off("quit", quitHandler);
       currentMeasure.canvas.bus.off("invalidPoint", invalidPointHandler);
+      firstClickMarker && currentMeasure.canvas.bus.off("firstClickMarker", firstClickMarker)
       if (prevMeasure === currentMeasure) {
         prevMeasure = null;
       }
@@ -65,20 +66,22 @@ export const startMeasure = (type: MeasureType) => {
     currentMeasure.canvas.bus.on("quit", quitHandler);
     currentMeasure.canvas.bus.on("end", endHandler);
     currentMeasure.canvas.bus.on("invalidPoint", invalidPointHandler);
+    firstClickMarker && currentMeasure.canvas.bus.on("firstClickMarker", firstClickMarker)
     prevMeasure = currentMeasure
   })
 }
 
 export const continuedMeasure = (
   type: MeasureType,
-  onAddMeasure: (data: MeasureAtom) => void
+  onAddMeasure: (data: MeasureAtom) => void,
+  firstClickMarker?: () => void
 ) => {
 
-  startMeasure(type)
+  startMeasure(type, firstClickMarker)
     .then(data => {
       if (data) {
         onAddMeasure(data);
-        continuedMeasure(type, onAddMeasure)
+        continuedMeasure(type, onAddMeasure, firstClickMarker)
       }
     })
 }

src/views/scene/menus/actions.ts

@@ -35,7 +35,16 @@ const trackMeasureMenuAction = (
   onComplete,
   name: string
 ) => {
-  const hide = Message.success({ msg: "请选择一个位置单击，确定基准线的起点" })
+  let hide
+  const startTip = () => {
+    hide && hide()
+    hide = Message.success({ msg: "请选择一个位置单击，确定基准线的起点" })
+  }
+  const firstTip = () => {
+    hide && hide()
+    hide = Message.success({ msg: "再选择一个位置单击，确定基准线的终点" })
+  }
+  startTip()
   customMap.magnifier = true
   const onAddMeasure = (data: MeasureAtom) => {
     data.id = getId();
@@ -43,17 +52,21 @@ const trackMeasureMenuAction = (
       onAddStore(data)
       onComplete()
     }
-    hide()
+    if (menu.continued) {
+      startTip()
+    }
   }
 
+
   if (menu.continued) {
-    continuedMeasure(measureType as any, onAddMeasure)
+    continuedMeasure(measureType as any, onAddMeasure, firstTip)
   } else {
-    startMeasure(measureType as any).then(onAddMeasure)
+    startMeasure(measureType as any, firstTip).then(onAddMeasure)
   }
 
   return () => {
     stopMeasure()
+    hide()
   }
 }