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

update

Browse Source
This commit is contained in:
DDIsFriend
2023-08-24 17:42:04 +08:00
parent f1ef756b3b
commit e52741807e
3 changed files with 26 additions and 14 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.

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

@@ -349,8 +349,8 @@
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "311" startingLineNumber = "310"
endingLineNumber = "311" endingLineNumber = "310"
landmarkName = "dd_mapView(_:didAnnotationViewTapped:)" landmarkName = "dd_mapView(_:didAnnotationViewTapped:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -381,8 +381,8 @@
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "137" startingLineNumber = "136"
endingLineNumber = "137" endingLineNumber = "136"
landmarkName = "addActions()" landmarkName = "addActions()"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
@@ -444,8 +444,8 @@
filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "155" startingLineNumber = "154"
endingLineNumber = "155" endingLineNumber = "154"
landmarkName = "addActions()" landmarkName = "addActions()"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
@@ -1444,7 +1444,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
uuid = "D7A2EF3A-2FB8-49BE-8A7C-A93AB3BCF461" uuid = "D7A2EF3A-2FB8-49BE-8A7C-A93AB3BCF461"
shouldBeEnabled = "Yes" shouldBeEnabled = "No"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"
@@ -1586,7 +1586,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
uuid = "CFCD4B6D-6F9B-4A1C-97F9-7EADFA549A6F" uuid = "CFCD4B6D-6F9B-4A1C-97F9-7EADFA549A6F"
shouldBeEnabled = "Yes" shouldBeEnabled = "No"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "OrderScheduling/Main/AppDelegate.swift" filePath = "OrderScheduling/Main/AppDelegate.swift"

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

@@ -27,14 +27,13 @@ extension DispatchOrderController {
dispatchOrderView.maMapView.maMapView.addAnnotation(serviceAddressPointAnnotation) dispatchOrderView.maMapView.maMapView.addAnnotation(serviceAddressPointAnnotation)
dispatchOrderView.maMapView.maMapView.setCenter(serviceAddressCoordinate, animated: true) dispatchOrderView.maMapView.maMapView.setCenter(serviceAddressCoordinate, animated: true)
let bottomSafeArea = view.safeAreaInsets.bottom
dispatchOrderView.tapGes.rx.event dispatchOrderView.tapGes.rx.event
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in .subscribe(onNext: {[weak self] _ in
self?.dispatchOrderView.coverView.isHidden = true self?.dispatchOrderView.coverView.isHidden = true
self?.dispatchOrderView.dispatchPannelView.snp.updateConstraints({ make in self?.dispatchOrderView.dispatchPannelView.snp.updateConstraints({ make in
make.bottom.equalToSuperview().offset((dispatchPannelViewHeight - dispatchPannelViewTopInset) - bottomSafeArea) make.bottom.equalToSuperview().offset((dispatchPannelViewHeight - dispatchPannelViewTopInset) - (self?.view.safeAreaInsets.bottom ?? 0))
}) })
UIView.animate(withDuration: 0.25) {[weak self] in UIView.animate(withDuration: 0.25) {[weak self] in
@@ -49,7 +48,7 @@ extension DispatchOrderController {
self?.dispatchOrderView.coverView.isHidden = true self?.dispatchOrderView.coverView.isHidden = true
self?.dispatchOrderView.dispatchPannelView.snp.updateConstraints({ make in self?.dispatchOrderView.dispatchPannelView.snp.updateConstraints({ make in
make.bottom.equalToSuperview().offset((dispatchPannelViewHeight - dispatchPannelViewTopInset) - bottomSafeArea) make.bottom.equalToSuperview().offset((dispatchPannelViewHeight - dispatchPannelViewTopInset) - (self?.view.safeAreaInsets.bottom ?? 0))
}) })
UIView.animate(withDuration: 0.25) {[weak self] in UIView.animate(withDuration: 0.25) {[weak self] in
@@ -315,6 +314,7 @@ extension DispatchOrderController : DDMAMapViewDelegate {
open class DispatchOrderController : DDViewController { open class DispatchOrderController : DDViewController {
private let disposeBag = DisposeBag() private let disposeBag = DisposeBag()
private let dispatchOrderView = DispatchOrderView() private let dispatchOrderView = DispatchOrderView()
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 var resultArr : [DispatchVehicleListDataModel] = []
@@ -347,15 +347,27 @@ open class DispatchOrderController : DDViewController {
func addSubviews() { func addSubviews() {
view.addSubview(dispatchOrderView) view.addSubview(dispatchOrderView)
dispatchOrderView.snp.makeConstraints { make in
make.edges.equalToSuperview() bottomView.backgroundColor = .white
} view.addSubview(bottomView)
dispatchOrderView.maMapView.delegate = self dispatchOrderView.maMapView.delegate = self
dispatchOrderView.dispatchPannelView.tableView.delegate = self dispatchOrderView.dispatchPannelView.tableView.delegate = self
dispatchOrderView.dispatchPannelView.tableView.dataSource = self dispatchOrderView.dispatchPannelView.tableView.dataSource = self
} }
open override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews()
dispatchOrderView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
bottomView.snp.makeConstraints { make in
make.left.bottom.right.equalToSuperview()
make.height.equalTo(view.safeAreaInsets.bottom)
}
}
open override var preferredStatusBarStyle: UIStatusBarStyle { open override var preferredStatusBarStyle: UIStatusBarStyle {
return .darkContent return .darkContent
} }