diff --git a/.DS_Store b/.DS_Store index 5419245..bc07108 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 36aa1ea..27e1a2e 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 60cc8e8..a9b38bf 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -6292,8 +6292,8 @@ filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "404" - endingLineNumber = "404" + startingLineNumber = "414" + endingLineNumber = "414" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -6314,5 +6314,21 @@ landmarkType = "7"> + + + + diff --git a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift index ce5c7d8..4588246 100644 --- a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift +++ b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift @@ -398,6 +398,16 @@ extension DispatchOrderController : UITableViewDelegate,UITableViewDataSource { cell?.distance.text = String(distance)+"km" } + if model.driverPhone?.isEmpty == false { + cell?.phoneButton.snp.updateConstraints({ make in + make.width.equalTo(auto(24)) + }) + }else{ + cell?.phoneButton.snp.updateConstraints({ make in + make.width.equalTo(0) + }) + } + cell?.phoneButton.rx.tap .observe(on: MainScheduler.instance) .subscribe(onNext: { _ in @@ -415,18 +425,8 @@ extension DispatchOrderController : UITableViewDelegate,UITableViewDataSource { if USERP.canDealWith == true { cell?.dispatchButton.isHidden = false - - cell?.dispatchButton.snp.updateConstraints({ make in - make.width.equalTo(auto(50)) - make.right.equalTo(-auto(10)) - }) }else{ cell?.dispatchButton.isHidden = true - - cell?.dispatchButton.snp.updateConstraints({ make in - make.width.equalTo(0) - make.right.equalTo(0) - }) } return cell! } @@ -585,11 +585,11 @@ open class DispatchOrderController : ZDViewController { open override func viewWillLayoutSubviews() { super.viewWillLayoutSubviews() - dispatchOrderView.snp.makeConstraints { make in + dispatchOrderView.snp.remakeConstraints { make in make.edges.equalToSuperview() } - bottomView.snp.makeConstraints { make in + bottomView.snp.remakeConstraints { make in make.left.bottom.right.equalToSuperview() make.height.equalTo(view.safeAreaInsets.bottom) } @@ -703,7 +703,8 @@ open class DispatchOrderPannelCell : DDTableViewCell { } phoneButton.snp.makeConstraints { make in - make.left.equalTo(name.snp.right) + make.left.equalTo(name.snp.right).priority(.high) + make.width.height.equalTo(auto(24)) make.right.equalToSuperview() make.centerY.equalToSuperview() } @@ -953,7 +954,7 @@ open class DispatchOrderOfflineSchedulingItemView : DDView { line.snp.makeConstraints { make in make.bottom.equalToSuperview() - make.left.equalTo(auto(30)) + make.left.equalTo(auto(30)).priority(.high) make.right.equalTo(-auto(30)) make.height.equalTo(1) } diff --git a/fastlane/report.xml b/fastlane/report.xml index 3194522..26387d5 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +