update

2023-08-31 13:27:55 +08:00
parent 3349aaa0cd
commit 3fc94fcee1
16 changed files with 426 additions and 71 deletions
--- a/OrderScheduling.xcodeproj/project.pbxproj
+++ b/OrderScheduling.xcodeproj/project.pbxproj
@@ -1153,7 +1153,13 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = OrderScheduling/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "中道供应商";
+				INFOPLIST_KEY_LSApplicationCategoryType = "";
 				INFOPLIST_KEY_NSCameraUsageDescription = "补充工单照片需要访问您的相机";
+				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "车辆监控功能需要在您使用App期间获取您的定位";
+				INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "车辆监控功能需要在您使用App期间获取您的定位";
+				INFOPLIST_KEY_NSLocationTemporaryUsageDescriptionDictionary = "";
+				INFOPLIST_KEY_NSLocationUsageDescription = "车辆监控功能需要在您使用App期间获取您的定位";
+				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "车辆监控功能需要在您使用App期间获取您的定位";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "补充工单照片需要访问您的麦克风";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "补充工单照片需要访问您的相册";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "补充工单照片需要访问您的相册";
@@ -1200,7 +1206,13 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = OrderScheduling/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "中道供应商";
+				INFOPLIST_KEY_LSApplicationCategoryType = "";
 				INFOPLIST_KEY_NSCameraUsageDescription = "补充工单照片需要访问您的相机";
+				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "车辆监控功能需要在您使用App期间获取您的定位";
+				INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "车辆监控功能需要在您使用App期间获取您的定位";
+				INFOPLIST_KEY_NSLocationTemporaryUsageDescriptionDictionary = "";
+				INFOPLIST_KEY_NSLocationUsageDescription = "车辆监控功能需要在您使用App期间获取您的定位";
+				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "车辆监控功能需要在您使用App期间获取您的定位";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "补充工单照片需要访问您的麦克风";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "补充工单照片需要访问您的相册";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "补充工单照片需要访问您的相册";
@@ -1240,6 +1252,11 @@
 				INFOPLIST_FILE = OrderSchedulingNotificationService/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = OrderSchedulingNotificationService;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
+				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "";
+				INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "";
+				INFOPLIST_KEY_NSLocationTemporaryUsageDescriptionDictionary = "";
+				INFOPLIST_KEY_NSLocationUsageDescription = "";
+				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1271,6 +1288,10 @@
 				INFOPLIST_FILE = OrderSchedulingNotificationService/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = OrderSchedulingNotificationService;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
+				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "";
+				INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "";
+				INFOPLIST_KEY_NSLocationUsageDescription = "";
+				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -317,8 +317,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "570"
-            endingLineNumber = "570"
+            startingLineNumber = "568"
+            endingLineNumber = "568"
            landmarkName = "tableView(_:cellForRowAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -507,8 +507,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "812"
-            endingLineNumber = "812"
+            startingLineNumber = "810"
+            endingLineNumber = "810"
            landmarkName = "collectionView(_:cellForItemAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -682,8 +682,8 @@
            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "309"
-            endingLineNumber = "309"
+            startingLineNumber = "306"
+            endingLineNumber = "306"
            landmarkName = "dd_mapView(_:viewFor:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -698,8 +698,8 @@
            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "287"
-            endingLineNumber = "287"
+            startingLineNumber = "284"
+            endingLineNumber = "284"
            landmarkName = "dd_mapView(_:viewFor:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -714,8 +714,8 @@
            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "289"
-            endingLineNumber = "289"
+            startingLineNumber = "286"
+            endingLineNumber = "286"
            landmarkName = "dd_mapView(_:viewFor:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -730,8 +730,8 @@
            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "315"
-            endingLineNumber = "315"
+            startingLineNumber = "312"
+            endingLineNumber = "312"
            landmarkName = "dd_mapView(_:viewFor:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -746,8 +746,8 @@
            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "314"
-            endingLineNumber = "314"
+            startingLineNumber = "311"
+            endingLineNumber = "311"
            landmarkName = "dd_mapView(_:viewFor:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -1381,8 +1381,8 @@
            filePath = "OrderScheduling/Main/AppDelegate.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "133"
-            endingLineNumber = "133"
+            startingLineNumber = "134"
+            endingLineNumber = "134"
            landmarkName = "jpushNotificationAuthorization(_:withInfo:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -1397,8 +1397,8 @@
            filePath = "OrderScheduling/Main/AppDelegate.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "124"
-            endingLineNumber = "124"
+            startingLineNumber = "125"
+            endingLineNumber = "125"
            landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -1589,10 +1589,10 @@
            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "227"
-            endingLineNumber = "227"
-            landmarkName = "reloadData()"
-            landmarkType = "7">
+            startingLineNumber = "234"
+            endingLineNumber = "234"
+            landmarkName = "ReviewFailedController"
+            landmarkType = "3">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
@@ -1653,8 +1653,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "237"
-            endingLineNumber = "237"
+            startingLineNumber = "235"
+            endingLineNumber = "235"
            landmarkName = "entry(model:remarkId:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -2048,8 +2048,8 @@
            filePath = "OrderScheduling/Main/AppDelegate.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "126"
-            endingLineNumber = "126"
+            startingLineNumber = "127"
+            endingLineNumber = "127"
            landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -2509,8 +2509,8 @@
            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "557"
-            endingLineNumber = "557"
+            startingLineNumber = "560"
+            endingLineNumber = "560"
            landmarkName = "viewDidAppear(_:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -2557,8 +2557,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "823"
-            endingLineNumber = "823"
+            startingLineNumber = "821"
+            endingLineNumber = "821"
            landmarkName = "collectionView(_:didSelectItemAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -2917,8 +2917,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "312"
-            endingLineNumber = "312"
+            startingLineNumber = "310"
+            endingLineNumber = "310"
            landmarkName = "addActions()"
            landmarkType = "7">
         </BreakpointContent>
@@ -2933,8 +2933,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "301"
-            endingLineNumber = "301"
+            startingLineNumber = "299"
+            endingLineNumber = "299"
            landmarkName = "addActions()"
            landmarkType = "7">
         </BreakpointContent>
@@ -2949,8 +2949,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "303"
-            endingLineNumber = "303"
+            startingLineNumber = "301"
+            endingLineNumber = "301"
            landmarkName = "addActions()"
            landmarkType = "7">
         </BreakpointContent>
@@ -3130,5 +3130,309 @@
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "7539997A-32B8-4061-B6BC-3F48B1A097DB"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "120"
+            endingLineNumber = "120"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "68FD7DCF-18F6-4D5B-8507-FB0C656FA414"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "81"
+            endingLineNumber = "81"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "9F475559-29AA-4078-89EA-A0614D1F0F3A"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/History/ViewController/HistoryController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "71"
+            endingLineNumber = "71"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "1BFBAAE7-E272-4007-B318-BB3E8D8DF8E3"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "178"
+            endingLineNumber = "178"
+            landmarkName = "addAction()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A526A02C-A2F6-4D45-B71F-4D636A538FB6"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/MainTabBarController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "49"
+            endingLineNumber = "49"
+            landmarkName = "tabBarController(_:didSelect:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "4807EF7D-CF2B-478E-8CE1-1B2BC41337DF"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Main/MainTabBarController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "50"
+            endingLineNumber = "50"
+            landmarkName = "tabBarController(_:didSelect:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "D01A5E43-9056-4A55-B14C-F518A7E7C0C0"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "233"
+            endingLineNumber = "233"
+            landmarkName = "reloadData()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "3641AE03-7DA7-4F69-AA4A-8ED200E8183A"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "232"
+            endingLineNumber = "232"
+            landmarkName = "reloadData()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "9329FC1A-C85E-4825-A2C1-ECF909B8A697"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "188"
+            endingLineNumber = "188"
+            landmarkName = "viewDidLoad()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "ABAE83CA-4E19-46B9-A6F8-7E6ECF8773D2"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "182"
+            endingLineNumber = "182"
+            landmarkName = "viewDidLoad()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E6FB81A9-9BF5-4123-B338-BBFDBECFF0C9"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "318"
+            endingLineNumber = "318"
+            landmarkName = "dd_mapView(_:viewFor:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "E6FB81A9-9BF5-4123-B338-BBFDBECFF0C9 - d438f33cff2a22ac"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.VehicleMonitoringController.dd_mapView(_: __C.MAMapView, viewFor: __C.MAAnnotation) -&gt; __C.MAAnnotationView"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "318"
+                  endingLineNumber = "318"
+                  offsetFromSymbolStart = "21409">
+               </Location>
+               <Location
+                  uuid = "E6FB81A9-9BF5-4123-B338-BBFDBECFF0C9 - d438f33cff2a22ac"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.VehicleMonitoringController.dd_mapView(_: __C.MAMapView, viewFor: __C.MAAnnotation) -&gt; __C.MAAnnotationView"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "318"
+                  endingLineNumber = "318"
+                  offsetFromSymbolStart = "17944">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "6B35D3A1-3729-43F7-93B8-F7A5E6052E97"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "190"
+            endingLineNumber = "190"
+            landmarkName = "dd_mapView(_:viewFor:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "6B35D3A1-3729-43F7-93B8-F7A5E6052E97 - d438f33cff2a122c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.VehicleMonitoringController.dd_mapView(_: __C.MAMapView, viewFor: __C.MAAnnotation) -&gt; __C.MAAnnotationView"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "190"
+                  endingLineNumber = "190"
+                  offsetFromSymbolStart = "435">
+               </Location>
+               <Location
+                  uuid = "6B35D3A1-3729-43F7-93B8-F7A5E6052E97 - d438f33cff2a122c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.VehicleMonitoringController.dd_mapView(_: __C.MAMapView, viewFor: __C.MAAnnotation) -&gt; __C.MAAnnotationView"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "190"
+                  endingLineNumber = "190"
+                  offsetFromSymbolStart = "348">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "D10CAC1E-9BD1-4293-A9F9-89FD9E335418"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "487"
+            endingLineNumber = "487"
+            landmarkName = "reloadData(index:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "10D088F4-C5A9-4931-AD5F-C82F49C3E246"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "485"
+            endingLineNumber = "485"
+            landmarkName = "reloadData(index:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "23297DBA-5BF4-4ABF-8D42-1ACC6970C462"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "488"
+            endingLineNumber = "488"
+            landmarkName = "reloadData(index:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
   </Breakpoints>
 </Bucket>
--- a/OrderScheduling/Common/View/MessageCount.swift
+++ b/OrderScheduling/Common/View/MessageCount.swift
@@ -20,7 +20,7 @@ open class MessageCount : NSObject {
    
    public override init() {
        super.init()
-        NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil, queue: .main) {[weak self] note in
+        NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: Notification_reloadRescusControllerToDoMessageCount), object: nil, queue: .main) {[weak self] note in
            self?.reloadToDoMessageCountRelay.accept(nil)
        }
    
@@ -43,4 +43,8 @@ open class MessageCount : NSObject {
            })
            .disposed(by: disposeBag)
    }
+    
+    func newestMessage() {
+        NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControllerToDoMessageCount), object: nil)
+    }
 }
--- a/OrderScheduling/Common/WebView/WebViewTool.swift
+++ b/OrderScheduling/Common/WebView/WebViewTool.swift
@@ -74,7 +74,7 @@ open class WebViewTool : NSObject {
        case .todoList:
            vc = WebViewController(title: WebViewNameEnum.todoList.rawValue, url: "\((h5Models?.todoList)!)?token=\((USER.token)!)")
            vc?.disappearHandler = {
-                NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+                MCOUNT.newestMessage()
            }
            break
        case .workOrderReconciliation:
--- a/OrderScheduling/Global/User/UserData.swift
+++ b/OrderScheduling/Global/User/UserData.swift
@@ -55,7 +55,7 @@ open class UserData {
        UserDefaults.standard.set(token, forKey: refresh_token_key)
    }
    
-    // 不需要记录
+    // 不需要记录,1是子公司，2是服务商
    public var supplierType : Int? {
        return UserDefaults.standard.object(forKey: supplierType_key) as? Int
    }
--- a/OrderScheduling/History/ViewController/HistoryController.swift
+++ b/OrderScheduling/History/ViewController/HistoryController.swift
@@ -68,7 +68,7 @@ extension HistoryController {
        preRefreshRelay
            .observe(on: MainScheduler.instance)
            .subscribe(onNext: {[weak self] _ in
-                NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+                MCOUNT.newestMessage()
                self?.categoryView.reloadData()
            })
            .disposed(by: disposeBag)
--- a/OrderScheduling/Info.plist
+++ b/OrderScheduling/Info.plist
@@ -11,6 +11,11 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+    <key>NSLocationTemporaryUsageDescriptionDictionary</key>
+    <dict>
+        <key>FORCE_FULL_ACCURACY</key>
+        <string>车辆监控功能必须要获取您的精准定位才能提供服务</string>
+    </dict>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
--- a/OrderScheduling/Main/AppDelegate.swift
+++ b/OrderScheduling/Main/AppDelegate.swift
@@ -111,6 +111,7 @@ extension AppDelegate : JPUSHRegisterDelegate {
                    TOOL.playVoiceWith(userInfo: userInfo)
                }
            }else{
+                MCOUNT.newestMessage()
                completionHandler(1 << 1 | 1 << 2)
            }
        }
--- a/OrderScheduling/Main/SceneDelegate.swift
+++ b/OrderScheduling/Main/SceneDelegate.swift
@@ -41,6 +41,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
        TOOL.dealWithOrderPushNotification { userInfo in
            TOOL.playAlertWith(userInfo: userInfo)
        }
+        // app激活就要获取最新消息个数
+        MCOUNT.newestMessage()
    }

    func sceneWillResignActive(_ scene: UIScene) {
--- a/OrderScheduling/MessageCenter/ViewController/MessageCenterTool.swift
+++ b/OrderScheduling/MessageCenter/ViewController/MessageCenterTool.swift
@@ -15,7 +15,7 @@ open class MessageCenterTool : NSObject  {
    func openMessageCenter(by nav:UINavigationController?) {
        let vc = MessageCenterController()
        vc.disappearHandler = {
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+            MCOUNT.newestMessage()
        }
        nav?.pushViewController(vc, animated: true)
    }
--- a/OrderScheduling/Rescue/ViewController/RescueController.swift
+++ b/OrderScheduling/Rescue/ViewController/RescueController.swift
@@ -74,13 +74,11 @@ extension RescueController {
                .disposed(by: disposeBag)
        }
        
-        NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
-        
        // 点击tabBar 需要刷下下列
        preRefreshRelay
            .observe(on: MainScheduler.instance)
            .subscribe(onNext: {[weak self] _ in
-                NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+                MCOUNT.newestMessage()
                self?.categoryView.reloadData()
            })
            .disposed(by: disposeBag)
--- a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift
+++ b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift
@@ -117,7 +117,7 @@ extension ReviewFailedController {
        preRefreshRelay
            .observe(on: MainScheduler.instance)
            .subscribe(onNext: {[weak self] _ in
-                NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+                MCOUNT.newestMessage()
                self?.reviewFailedView.tableView.mj_header?.beginRefreshing()
            })
            .disposed(by: disposeBag)
@@ -140,12 +140,19 @@ extension ReviewFailedController : UITableViewDelegate,UITableViewDataSource {
            cell = ReviewFailedCell(style: .default, reuseIdentifier: "cell")
        }
        let model = resultArr[indexPath.row]
+        cell!.orderStatusTitleLabel.text = "状态:"
+        cell!.orderStatusLabel.text = model.taskOrderStatusString
        cell!.descLabel.text = "不通过原因:" + (model.auditFailReason ?? "")
        cell!.typeLabel.text = model.taskServiceName
-        cell!.stateLabel.text = model.taskOrderStatusString
        cell!.orderNumLabel.text = model.orderCode
        cell!.dateLabel.text = model.createTime
        
+        if model.taskOrderStatusString == "任务完成" {
+            cell?.orderStatusLabel.textColor = .hex("09B820")
+        }else{
+            cell?.orderStatusLabel.textColor = .hex("E64C0B")
+        }
+        
        cell!.additionalButton.rx.tap
            .observe(on: MainScheduler.instance)
            .subscribe(onNext: {[weak self] _ in
@@ -250,7 +257,8 @@ open class ReviewFailedCell : DDTableViewCell {
    public let radiusView : DDView
    public let typeLabel : DDLabel
    public let orderNumLabel : DDLabel
-    public let stateLabel : DDLabel
+    public let orderStatusTitleLabel : DDLabel
+    public let orderStatusLabel : DDLabel
    public let descLabel : DDLabel
    public let dateLabel : DDLabel
    public let additionalButton : DDButton
@@ -270,7 +278,8 @@ open class ReviewFailedCell : DDTableViewCell {
        radiusView = DDView()
        typeLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(14)), textColor: .hex("000000").alpha(0.85))
        orderNumLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.55))
-        stateLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("09B820"))
+        orderStatusTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.5))
+        orderStatusLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("E69B0B"))
        descLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(13)), textColor: .hex("FF8F37"))
        dateLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("000000").alpha(0.55))
        additionalButton = DDButton.dd_initCustom()
@@ -288,7 +297,9 @@ open class ReviewFailedCell : DDTableViewCell {
        contentView.addSubview(radiusView)
        radiusView.addSubview(typeLabel)
        radiusView.addSubview(orderNumLabel)
-        radiusView.addSubview(stateLabel)
+        radiusView.addSubview(orderStatusTitleLabel)
+        orderStatusLabel.numberOfLines = 0
+        radiusView.addSubview(orderStatusLabel)
        descLabel.numberOfLines = 0
        radiusView.addSubview(descLabel)
        radiusView.addSubview(dateLabel)
@@ -316,15 +327,21 @@ open class ReviewFailedCell : DDTableViewCell {
            make.centerY.equalTo(typeLabel)
        }
        
-        stateLabel.snp.makeConstraints { make in
-            make.right.equalTo(-auto(10))
-            make.centerY.equalTo(typeLabel)
+        orderStatusTitleLabel.snp.makeConstraints { make in
+            make.left.equalTo(typeLabel)
+            make.top.equalTo(orderNumLabel.snp.bottom).offset(auto(10))
+        }
+        
+        orderStatusLabel.snp.makeConstraints { make in
+            make.height.equalTo(orderStatusTitleLabel)
+            make.top.equalTo(orderStatusTitleLabel)
+            make.left.equalTo(orderStatusTitleLabel.snp.right).offset(auto(10))
        }

        descLabel.snp.makeConstraints { make in
-            make.top.equalTo(typeLabel.snp.bottom).offset(auto(10))
+            make.top.equalTo(orderStatusTitleLabel.snp.bottom).offset(auto(10))
            make.left.equalTo(typeLabel)
-            make.right.equalTo(stateLabel)
+            make.right.equalTo(-auto(20))
        }
        
        dateLabel.snp.makeConstraints { make in
@@ -334,7 +351,7 @@ open class ReviewFailedCell : DDTableViewCell {
        }
        
        additionalButton.snp.makeConstraints { make in
-            make.right.equalTo(stateLabel)
+            make.right.equalTo(-auto(20))
            make.centerY.equalTo(dateLabel)
            make.width.equalTo(auto(50))
            make.height.equalTo(auto(20))
--- a/OrderScheduling/Strings/NotificationStrings.swift
+++ b/OrderScheduling/Strings/NotificationStrings.swift
@@ -15,4 +15,4 @@ public let Notification_dispatchOrderSuccessReloadIsRescuingController = "Notifi

 public let Notification_dispatchOrderSuccessReloadPendingDispatchController = "Notification_dispatchOrderSuccessReloadPendingDispatchController"

-public let Notification_reloadRescusControolerToDoMessageCount = "Notification_reloadRescusControolerToDoMessageCount"
+public let Notification_reloadRescusControllerToDoMessageCount = "Notification_reloadRescusControllerToDoMessageCount"
--- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
+++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
@@ -82,7 +82,7 @@ extension VehicleMonitoringController {
                    let leisureCount = String(response?.data?.vehicleMonitorCount.leisureCount ?? 0)+"\n"+"空闲"
                    let busyCount = String(response?.data?.vehicleMonitorCount.busyCount ?? 0)+"\n"+"忙碌"
                    let alarmCount = String(response?.data?.vehicleMonitorCount.alarmCount ?? 0)+"\n"+"报警"
-                    if USER.supplierType == 2 {
+                    if USER.supplierType == 1 {
                        self?.vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.titles = [roster,onLineCount,lostConnectionCount,leisureCount,busyCount]
                    }else{
                        self?.vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.titles = [onLineCount,lostConnectionCount,leisureCount,busyCount]
@@ -165,24 +165,21 @@ extension VehicleMonitoringController {
            })
            .disposed(by: disposeBag)
        
+        refreshButton.rx.tap
+             .subscribe(onNext: {[weak self] _ in
+                 self?.preRefreshRelay.accept(nil)
+             })
+             .disposed(by: disposeBag)
+                
        // 点击tabBar 需要刷下下列
        preRefreshRelay
            .observe(on: MainScheduler.instance)
            .subscribe(onNext: {[weak self] _ in
-                NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+                MCOUNT.newestMessage()
                self?.reloadRelay.accept(nil)
            })
            .disposed(by: disposeBag)
                
-       refreshButton.rx.tap
-            .subscribe(onNext: {[weak self] _ in
-                NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
-                self?.reloadRelay.accept(nil)
-            })
-            .disposed(by: disposeBag)
-                
-        NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
-        
    }
 }

@@ -347,7 +344,7 @@ extension VehicleMonitoringController : JXCategoryListContainerViewDelegate {
    public func listContainerView(_ listContainerView: JXCategoryListContainerView!, initListFor index: Int) -> JXCategoryListContentViewDelegate! {
        var vc : VehicleMonitoringListController?
        
-        if USER.supplierType == 2 {
+        if USER.supplierType == 1 {
            if index == 0 {
                vc = VehicleMonitoringListController(models: dataModel?.rosterList,isPaiban: true)
            }else if index == 1 {
@@ -442,7 +439,7 @@ extension VehicleMonitoringController : JXCategoryViewDelegate {
    }

    func reloadData(index:Int) {
-        if USER.supplierType == 2 {
+        if USER.supplierType == 1 {
            if index == 0 {
                mapModel = dataModel?.rosterList
            }else if index == 1 {
@@ -484,8 +481,11 @@ extension VehicleMonitoringController : JXCategoryViewDelegate {
            }
        }
        
-        if let annotations = vehicleMonitoringView.maMapView.maMapView.annotations {
+        if let annotations = vehicleMonitoringView.maMapView.maMapView.annotations, annotations.isEmpty == false {
            vehicleMonitoringView.maMapView.maMapView.showAnnotations(annotations, animated: true)
+        }else{
+            vehicleMonitoringView.maMapView.maMapView.setCenter(vehicleMonitoringView.maMapView.maMapView.userLocation.coordinate, animated: true)
+            vehicleMonitoringView.maMapView.maMapView.zoomLevel = 18
        }
    }
 }
@@ -528,6 +528,9 @@ open class VehicleMonitoringController : ZDViewController {
        }

        vehicleMonitoringView.maMapView.delegate = self
+        vehicleMonitoringView.maMapView.maMapView.showsUserLocation = true
+        vehicleMonitoringView.maMapView.maMapView.userTrackingMode = .follow
+        vehicleMonitoringView.maMapView.maMapView.customizeUserLocationAccuracyCircleRepresentation = true
        vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.delegate = self
        vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.listContainer = categoryContainerView
        
--- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift
+++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift
@@ -28,7 +28,7 @@ extension VehicleMonitoringListController : UITableViewDelegate,UITableViewDataS
        cell?.icon.isHidden = !(model.isSelected ?? false)
        cell?.indexLabel.text = String(indexPath.item + 1)+"."
        if isPaiban == true {
-            cell?.dateLabel.text = (model.rosterStartTime ?? "") + "\n~\n" + (model.rosterEndTime ?? "")
+            cell?.dateLabel.text = (model.rosterStartTime?.components(separatedBy: " ").last ?? "") + "\n~\n" + (model.rosterEndTime?.components(separatedBy: " ").last ?? "")
        }else{
            var status = model.vehicleStatus?.label ?? ""
            if model.onlineStatus?.code == .lostConnection {