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

调度小程序全部为必填

Browse Source
This commit is contained in:
DDIsFriend
2023-11-07 11:31:14 +08:00
parent 5afc83c28c
commit 747022a91a
4 changed files with 19 additions and 22 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.

12
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 = "359" startingLineNumber = "361"
endingLineNumber = "359" endingLineNumber = "361"
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 = "138" startingLineNumber = "140"
endingLineNumber = "138" endingLineNumber = "140"
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 = "156" startingLineNumber = "158"
endingLineNumber = "156" endingLineNumber = "158"
landmarkName = "addActions()" landmarkName = "addActions()"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>

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

@@ -115,21 +115,23 @@ extension DispatchOrderController {
.disposed(by: disposeBag) .disposed(by: disposeBag)
dispatchOrderView.dispatchPannelView.offlineView.submitButton.rx.tap dispatchOrderView.dispatchPannelView.offlineView.submitButton.rx.tap
.observe(on: MainScheduler.instance)
.filter({[weak self] _ in .filter({[weak self] _ in
// if self?.dispatchOrderView.dispatchPannelView.offlineView.name.textFiled.text?.isEmpty != false { if self?.dispatchOrderView.dispatchPannelView.offlineView.name.textFiled.text?.isEmpty != false {
// self?.view.dd_makeToast(dispatchOrderInputName) self?.view.dd_makeToast(dispatchOrderInputName)
// return false return false
// } }
if self?.dispatchOrderView.dispatchPannelView.offlineView.phone.textFiled.text?.isEmpty != false { if self?.dispatchOrderView.dispatchPannelView.offlineView.phone.textFiled.text?.isEmpty != false {
self?.view.dd_makeToast(dispatchOrderInputPhone) self?.view.dd_makeToast(dispatchOrderInputPhone)
return false return false
} }
// if self?.dispatchOrderView.dispatchPannelView.offlineView.license.textFiled.text?.isEmpty != false { if self?.dispatchOrderView.dispatchPannelView.offlineView.license.textFiled.text?.isEmpty != false {
// self?.view.dd_makeToast(dispatchOrderInputLicense) self?.view.dd_makeToast(dispatchOrderInputLicense)
// return false return false
// } }
return self?.dispatchOrderView.dispatchPannelView.offlineView.phone.textFiled.text?.isEmpty == false return self?.dispatchOrderView.dispatchPannelView.offlineView.name.textFiled.text?.isEmpty == false && self?.dispatchOrderView.dispatchPannelView.offlineView.phone.textFiled.text?.isEmpty == false && self?.dispatchOrderView.dispatchPannelView.offlineView.license.textFiled.text?.isEmpty == false
}) })
.observe(on: MainScheduler.instance)
.flatMapLatest {[weak self] _ in .flatMapLatest {[weak self] _ in
return RQ.dispatchVehicle(parameters: DispatchVehicleParameters(type: .offline, userOrderId: (self?.userOrderId)!, taskOrderId: (self?.taskOrderId)!,driverName: (self?.dispatchOrderView.dispatchPannelView.offlineView.name.textFiled.text)!,driverPhone: (self?.dispatchOrderView.dispatchPannelView.offlineView.phone.textFiled.text)!,plateNumber: (self?.dispatchOrderView.dispatchPannelView.offlineView.license.textFiled.text)!)) return RQ.dispatchVehicle(parameters: DispatchVehicleParameters(type: .offline, userOrderId: (self?.userOrderId)!, taskOrderId: (self?.taskOrderId)!,driverName: (self?.dispatchOrderView.dispatchPannelView.offlineView.name.textFiled.text)!,driverPhone: (self?.dispatchOrderView.dispatchPannelView.offlineView.phone.textFiled.text)!,plateNumber: (self?.dispatchOrderView.dispatchPannelView.offlineView.license.textFiled.text)!))
} }

9
fastlane/report.xml
View File

@@ -5,17 +5,12 @@
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000344"> <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000169">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="1: gym" time="76.392299"> <testcase classname="fastlane.lanes" name="1: gym" time="23.103357">
</testcase>
<testcase classname="fastlane.lanes" name="2: pgyer" time="20.313346">
</testcase> </testcase>