diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index d22c9c3..682101e 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 45a6d81..6d8582f 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -4759,8 +4759,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1958" - endingLineNumber = "1958" + startingLineNumber = "1959" + endingLineNumber = "1959" landmarkName = "init(style:reuseIdentifier:)" landmarkType = "7"> @@ -4807,8 +4807,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1965" - endingLineNumber = "1965" + startingLineNumber = "1966" + endingLineNumber = "1966" landmarkName = "init(style:reuseIdentifier:)" landmarkType = "7"> diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index 02eb4fc..a0e5d68 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -635,7 +635,7 @@ 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: .ImageLeftPaddingTitleRightWithWholeCenter, padding: auto(5)) + 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)) @@ -1492,7 +1492,7 @@ class RescuePendingDispatchCell : DDTableViewCell { carTypeLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("000000")) positionTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.5)) positionLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("000000")) - juheTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("ff0000").alpha(0.5)) + juheTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("ff0000").alpha(0.7)) juheButton = DDButton.dd_initCustom() serviceTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.5)) serviceLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("000000")) @@ -1542,6 +1542,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)) radiusView.addSubview(juheButton) carTypeLabel.numberOfLines = 0 radiusView.addSubview(carTypeLabel) diff --git a/fastlane/report.xml b/fastlane/report.xml index b6bf53d..e1ff74e 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +