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

调度页修改

Browse Source
This commit is contained in:
DDIsFriend
2024-01-10 15:13:07 +08:00
parent d7108d3367
commit 325edc30a3
3 changed files with 49 additions and 43 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.

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

@@ -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 = "484" startingLineNumber = "486"
endingLineNumber = "484" endingLineNumber = "486"
landmarkName = "dd_mapView(_:didAnnotationViewTapped:)" landmarkName = "dd_mapView(_:didAnnotationViewTapped:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -253,8 +253,8 @@
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "92" startingLineNumber = "84"
endingLineNumber = "92" endingLineNumber = "84"
landmarkName = "addActions()" landmarkName = "addActions()"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
@@ -316,8 +316,8 @@
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "110" startingLineNumber = "102"
endingLineNumber = "110" endingLineNumber = "102"
landmarkName = "addActions()" landmarkName = "addActions()"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
@@ -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 = "213" startingLineNumber = "215"
endingLineNumber = "213" endingLineNumber = "215"
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 = "218" startingLineNumber = "220"
endingLineNumber = "218" endingLineNumber = "220"
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 = "223" startingLineNumber = "225"
endingLineNumber = "223" endingLineNumber = "225"
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 = "227" startingLineNumber = "229"
endingLineNumber = "227" endingLineNumber = "229"
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 = "504" startingLineNumber = "506"
endingLineNumber = "504" endingLineNumber = "506"
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 = "494" startingLineNumber = "496"
endingLineNumber = "494" endingLineNumber = "496"
landmarkName = "dd_mapView(_:mapDidZoomByUser:)" landmarkName = "dd_mapView(_:mapDidZoomByUser:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -6132,8 +6132,8 @@
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "133" startingLineNumber = "125"
endingLineNumber = "133" endingLineNumber = "125"
landmarkName = "addActions()" landmarkName = "addActions()"
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 = "208" startingLineNumber = "210"
endingLineNumber = "208" endingLineNumber = "210"
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 = "209" startingLineNumber = "211"
endingLineNumber = "209" endingLineNumber = "211"
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 = "256" startingLineNumber = "258"
endingLineNumber = "256" endingLineNumber = "258"
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 = "174" startingLineNumber = "176"
endingLineNumber = "174" endingLineNumber = "176"
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 = "307" startingLineNumber = "309"
endingLineNumber = "307" endingLineNumber = "309"
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 = "401" startingLineNumber = "403"
endingLineNumber = "401" endingLineNumber = "403"
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 = "432" startingLineNumber = "434"
endingLineNumber = "432" endingLineNumber = "434"
landmarkName = "tableView(_:didSelectRowAt:)" landmarkName = "tableView(_:didSelectRowAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>

24
OrderScheduling/Rescue/ViewController/DispatchOrderController.swift
View File

@@ -23,14 +23,6 @@ fileprivate let mapInsetBottomSafeArea = auto(80)
extension DispatchOrderController { extension DispatchOrderController {
func addActions() { func addActions() {
let serviceAddressCoordinate = CLLocationCoordinate2D(latitude: serviceAddressLat, longitude: serviceAddressLon)
let serviceAddressPointAnnotation = MAPointAnnotation.init()
serviceAddressPointAnnotation.annotationClass = DispatchMapSericeAddressPointAnnotation.self
serviceAddressPointAnnotation.coordinate = serviceAddressCoordinate
serviceAddressPointAnnotation.tag = 10000
dispatchOrderView.maMapView.maMapView.addAnnotation(serviceAddressPointAnnotation)
dispatchOrderView.maMapView.maMapView.setCenter(serviceAddressCoordinate, animated: true)
dispatchOrderView.dispatchPannelView.onlineButton.rx.tap dispatchOrderView.dispatchPannelView.onlineButton.rx.tap
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in .subscribe(onNext: {[weak self] _ in
@@ -134,6 +126,16 @@ extension DispatchOrderController {
self?.dispatchOrderView.maMapView.maMapView.addAnnotation(pointAnnotation) self?.dispatchOrderView.maMapView.maMapView.addAnnotation(pointAnnotation)
} }
if let serviceAddressLat = self?.serviceAddressLat, let serviceAddressLon = self?.serviceAddressLon {
let serviceAddressCoordinate = CLLocationCoordinate2D(latitude: serviceAddressLat, longitude: serviceAddressLon)
let serviceAddressPointAnnotation = MAPointAnnotation.init()
serviceAddressPointAnnotation.annotationClass = DispatchMapSericeAddressPointAnnotation.self
serviceAddressPointAnnotation.coordinate = serviceAddressCoordinate
serviceAddressPointAnnotation.tag = 1000000
self?.dispatchOrderView.maMapView.maMapView.addAnnotation(serviceAddressPointAnnotation)
self?.dispatchOrderView.maMapView.maMapView.setCenter(serviceAddressCoordinate, animated: true)
}
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?.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)
@@ -516,13 +518,17 @@ extension DispatchOrderController : DDMAMapViewDelegate {
open class DispatchOrderController : ZDViewController { open class DispatchOrderController : ZDViewController {
private let disposeBag = DisposeBag() private let disposeBag = DisposeBag()
private let dispatchOrderView = DispatchOrderView() private let dispatchOrderView = DispatchOrderView()
private let bottomView = DDView() private let bottomView = DDView()
private let userOrderId : Int private let userOrderId : Int
private let taskOrderId : Int private let taskOrderId : Int
private var resultArr : [DispatchVehicleListDataModel] = []
private let serviceAddressLat : Double private let serviceAddressLat : Double
private let serviceAddressLon : Double private let serviceAddressLon : Double
private var resultArr : [DispatchVehicleListDataModel] = []
private let dispatchOrderRelay = ReplayRelay<DispatchVehicleListDataModel>.create(bufferSize: 1) private let dispatchOrderRelay = ReplayRelay<DispatchVehicleListDataModel>.create(bufferSize: 1)
public var dispatchCompletionHandler: ((Int) -> Void)? public var dispatchCompletionHandler: ((Int) -> Void)?