diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 8838893..5f04628 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 6d8582f..73595fb 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -211,22 +211,6 @@ - - - - @@ -2237,8 +2221,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1033" - endingLineNumber = "1033" + startingLineNumber = "1032" + endingLineNumber = "1032" landmarkName = "collectionView(_:didSelectItemAt:)" landmarkType = "7"> @@ -2971,8 +2955,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1116" - endingLineNumber = "1116" + startingLineNumber = "1115" + endingLineNumber = "1115" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -3643,8 +3627,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "922" - endingLineNumber = "922" + startingLineNumber = "921" + endingLineNumber = "921" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -3691,8 +3675,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "936" - endingLineNumber = "936" + startingLineNumber = "935" + endingLineNumber = "935" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -3739,8 +3723,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "941" - endingLineNumber = "941" + startingLineNumber = "940" + endingLineNumber = "940" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -4845,5 +4829,21 @@ + + + + diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index e6d0496..7b27d4a 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -635,7 +635,6 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS cell?.juheTitleLabel.text = "聚合车辆:" cell?.juheButton.setTitle("\(model.juheVehcileName ?? "")-\(model.juheStaffPhone ?? "")", for: .normal) cell?.juheButton.setImage(UIImage(named: "rescue_orderDispatch_call"), for: .normal) - cell?.juheButton.dd_customize(with: .ImageRightPaddingTitleLeftWithWholeCenter, padding: auto(5)) cell?.juheButton.isHidden = false cell?.juheTitleLabel.snp.updateConstraints({ make in make.top.equalTo(cell!.positionLabel.snp.bottom).offset(auto(8)) @@ -1542,7 +1541,7 @@ class RescuePendingDispatchCell : DDTableViewCell { radiusView.addSubview(juheTitleLabel) juheButton.setTitleColor(.hex("ff0000"), for: .normal) juheButton.titleLabel?.font = .mediumFont(auto(13)) - juheButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: auto(5), bottom: 0, right: auto(5)) + juheButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 3, bottom: 0, right: 3) radiusView.addSubview(juheButton) carTypeLabel.numberOfLines = 0 radiusView.addSubview(carTypeLabel) @@ -1758,6 +1757,7 @@ class RescuePendingDispatchCell : DDTableViewCell { super.layoutSubviews() dispatchLayer.frame = CGRectMake(0, 0, auto(80), auto(30)) contactButton.dd_customize(with: .ImageLeftPaddingTitleRightWithWholeCenter, padding: 3) + juheButton.dd_customize(with: .ImageRightPaddingTitleLeftWithWholeCenter, padding: 3) } override func prepareForReuse() { diff --git a/fastlane/report.xml b/fastlane/report.xml index 72fdc7a..7f53305 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +