diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index b415562..1ea6561 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 8e0d653..c33fb66 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -221,8 +221,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "484" - endingLineNumber = "484" + startingLineNumber = "486" + endingLineNumber = "486" landmarkName = "dd_mapView(_:didAnnotationViewTapped:)" landmarkType = "7"> @@ -253,8 +253,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "92" - endingLineNumber = "92" + startingLineNumber = "84" + endingLineNumber = "84" landmarkName = "addActions()" landmarkType = "7"> @@ -316,8 +316,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "110" - endingLineNumber = "110" + startingLineNumber = "102" + endingLineNumber = "102" landmarkName = "addActions()" landmarkType = "7"> @@ -6036,8 +6036,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "213" - endingLineNumber = "213" + startingLineNumber = "215" + endingLineNumber = "215" landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)" landmarkType = "7"> @@ -6052,8 +6052,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "218" - endingLineNumber = "218" + startingLineNumber = "220" + endingLineNumber = "220" landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)" landmarkType = "7"> @@ -6068,8 +6068,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "223" - endingLineNumber = "223" + startingLineNumber = "225" + endingLineNumber = "225" landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)" landmarkType = "7"> @@ -6084,8 +6084,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "227" - endingLineNumber = "227" + startingLineNumber = "229" + endingLineNumber = "229" landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)" landmarkType = "7"> @@ -6100,8 +6100,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "504" - endingLineNumber = "504" + startingLineNumber = "506" + endingLineNumber = "506" landmarkName = "dd_mapView(_:mapDidZoomByUser:)" landmarkType = "7"> @@ -6116,8 +6116,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "494" - endingLineNumber = "494" + startingLineNumber = "496" + endingLineNumber = "496" landmarkName = "dd_mapView(_:mapDidZoomByUser:)" landmarkType = "7"> @@ -6132,8 +6132,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "133" - endingLineNumber = "133" + startingLineNumber = "125" + endingLineNumber = "125" landmarkName = "addActions()" landmarkType = "7"> @@ -6148,8 +6148,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "208" - endingLineNumber = "208" + startingLineNumber = "210" + endingLineNumber = "210" landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)" landmarkType = "7"> @@ -6164,8 +6164,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "209" - endingLineNumber = "209" + startingLineNumber = "211" + endingLineNumber = "211" landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)" landmarkType = "7"> @@ -6212,8 +6212,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "256" - endingLineNumber = "256" + startingLineNumber = "258" + endingLineNumber = "258" landmarkName = "selectVehicle(selectState:vehicleModel:currentTableViewVehicleModels:selectIndex:mapView:)" landmarkType = "7"> @@ -6260,8 +6260,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "174" - endingLineNumber = "174" + startingLineNumber = "176" + endingLineNumber = "176" landmarkName = "annotationViewStateConfig(annotationView:vehicleModel:shouldShowSmallAnnotation:)" landmarkType = "7"> @@ -6276,8 +6276,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "307" - endingLineNumber = "307" + startingLineNumber = "309" + endingLineNumber = "309" landmarkName = "modifyMapAnchor()" landmarkType = "7"> @@ -6292,8 +6292,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "401" - endingLineNumber = "401" + startingLineNumber = "403" + endingLineNumber = "403" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -6308,8 +6308,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "432" - endingLineNumber = "432" + startingLineNumber = "434" + endingLineNumber = "434" landmarkName = "tableView(_:didSelectRowAt:)" landmarkType = "7"> diff --git a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift index ff564e0..fe0ee6f 100644 --- a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift +++ b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift @@ -23,14 +23,6 @@ fileprivate let mapInsetBottomSafeArea = auto(80) extension DispatchOrderController { 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 .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in @@ -134,6 +126,16 @@ extension DispatchOrderController { 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 { 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) @@ -516,13 +518,17 @@ extension DispatchOrderController : DDMAMapViewDelegate { open class DispatchOrderController : ZDViewController { private let disposeBag = DisposeBag() + private let dispatchOrderView = DispatchOrderView() private let bottomView = DDView() + private let userOrderId : Int private let taskOrderId : Int - private var resultArr : [DispatchVehicleListDataModel] = [] private let serviceAddressLat : Double private let serviceAddressLon : Double + + private var resultArr : [DispatchVehicleListDataModel] = [] + private let dispatchOrderRelay = ReplayRelay.create(bufferSize: 1) public var dispatchCompletionHandler: ((Int) -> Void)?