diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 1315b7e..48b438b 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 35536c7..cd91563 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 = "706" - endingLineNumber = "706" + startingLineNumber = "707" + endingLineNumber = "707" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -2348,8 +2348,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "225" - endingLineNumber = "225" + startingLineNumber = "226" + endingLineNumber = "226" landmarkName = "addAction()" landmarkType = "7"> @@ -2460,8 +2460,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "261" - endingLineNumber = "261" + startingLineNumber = "262" + endingLineNumber = "262" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -2508,8 +2508,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "237" - endingLineNumber = "237" + startingLineNumber = "238" + endingLineNumber = "238" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -2556,8 +2556,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "432" - endingLineNumber = "432" + startingLineNumber = "433" + endingLineNumber = "433" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -2572,8 +2572,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "430" - endingLineNumber = "430" + startingLineNumber = "431" + endingLineNumber = "431" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -2588,8 +2588,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "433" - endingLineNumber = "433" + startingLineNumber = "434" + endingLineNumber = "434" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -3771,8 +3771,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "277" - endingLineNumber = "277" + startingLineNumber = "278" + endingLineNumber = "278" landmarkName = "dd_mapView(_:didAnnotationViewTapped:)" landmarkType = "7"> @@ -4823,8 +4823,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "74" - endingLineNumber = "74" + startingLineNumber = "75" + endingLineNumber = "75" landmarkName = "addAction()" landmarkType = "7"> @@ -4839,8 +4839,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "749" - endingLineNumber = "749" + startingLineNumber = "750" + endingLineNumber = "750" landmarkName = "addSubviews()" landmarkType = "7"> @@ -4855,8 +4855,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "321" - endingLineNumber = "321" + startingLineNumber = "322" + endingLineNumber = "322" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -4871,8 +4871,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "494" - endingLineNumber = "494" + startingLineNumber = "495" + endingLineNumber = "495" landmarkName = "selectVehicle(vehicleModel:currentTableViewVehicleModels:selectIndex:mapView:)" landmarkType = "7"> @@ -4887,8 +4887,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "362" - endingLineNumber = "362" + startingLineNumber = "363" + endingLineNumber = "363" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -4903,8 +4903,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "349" - endingLineNumber = "349" + startingLineNumber = "350" + endingLineNumber = "350" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -4951,8 +4951,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "368" - endingLineNumber = "368" + startingLineNumber = "369" + endingLineNumber = "369" landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkType = "7"> @@ -4999,8 +4999,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "379" - endingLineNumber = "379" + startingLineNumber = "380" + endingLineNumber = "380" landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkType = "7"> @@ -5015,8 +5015,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "814" - endingLineNumber = "814" + startingLineNumber = "815" + endingLineNumber = "815" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5095,8 +5095,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1219" - endingLineNumber = "1219" + startingLineNumber = "1220" + endingLineNumber = "1220" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5143,8 +5143,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1231" - endingLineNumber = "1231" + startingLineNumber = "1232" + endingLineNumber = "1232" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5191,8 +5191,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1233" - endingLineNumber = "1233" + startingLineNumber = "1234" + endingLineNumber = "1234" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5286,8 +5286,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1060" - endingLineNumber = "1060" + startingLineNumber = "1061" + endingLineNumber = "1061" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -5302,8 +5302,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1361" - endingLineNumber = "1361" + startingLineNumber = "1362" + endingLineNumber = "1362" landmarkName = "updateData(taskModel:)" landmarkType = "7"> @@ -5334,8 +5334,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1222" - endingLineNumber = "1222" + startingLineNumber = "1223" + endingLineNumber = "1223" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5350,44 +5350,44 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" + startingLineNumber = "1236" + endingLineNumber = "1236" + landmarkName = "init(taskModels:)" + landmarkType = "7"> + + + + + + + + - - - - - - - - @@ -5414,8 +5414,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "605" - endingLineNumber = "605" + startingLineNumber = "606" + endingLineNumber = "606" landmarkName = "showListDetail(vehicleModel:)" landmarkType = "7"> @@ -5430,8 +5430,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "147" - endingLineNumber = "147" + startingLineNumber = "148" + endingLineNumber = "148" landmarkName = "addAction()" landmarkType = "7"> @@ -5446,8 +5446,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "192" - endingLineNumber = "192" + startingLineNumber = "193" + endingLineNumber = "193" landmarkName = "addAction()" landmarkType = "7"> @@ -5462,8 +5462,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "794" - endingLineNumber = "794" + startingLineNumber = "795" + endingLineNumber = "795" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5478,8 +5478,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "800" - endingLineNumber = "800" + startingLineNumber = "801" + endingLineNumber = "801" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5494,8 +5494,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "806" - endingLineNumber = "806" + startingLineNumber = "807" + endingLineNumber = "807" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5574,8 +5574,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1367" - endingLineNumber = "1367" + startingLineNumber = "1368" + endingLineNumber = "1368" landmarkName = "listView()" landmarkType = "7"> diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index 153ee1a..665d6f2 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -19,7 +19,8 @@ import DDUIGestureRecognizer import DDUtilsSwiftKit_Private fileprivate let vehicleMonitoringPannelViewHeight = auto(300) -fileprivate let vehicleMonitoringPannelViewTopInset = auto(40) +fileprivate let vehicleMonitoringPannelCategoryView = auto(40) +fileprivate let vehicleMonitoringListDetailViewHeight = auto(190) fileprivate let vehicleMonitoringPointAnnotationW = auto(120) fileprivate let vehicleMonitoringPointAnnotationNameLeftInset = auto(35) @@ -626,7 +627,7 @@ extension VehicleMonitoringController { /// 收回pannelView previousStateOfPannelView = pannelPanGes.panGesValue.expandLevel - pannelPanGes.expand(.min) + pannelPanGes.expand(.default) /// 改变约束 vehicleMonitoringListDetailView.snp.updateConstraints({ make in @@ -720,7 +721,7 @@ open class VehicleMonitoringController : ZDViewController { make.left.equalTo(vehicleMonitoringView.snp.right) make.bottom.equalTo(vehicleMonitoringView) make.width.equalTo(vehicleMonitoringView) - make.height.equalTo(auto(190)) + make.height.equalTo(vehicleMonitoringListDetailViewHeight) } vehicleMonitoringView.maMapView.delegate = self @@ -769,7 +770,7 @@ open class VehicleMonitoringController : ZDViewController { vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.snp.remakeConstraints { make in make.top.equalToSuperview().priority(.high) make.left.right.equalToSuperview() - make.height.equalTo(auto(40)) + make.height.equalTo(vehicleMonitoringPannelCategoryView) } vehicleMonitoringListDetailView.layer.cornerRadius = vehicleMonitoringPannelViewCornerRadius @@ -781,13 +782,13 @@ open class VehicleMonitoringController : ZDViewController { make.bottom.equalToSuperview() }) - let minDisplayHeight = vehicleMonitoringPannelViewTopInset + let minDisplayHeight = vehicleMonitoringPannelCategoryView let maxDisplayHeight = view.height - SafeAreaInsets.safeAreaInsetsTop - SafeAreaInsets.safeAreaInsetsBottom - auto(150) - let defaultDisplayHeight = vehicleMonitoringPannelViewTopInset + auto(150) + let defaultDisplayHeight = vehicleMonitoringListDetailViewHeight vehicleMonitoringView.maMapView.snp.remakeConstraints { make in make.left.right.equalToSuperview() make.top.equalToSuperview() - make.bottom.equalToSuperview().offset(-vehicleMonitoringPannelViewTopInset + vehicleMonitoringPannelViewCornerRadius) + make.bottom.equalToSuperview().offset(-vehicleMonitoringPannelCategoryView + vehicleMonitoringPannelViewCornerRadius) } if pannelPanGes.panGesValue.expandLevel == .max {