diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index fa73740..3eceda5 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 74f8352..fece7d2 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 = "359" - endingLineNumber = "359" + startingLineNumber = "361" + endingLineNumber = "361" landmarkName = "dd_mapView(_:didAnnotationViewTapped:)" landmarkType = "7"> @@ -253,8 +253,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "138" - endingLineNumber = "138" + startingLineNumber = "140" + endingLineNumber = "140" landmarkName = "addActions()" landmarkType = "7"> @@ -316,8 +316,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "156" - endingLineNumber = "156" + startingLineNumber = "158" + endingLineNumber = "158" landmarkName = "addActions()" landmarkType = "7"> diff --git a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift index 3a54127..701f8a8 100644 --- a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift +++ b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift @@ -115,21 +115,23 @@ extension DispatchOrderController { .disposed(by: disposeBag) dispatchOrderView.dispatchPannelView.offlineView.submitButton.rx.tap + .observe(on: MainScheduler.instance) .filter({[weak self] _ in -// if self?.dispatchOrderView.dispatchPannelView.offlineView.name.textFiled.text?.isEmpty != false { -// self?.view.dd_makeToast(dispatchOrderInputName) -// return false -// } + if self?.dispatchOrderView.dispatchPannelView.offlineView.name.textFiled.text?.isEmpty != false { + self?.view.dd_makeToast(dispatchOrderInputName) + return false + } if self?.dispatchOrderView.dispatchPannelView.offlineView.phone.textFiled.text?.isEmpty != false { self?.view.dd_makeToast(dispatchOrderInputPhone) return false } -// if self?.dispatchOrderView.dispatchPannelView.offlineView.license.textFiled.text?.isEmpty != false { -// self?.view.dd_makeToast(dispatchOrderInputLicense) -// return false -// } - return self?.dispatchOrderView.dispatchPannelView.offlineView.phone.textFiled.text?.isEmpty == false + if self?.dispatchOrderView.dispatchPannelView.offlineView.license.textFiled.text?.isEmpty != false { + self?.view.dd_makeToast(dispatchOrderInputLicense) + return 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 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)!)) } diff --git a/fastlane/report.xml b/fastlane/report.xml index 770edb2..af215ac 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,12 @@ - + - - - - - - +