调度页修改
This commit is contained in:
Binary file not shown.
@@ -221,8 +221,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "486"
|
startingLineNumber = "487"
|
||||||
endingLineNumber = "486"
|
endingLineNumber = "487"
|
||||||
landmarkName = "dd_mapView(_:didAnnotationViewTapped:)"
|
landmarkName = "dd_mapView(_:didAnnotationViewTapped:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
@@ -6036,8 +6036,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "215"
|
startingLineNumber = "216"
|
||||||
endingLineNumber = "215"
|
endingLineNumber = "216"
|
||||||
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
@@ -6052,8 +6052,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "220"
|
startingLineNumber = "221"
|
||||||
endingLineNumber = "220"
|
endingLineNumber = "221"
|
||||||
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
@@ -6068,8 +6068,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "225"
|
startingLineNumber = "226"
|
||||||
endingLineNumber = "225"
|
endingLineNumber = "226"
|
||||||
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
@@ -6084,8 +6084,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "229"
|
startingLineNumber = "230"
|
||||||
endingLineNumber = "229"
|
endingLineNumber = "230"
|
||||||
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
@@ -6100,8 +6100,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "506"
|
startingLineNumber = "507"
|
||||||
endingLineNumber = "506"
|
endingLineNumber = "507"
|
||||||
landmarkName = "dd_mapView(_:mapDidZoomByUser:)"
|
landmarkName = "dd_mapView(_:mapDidZoomByUser:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
@@ -6116,8 +6116,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "496"
|
startingLineNumber = "497"
|
||||||
endingLineNumber = "496"
|
endingLineNumber = "497"
|
||||||
landmarkName = "dd_mapView(_:mapDidZoomByUser:)"
|
landmarkName = "dd_mapView(_:mapDidZoomByUser:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
@@ -6148,8 +6148,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "210"
|
startingLineNumber = "211"
|
||||||
endingLineNumber = "210"
|
endingLineNumber = "211"
|
||||||
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
@@ -6164,8 +6164,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "211"
|
startingLineNumber = "212"
|
||||||
endingLineNumber = "211"
|
endingLineNumber = "212"
|
||||||
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
<Locations>
|
<Locations>
|
||||||
@@ -6212,8 +6212,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "258"
|
startingLineNumber = "259"
|
||||||
endingLineNumber = "258"
|
endingLineNumber = "259"
|
||||||
landmarkName = "selectVehicle(selectState:vehicleModel:currentTableViewVehicleModels:selectIndex:mapView:)"
|
landmarkName = "selectVehicle(selectState:vehicleModel:currentTableViewVehicleModels:selectIndex:mapView:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
<Locations>
|
<Locations>
|
||||||
@@ -6260,8 +6260,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "176"
|
startingLineNumber = "177"
|
||||||
endingLineNumber = "176"
|
endingLineNumber = "177"
|
||||||
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
@@ -6276,8 +6276,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "309"
|
startingLineNumber = "310"
|
||||||
endingLineNumber = "309"
|
endingLineNumber = "310"
|
||||||
landmarkName = "modifyMapAnchor()"
|
landmarkName = "modifyMapAnchor()"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
@@ -6292,8 +6292,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "403"
|
startingLineNumber = "404"
|
||||||
endingLineNumber = "403"
|
endingLineNumber = "404"
|
||||||
landmarkName = "tableView(_:cellForRowAt:)"
|
landmarkName = "tableView(_:cellForRowAt:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
@@ -6308,8 +6308,8 @@
|
|||||||
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "434"
|
startingLineNumber = "435"
|
||||||
endingLineNumber = "434"
|
endingLineNumber = "435"
|
||||||
landmarkName = "tableView(_:didSelectRowAt:)"
|
landmarkName = "tableView(_:didSelectRowAt:)"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
|
|||||||
@@ -138,6 +138,7 @@ extension DispatchOrderController {
|
|||||||
|
|
||||||
if (self?.dispatchOrderView.maMapView.maMapView.annotations.count ?? 0) > 0 , let annotations = self?.dispatchOrderView.maMapView.maMapView.annotations {
|
if (self?.dispatchOrderView.maMapView.maMapView.annotations.count ?? 0) > 0 , let annotations = self?.dispatchOrderView.maMapView.maMapView.annotations {
|
||||||
DispatchQueue.main.async {[weak self] in
|
DispatchQueue.main.async {[weak self] in
|
||||||
|
self?.modifyMapAnchor()
|
||||||
self?.dispatchOrderView.maMapView.maMapView.showAnnotations(annotations, edgePadding:UIEdgeInsets(top: mapInsetTopSafeArea, left: 0, bottom: dispatchPannelViewHeight + mapInsetBottomSafeArea, right: 0), animated: true)
|
self?.dispatchOrderView.maMapView.maMapView.showAnnotations(annotations, edgePadding:UIEdgeInsets(top: mapInsetTopSafeArea, left: 0, bottom: dispatchPannelViewHeight + mapInsetBottomSafeArea, right: 0), animated: true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -575,10 +576,10 @@ open class DispatchOrderController : ZDViewController {
|
|||||||
dispatchOrderView.dispatchPannelView.tableView.dataSource = self
|
dispatchOrderView.dispatchPannelView.tableView.dataSource = self
|
||||||
|
|
||||||
pannelPanGes.panGesValue.from = .bottom
|
pannelPanGes.panGesValue.from = .bottom
|
||||||
|
pannelPanGes.panGesValue.expandLevel = .max
|
||||||
pannelPanGes.expandLevelChangedHandler = {[weak self] old, new in
|
pannelPanGes.expandLevelChangedHandler = {[weak self] old, new in
|
||||||
self?.modifyMapAnchor()
|
self?.modifyMapAnchor()
|
||||||
}
|
}
|
||||||
pannelPanGes.panGesValue.expandLevel = .max
|
|
||||||
dispatchOrderView.dispatchPannelView.addGestureRecognizer(pannelPanGes)
|
dispatchOrderView.dispatchPannelView.addGestureRecognizer(pannelPanGes)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,17 +5,17 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000171">
|
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000175">
|
||||||
|
|
||||||
</testcase>
|
</testcase>
|
||||||
|
|
||||||
|
|
||||||
<testcase classname="fastlane.lanes" name="1: gym" time="83.829695">
|
<testcase classname="fastlane.lanes" name="1: gym" time="70.746678">
|
||||||
|
|
||||||
</testcase>
|
</testcase>
|
||||||
|
|
||||||
|
|
||||||
<testcase classname="fastlane.lanes" name="2: pgyer" time="39.28511">
|
<testcase classname="fastlane.lanes" name="2: pgyer" time="11.150287">
|
||||||
|
|
||||||
</testcase>
|
</testcase>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user