dezhong/OrderScheduling
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

车辆监控默认显示地址优化

Browse Source
This commit is contained in:
ddisfriend
2025-03-25 16:17:15 +08:00
parent 95dfca83fa
commit a497e9981e
4 changed files with 109 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

192
OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@@ -1294,8 +1294,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "825" startingLineNumber = "840"
endingLineNumber = "825" endingLineNumber = "840"
landmarkName = "viewDidLoad()" landmarkName = "viewDidLoad()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1518,8 +1518,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "264" startingLineNumber = "276"
endingLineNumber = "264" endingLineNumber = "276"
landmarkName = "addAction()" landmarkName = "addAction()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1630,8 +1630,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "300" startingLineNumber = "312"
endingLineNumber = "300" endingLineNumber = "312"
landmarkName = "dd_mapView(_:viewFor:)" landmarkName = "dd_mapView(_:viewFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1646,28 +1646,12 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "276" startingLineNumber = "288"
endingLineNumber = "276" endingLineNumber = "288"
landmarkName = "dd_mapView(_:viewFor:)" landmarkName = "dd_mapView(_:viewFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </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 = "504"
endingLineNumber = "504"
landmarkName = "reloadData(index:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
@@ -1678,8 +1662,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "501" startingLineNumber = "513"
endingLineNumber = "501" endingLineNumber = "513"
landmarkName = "reloadData(index:)" landmarkName = "reloadData(index:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -1694,8 +1678,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "505" startingLineNumber = "518"
endingLineNumber = "505" endingLineNumber = "518"
landmarkName = "reloadData(index:)" landmarkName = "reloadData(index:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2478,8 +2462,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "332" startingLineNumber = "344"
endingLineNumber = "332" endingLineNumber = "344"
landmarkName = "dd_mapView(_:didAnnotationViewTapped:)" landmarkName = "dd_mapView(_:didAnnotationViewTapped:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3086,8 +3070,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "74" startingLineNumber = "86"
endingLineNumber = "74" endingLineNumber = "86"
landmarkName = "addAction()" landmarkName = "addAction()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3102,8 +3086,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "872" startingLineNumber = "887"
endingLineNumber = "872" endingLineNumber = "887"
landmarkName = "addSubviews()" landmarkName = "addSubviews()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3118,8 +3102,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "385" startingLineNumber = "397"
endingLineNumber = "385" endingLineNumber = "397"
landmarkName = "listContainerView(_:initListFor:)" landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3134,8 +3118,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "566" startingLineNumber = "579"
endingLineNumber = "566" endingLineNumber = "579"
landmarkName = "selectVehicle(selectState:vehicleModel:currentTableViewVehicleModels:selectIndex:mapView:)" landmarkName = "selectVehicle(selectState:vehicleModel:currentTableViewVehicleModels:selectIndex:mapView:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3150,8 +3134,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "436" startingLineNumber = "448"
endingLineNumber = "436" endingLineNumber = "448"
landmarkName = "listContainerView(_:initListFor:)" landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3166,8 +3150,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "413" startingLineNumber = "425"
endingLineNumber = "413" endingLineNumber = "425"
landmarkName = "listContainerView(_:initListFor:)" landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3182,8 +3166,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "442" startingLineNumber = "454"
endingLineNumber = "442" endingLineNumber = "454"
landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkName = "categoryView(_:didSelectedItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3198,8 +3182,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "450" startingLineNumber = "462"
endingLineNumber = "450" endingLineNumber = "462"
landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkName = "categoryView(_:didSelectedItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3214,8 +3198,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "937" startingLineNumber = "952"
endingLineNumber = "937" endingLineNumber = "952"
landmarkName = "viewSafeAreaInsetsDidChange()" landmarkName = "viewSafeAreaInsetsDidChange()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3294,8 +3278,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1347" startingLineNumber = "1362"
endingLineNumber = "1347" endingLineNumber = "1362"
landmarkName = "init(taskModels:)" landmarkName = "init(taskModels:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3310,8 +3294,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1359" startingLineNumber = "1374"
endingLineNumber = "1359" endingLineNumber = "1374"
landmarkName = "init(taskModels:)" landmarkName = "init(taskModels:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3326,8 +3310,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1361" startingLineNumber = "1376"
endingLineNumber = "1361" endingLineNumber = "1376"
landmarkName = "init(taskModels:)" landmarkName = "init(taskModels:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3374,8 +3358,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1176" startingLineNumber = "1191"
endingLineNumber = "1176" endingLineNumber = "1191"
landmarkName = "listContainerView(_:initListFor:)" landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3406,8 +3390,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1350" startingLineNumber = "1365"
endingLineNumber = "1350" endingLineNumber = "1365"
landmarkName = "init(taskModels:)" landmarkName = "init(taskModels:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3422,8 +3406,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1363" startingLineNumber = "1378"
endingLineNumber = "1363" endingLineNumber = "1378"
landmarkName = "init(taskModels:)" landmarkName = "init(taskModels:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3438,8 +3422,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1189" startingLineNumber = "1204"
endingLineNumber = "1189" endingLineNumber = "1204"
landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkName = "categoryView(_:didSelectedItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3454,8 +3438,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1362" startingLineNumber = "1377"
endingLineNumber = "1362" endingLineNumber = "1377"
landmarkName = "init(taskModels:)" landmarkName = "init(taskModels:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3470,8 +3454,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "443" startingLineNumber = "455"
endingLineNumber = "443" endingLineNumber = "455"
landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkName = "categoryView(_:didSelectedItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3486,8 +3470,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "689" startingLineNumber = "702"
endingLineNumber = "689" endingLineNumber = "702"
landmarkName = "showListDetail(vehicleModel:)" landmarkName = "showListDetail(vehicleModel:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3502,8 +3486,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "153" startingLineNumber = "165"
endingLineNumber = "153" endingLineNumber = "165"
landmarkName = "addAction()" landmarkName = "addAction()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3518,8 +3502,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "206" startingLineNumber = "218"
endingLineNumber = "206" endingLineNumber = "218"
landmarkName = "addAction()" landmarkName = "addAction()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3534,8 +3518,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "917" startingLineNumber = "932"
endingLineNumber = "917" endingLineNumber = "932"
landmarkName = "viewSafeAreaInsetsDidChange()" landmarkName = "viewSafeAreaInsetsDidChange()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3550,8 +3534,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "923" startingLineNumber = "938"
endingLineNumber = "923" endingLineNumber = "938"
landmarkName = "viewSafeAreaInsetsDidChange()" landmarkName = "viewSafeAreaInsetsDidChange()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3566,8 +3550,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "929" startingLineNumber = "944"
endingLineNumber = "929" endingLineNumber = "944"
landmarkName = "viewSafeAreaInsetsDidChange()" landmarkName = "viewSafeAreaInsetsDidChange()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3646,8 +3630,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1502" startingLineNumber = "1517"
endingLineNumber = "1502" endingLineNumber = "1517"
landmarkName = "listView()" landmarkName = "listView()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3678,8 +3662,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "415" startingLineNumber = "427"
endingLineNumber = "415" endingLineNumber = "427"
landmarkName = "listContainerView(_:initListFor:)" landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3694,8 +3678,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "432" startingLineNumber = "444"
endingLineNumber = "432" endingLineNumber = "444"
landmarkName = "listContainerView(_:initListFor:)" landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3726,10 +3710,10 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "951" startingLineNumber = "966"
endingLineNumber = "951" endingLineNumber = "966"
landmarkName = "VehicleMonitoringController" landmarkName = "viewDidAppear(_:)"
landmarkType = "3"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
@@ -4334,8 +4318,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "681" startingLineNumber = "694"
endingLineNumber = "681" endingLineNumber = "694"
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)" landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -4350,8 +4334,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "601" startingLineNumber = "614"
endingLineNumber = "601" endingLineNumber = "614"
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)" landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -4782,8 +4766,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "218" startingLineNumber = "230"
endingLineNumber = "218" endingLineNumber = "230"
landmarkName = "addAction()" landmarkName = "addAction()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -4798,8 +4782,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "310" startingLineNumber = "322"
endingLineNumber = "310" endingLineNumber = "322"
landmarkName = "dd_mapView(_:viewFor:)" landmarkName = "dd_mapView(_:viewFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -4814,8 +4798,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "312" startingLineNumber = "324"
endingLineNumber = "312" endingLineNumber = "324"
landmarkName = "dd_mapView(_:viewFor:)" landmarkName = "dd_mapView(_:viewFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -4830,8 +4814,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "316" startingLineNumber = "328"
endingLineNumber = "316" endingLineNumber = "328"
landmarkName = "dd_mapView(_:viewFor:)" landmarkName = "dd_mapView(_:viewFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -4846,8 +4830,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "306" startingLineNumber = "318"
endingLineNumber = "306" endingLineNumber = "318"
landmarkName = "dd_mapView(_:viewFor:)" landmarkName = "dd_mapView(_:viewFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -4862,8 +4846,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "296" startingLineNumber = "308"
endingLineNumber = "296" endingLineNumber = "308"
landmarkName = "dd_mapView(_:viewFor:)" landmarkName = "dd_mapView(_:viewFor:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>

2
OrderScheduling/HttpResponseModel/ResponseModel.swift
View File

@@ -244,6 +244,8 @@ public class GeneralInfoDataModel : Decodable {
var supplierName : String var supplierName : String
var vehicleCount : Int? var vehicleCount : Int?
var driverCount : Int? var driverCount : Int?
var addressLat : Double?
var addressLon : Double?
} }
public class DispatchAppH5UrlDataModel : Decodable { public class DispatchAppH5UrlDataModel : Decodable {

23
OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
View File

@@ -52,14 +52,26 @@ extension VehicleMonitoringController {
self?.view.dd_showHUD() self?.view.dd_showHUD()
}) })
.flatMapLatest { _ in .flatMapLatest { _ in
return RQ.vehicleMonitorList() return Single.zip(RQ.vehicleMonitorList(),RQ.generalInfo())
} }
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.do(onNext: {[weak self] _ in .do(onNext: {[weak self] _,_ in
self?.view.dd_hideHUD() self?.view.dd_hideHUD()
}) })
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] response in .subscribe(onNext: {[weak self] response,generalInfo in
if generalInfo?.success == true {
/// 如果list列表数量为0的话就显示当前位置
if let lat = generalInfo?.data?.addressLat,let lon = generalInfo?.data?.addressLon {
self?.defaultCoordinate = CLLocationCoordinate2D(latitude: lat, longitude: lon)
}else{
self?.defaultCoordinate = nil
}
}else{
self?.defaultCoordinate = nil
self?.view.dd_makeToast(response?.msg)
}
if response?.success == true { if response?.success == true {
self?.dataModel = response?.data self?.dataModel = response?.data
let rosterTitle = "排班" let rosterTitle = "排班"
@@ -501,7 +513,8 @@ extension VehicleMonitoringController : JXCategoryViewDelegate {
vehicleMonitoringView.maMapView.maMapView.showAnnotations(annotations, animated: true) vehicleMonitoringView.maMapView.maMapView.showAnnotations(annotations, animated: true)
modifyMapAnchor() modifyMapAnchor()
}else{ }else{
vehicleMonitoringView.maMapView.maMapView.setCenter(vehicleMonitoringView.maMapView.maMapView.userLocation.coordinate, animated: true) let coordinate = defaultCoordinate ?? vehicleMonitoringView.maMapView.maMapView.userLocation.coordinate
vehicleMonitoringView.maMapView.maMapView.setCenter(coordinate, animated: true)
vehicleMonitoringView.maMapView.maMapView.zoomLevel = 18 vehicleMonitoringView.maMapView.maMapView.zoomLevel = 18
} }
} }
@@ -807,6 +820,8 @@ open class VehicleMonitoringController : ZDViewController {
private var shouldShowSmallAnnotation : Bool? = false /// 用于标记是否需要显示最小的annotation private var shouldShowSmallAnnotation : Bool? = false /// 用于标记是否需要显示最小的annotation
private var isShowSmallAnnotation : Bool? = false /// 用于标记是否已经显示最小的annotation private var isShowSmallAnnotation : Bool? = false /// 用于标记是否已经显示最小的annotation
private var defaultCoordinate : CLLocationCoordinate2D? /// list为0默认展示该位置
private let messageTapGes = UITapGestureRecognizer() /// 消息按钮点击事件 private let messageTapGes = UITapGestureRecognizer() /// 消息按钮点击事件
private let messageView = MessageView() /// 消息按钮 private let messageView = MessageView() /// 消息按钮
public let refreshButton = DDButton.dd_initCustom() /// 刷新按钮 public let refreshButton = DDButton.dd_initCustom() /// 刷新按钮