diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
index e1cfba7..439dfef 100644
Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 6d4ccec..3da9987 100644
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -142,8 +142,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "524"
-            endingLineNumber = "524"
+            startingLineNumber = "526"
+            endingLineNumber = "526"
             landmarkName = "dd_mapView(_:didAnnotationViewTapped:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1294,8 +1294,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "818"
-            endingLineNumber = "818"
+            startingLineNumber = "825"
+            endingLineNumber = "825"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1518,8 +1518,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "261"
-            endingLineNumber = "261"
+            startingLineNumber = "264"
+            endingLineNumber = "264"
             landmarkName = "addAction()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1630,8 +1630,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "297"
-            endingLineNumber = "297"
+            startingLineNumber = "300"
+            endingLineNumber = "300"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1646,8 +1646,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "273"
-            endingLineNumber = "273"
+            startingLineNumber = "276"
+            endingLineNumber = "276"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1662,8 +1662,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "497"
-            endingLineNumber = "497"
+            startingLineNumber = "504"
+            endingLineNumber = "504"
             landmarkName = "reloadData(index:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1678,8 +1678,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "494"
-            endingLineNumber = "494"
+            startingLineNumber = "501"
+            endingLineNumber = "501"
             landmarkName = "reloadData(index:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1694,8 +1694,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "498"
-            endingLineNumber = "498"
+            startingLineNumber = "505"
+            endingLineNumber = "505"
             landmarkName = "reloadData(index:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2478,8 +2478,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "325"
-            endingLineNumber = "325"
+            startingLineNumber = "332"
+            endingLineNumber = "332"
             landmarkName = "dd_mapView(_:didAnnotationViewTapped:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3102,8 +3102,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "865"
-            endingLineNumber = "865"
+            startingLineNumber = "872"
+            endingLineNumber = "872"
             landmarkName = "addSubviews()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3118,8 +3118,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "378"
-            endingLineNumber = "378"
+            startingLineNumber = "385"
+            endingLineNumber = "385"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3134,8 +3134,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "559"
-            endingLineNumber = "559"
+            startingLineNumber = "566"
+            endingLineNumber = "566"
             landmarkName = "selectVehicle(selectState:vehicleModel:currentTableViewVehicleModels:selectIndex:mapView:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3150,8 +3150,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "429"
-            endingLineNumber = "429"
+            startingLineNumber = "436"
+            endingLineNumber = "436"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3166,8 +3166,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "406"
-            endingLineNumber = "406"
+            startingLineNumber = "413"
+            endingLineNumber = "413"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3182,8 +3182,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "435"
-            endingLineNumber = "435"
+            startingLineNumber = "442"
+            endingLineNumber = "442"
             landmarkName = "categoryView(_:didSelectedItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3198,8 +3198,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "443"
-            endingLineNumber = "443"
+            startingLineNumber = "450"
+            endingLineNumber = "450"
             landmarkName = "categoryView(_:didSelectedItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3214,8 +3214,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "930"
-            endingLineNumber = "930"
+            startingLineNumber = "937"
+            endingLineNumber = "937"
             landmarkName = "viewSafeAreaInsetsDidChange()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3294,8 +3294,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1340"
-            endingLineNumber = "1340"
+            startingLineNumber = "1347"
+            endingLineNumber = "1347"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3310,8 +3310,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1352"
-            endingLineNumber = "1352"
+            startingLineNumber = "1359"
+            endingLineNumber = "1359"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3326,8 +3326,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1354"
-            endingLineNumber = "1354"
+            startingLineNumber = "1361"
+            endingLineNumber = "1361"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3374,8 +3374,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1169"
-            endingLineNumber = "1169"
+            startingLineNumber = "1176"
+            endingLineNumber = "1176"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3406,8 +3406,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1343"
-            endingLineNumber = "1343"
+            startingLineNumber = "1350"
+            endingLineNumber = "1350"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3422,8 +3422,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1356"
-            endingLineNumber = "1356"
+            startingLineNumber = "1363"
+            endingLineNumber = "1363"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3438,8 +3438,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1182"
-            endingLineNumber = "1182"
+            startingLineNumber = "1189"
+            endingLineNumber = "1189"
             landmarkName = "categoryView(_:didSelectedItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3454,8 +3454,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1355"
-            endingLineNumber = "1355"
+            startingLineNumber = "1362"
+            endingLineNumber = "1362"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3470,8 +3470,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "436"
-            endingLineNumber = "436"
+            startingLineNumber = "443"
+            endingLineNumber = "443"
             landmarkName = "categoryView(_:didSelectedItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3486,8 +3486,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "682"
-            endingLineNumber = "682"
+            startingLineNumber = "689"
+            endingLineNumber = "689"
             landmarkName = "showListDetail(vehicleModel:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3534,8 +3534,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "910"
-            endingLineNumber = "910"
+            startingLineNumber = "917"
+            endingLineNumber = "917"
             landmarkName = "viewSafeAreaInsetsDidChange()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3550,8 +3550,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "916"
-            endingLineNumber = "916"
+            startingLineNumber = "923"
+            endingLineNumber = "923"
             landmarkName = "viewSafeAreaInsetsDidChange()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3566,8 +3566,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "922"
-            endingLineNumber = "922"
+            startingLineNumber = "929"
+            endingLineNumber = "929"
             landmarkName = "viewSafeAreaInsetsDidChange()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3646,8 +3646,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1495"
-            endingLineNumber = "1495"
+            startingLineNumber = "1502"
+            endingLineNumber = "1502"
             landmarkName = "listView()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3678,8 +3678,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "408"
-            endingLineNumber = "408"
+            startingLineNumber = "415"
+            endingLineNumber = "415"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3694,8 +3694,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "425"
-            endingLineNumber = "425"
+            startingLineNumber = "432"
+            endingLineNumber = "432"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3726,10 +3726,10 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "944"
-            endingLineNumber = "944"
-            landmarkName = "viewDidAppear(_:)"
-            landmarkType = "7">
+            startingLineNumber = "951"
+            endingLineNumber = "951"
+            landmarkName = "VehicleMonitoringController"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -4110,8 +4110,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "544"
-            endingLineNumber = "544"
+            startingLineNumber = "546"
+            endingLineNumber = "546"
             landmarkName = "dd_mapView(_:mapDidZoomByUser:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4126,8 +4126,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "534"
-            endingLineNumber = "534"
+            startingLineNumber = "536"
+            endingLineNumber = "536"
             landmarkName = "dd_mapView(_:mapDidZoomByUser:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4222,8 +4222,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "335"
-            endingLineNumber = "335"
+            startingLineNumber = "337"
+            endingLineNumber = "337"
             landmarkName = "modifyMapAnchor()"
             landmarkType = "7">
          </BreakpointContent>
@@ -4238,8 +4238,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "439"
-            endingLineNumber = "439"
+            startingLineNumber = "441"
+            endingLineNumber = "441"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4254,8 +4254,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "460"
-            endingLineNumber = "460"
+            startingLineNumber = "462"
+            endingLineNumber = "462"
             landmarkName = "tableView(_:didSelectRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4270,8 +4270,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "699"
-            endingLineNumber = "699"
+            startingLineNumber = "701"
+            endingLineNumber = "701"
             landmarkName = "init(style:reuseIdentifier:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4334,8 +4334,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "674"
-            endingLineNumber = "674"
+            startingLineNumber = "681"
+            endingLineNumber = "681"
             landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4350,8 +4350,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "594"
-            endingLineNumber = "594"
+            startingLineNumber = "601"
+            endingLineNumber = "601"
             landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4782,8 +4782,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "215"
-            endingLineNumber = "215"
+            startingLineNumber = "218"
+            endingLineNumber = "218"
             landmarkName = "addAction()"
             landmarkType = "7">
          </BreakpointContent>
@@ -4798,8 +4798,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "307"
-            endingLineNumber = "307"
+            startingLineNumber = "310"
+            endingLineNumber = "310"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4814,8 +4814,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "309"
-            endingLineNumber = "309"
+            startingLineNumber = "312"
+            endingLineNumber = "312"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4830,8 +4830,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "313"
-            endingLineNumber = "313"
+            startingLineNumber = "316"
+            endingLineNumber = "316"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4846,8 +4846,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "303"
-            endingLineNumber = "303"
+            startingLineNumber = "306"
+            endingLineNumber = "306"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4862,8 +4862,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "293"
-            endingLineNumber = "293"
+            startingLineNumber = "296"
+            endingLineNumber = "296"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4878,8 +4878,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "462"
-            endingLineNumber = "462"
+            startingLineNumber = "464"
+            endingLineNumber = "464"
             landmarkName = "tableView(_:didSelectRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
diff --git a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift
index ae4a810..4752079 100644
--- a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift
+++ b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift
@@ -302,12 +302,14 @@ extension DispatchOrderController {
         incidentCoordiAnnotation.dd_image = UIImage(named: "vehichleMonitoring_start_32")
         incidentCoordiAnnotation.coordinate = incidentCoordi
         incidentCoordiAnnotation.annotationClass = VehicleMonitoringIncidentLocationAnnotationView.self
+        incidentCoordiAnnotation.tag = -1
         dispatchOrderView.maMapView.maMapView.addAnnotation(incidentCoordiAnnotation)
         if let destCoordi {
             let destCoordiAnnotation = MAPointAnnotation()
             destCoordiAnnotation.dd_image = UIImage(named: "vehichleMonitoring_terminal_32")
             destCoordiAnnotation.coordinate = destCoordi
             destCoordiAnnotation.annotationClass = VehicleMonitoringIncidentLocationAnnotationView.self
+            destCoordiAnnotation.tag = -2
             dispatchOrderView.maMapView.maMapView.addAnnotation(destCoordiAnnotation)
         }
     }
diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
index 054beb4..41a6e8e 100644
--- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
+++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
@@ -207,18 +207,21 @@ extension VehicleMonitoringController {
             .disposed(by: disposeBag)
         
         vehicleMonitoringListDetailView.showIncidentLocationHandler = {[weak self] incidentCoordi,destCoordi in
+            /// 先隐藏
+            self?.hideIncidentLocation()
+            
             let incidentCoordiAnnotation = MAPointAnnotation()
             incidentCoordiAnnotation.dd_image = UIImage(named: "vehichleMonitoring_start_32")
             incidentCoordiAnnotation.coordinate = incidentCoordi
-//            incidentCoordiAnnotation.tag = -1
             incidentCoordiAnnotation.annotationClass = VehicleMonitoringIncidentLocationAnnotationView.self
+            incidentCoordiAnnotation.tag = -1
             self?.vehicleMonitoringView.maMapView.maMapView.addAnnotation(incidentCoordiAnnotation)
             if let destCoordi {
                 let destCoordiAnnotation = MAPointAnnotation()
                 destCoordiAnnotation.dd_image = UIImage(named: "vehichleMonitoring_terminal_32")
                 destCoordiAnnotation.coordinate = destCoordi
-//                destCoordiAnnotation.tag = -2
                 destCoordiAnnotation.annotationClass = VehicleMonitoringIncidentLocationAnnotationView.self
+                destCoordiAnnotation.tag = -2
                 self?.vehicleMonitoringView.maMapView.maMapView.addAnnotation(destCoordiAnnotation)
             }
         }
@@ -321,6 +324,10 @@ extension VehicleMonitoringController : DDMAMapViewDelegate {
     }
     
     public func dd_mapView(_ mapView: MAMapView, didAnnotationViewTapped view: MAAnnotationView) {
+        if view.isKind(of: VehicleMonitoringPointAnnotation.self) != true {
+            return
+        }
+        
         zIndex += 1
         view.zIndex = zIndex
         
diff --git a/fastlane/report.xml b/fastlane/report.xml
index 8baa222..54918a7 100644
--- a/fastlane/report.xml
+++ b/fastlane/report.xml
@@ -5,17 +5,17 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000181">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000165">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: gym" time="94.357014">
+      <testcase classname="fastlane.lanes" name="1: gym" time="84.998383">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: pgyer" time="17.446821">
+      <testcase classname="fastlane.lanes" name="2: pgyer" time="26.42862">
         
       </testcase>