diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 829f3b3..1315b7e 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 ba7997b..35536c7 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2029,8 +2029,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "705" - endingLineNumber = "705" + startingLineNumber = "706" + endingLineNumber = "706" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -2348,8 +2348,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "224" - endingLineNumber = "224" + startingLineNumber = "225" + endingLineNumber = "225" landmarkName = "addAction()" landmarkType = "7"> @@ -2460,8 +2460,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "260" - endingLineNumber = "260" + startingLineNumber = "261" + endingLineNumber = "261" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -2508,8 +2508,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "236" - endingLineNumber = "236" + startingLineNumber = "237" + endingLineNumber = "237" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -2556,8 +2556,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "431" - endingLineNumber = "431" + startingLineNumber = "432" + endingLineNumber = "432" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -2572,8 +2572,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "429" - endingLineNumber = "429" + startingLineNumber = "430" + endingLineNumber = "430" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -2588,8 +2588,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "432" - endingLineNumber = "432" + startingLineNumber = "433" + endingLineNumber = "433" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -3771,8 +3771,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "276" - endingLineNumber = "276" + startingLineNumber = "277" + endingLineNumber = "277" landmarkName = "dd_mapView(_:didAnnotationViewTapped:)" landmarkType = "7"> @@ -4839,8 +4839,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "748" - endingLineNumber = "748" + startingLineNumber = "749" + endingLineNumber = "749" landmarkName = "addSubviews()" landmarkType = "7"> @@ -4855,8 +4855,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "320" - endingLineNumber = "320" + startingLineNumber = "321" + endingLineNumber = "321" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -4871,8 +4871,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "493" - endingLineNumber = "493" + startingLineNumber = "494" + endingLineNumber = "494" landmarkName = "selectVehicle(vehicleModel:currentTableViewVehicleModels:selectIndex:mapView:)" landmarkType = "7"> @@ -4887,8 +4887,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "361" - endingLineNumber = "361" + startingLineNumber = "362" + endingLineNumber = "362" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -4903,8 +4903,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "348" - endingLineNumber = "348" + startingLineNumber = "349" + endingLineNumber = "349" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -4951,8 +4951,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "367" - endingLineNumber = "367" + startingLineNumber = "368" + endingLineNumber = "368" landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkType = "7"> @@ -4999,8 +4999,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "378" - endingLineNumber = "378" + startingLineNumber = "379" + endingLineNumber = "379" landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkType = "7"> @@ -5015,8 +5015,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "813" - endingLineNumber = "813" + startingLineNumber = "814" + endingLineNumber = "814" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5095,8 +5095,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1218" - endingLineNumber = "1218" + startingLineNumber = "1219" + endingLineNumber = "1219" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5143,8 +5143,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1230" - endingLineNumber = "1230" + startingLineNumber = "1231" + endingLineNumber = "1231" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5191,8 +5191,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1232" - endingLineNumber = "1232" + startingLineNumber = "1233" + endingLineNumber = "1233" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5286,8 +5286,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1059" - endingLineNumber = "1059" + startingLineNumber = "1060" + endingLineNumber = "1060" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -5302,8 +5302,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1360" - endingLineNumber = "1360" + startingLineNumber = "1361" + endingLineNumber = "1361" landmarkName = "updateData(taskModel:)" landmarkType = "7"> @@ -5334,8 +5334,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1221" - endingLineNumber = "1221" + startingLineNumber = "1222" + endingLineNumber = "1222" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5350,44 +5350,44 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" + startingLineNumber = "1235" + endingLineNumber = "1235" + landmarkName = "init(taskModels:)" + landmarkType = "7"> + + + + + + + + - - - - - - - - @@ -5414,8 +5414,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "604" - endingLineNumber = "604" + startingLineNumber = "605" + endingLineNumber = "605" landmarkName = "showListDetail(vehicleModel:)" landmarkType = "7"> @@ -5430,8 +5430,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "146" - endingLineNumber = "146" + startingLineNumber = "147" + endingLineNumber = "147" landmarkName = "addAction()" landmarkType = "7"> @@ -5446,8 +5446,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "191" - endingLineNumber = "191" + startingLineNumber = "192" + endingLineNumber = "192" landmarkName = "addAction()" landmarkType = "7"> @@ -5462,8 +5462,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "793" - endingLineNumber = "793" + startingLineNumber = "794" + endingLineNumber = "794" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5478,8 +5478,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "799" - endingLineNumber = "799" + startingLineNumber = "800" + endingLineNumber = "800" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5494,8 +5494,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "805" - endingLineNumber = "805" + startingLineNumber = "806" + endingLineNumber = "806" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5574,8 +5574,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1366" - endingLineNumber = "1366" + startingLineNumber = "1367" + endingLineNumber = "1367" landmarkName = "listView()" landmarkType = "7"> diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index 26ac066..153ee1a 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -78,6 +78,7 @@ extension VehicleMonitoringController { self?.vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.counts = [rosterCount,onLineCount,lostConnectionCount,leisureCount,busyCount] }else{ self?.vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.titles = [onLineTitle,lostConnectionTitle,leisureTitle,busyTitle] + self?.vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.counts = [onLineCount,lostConnectionCount,leisureCount,busyCount] } /// 选中信息也要置空