diff --git a/.DS_Store b/.DS_Store index cf1263d..5419245 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 8234d7b..9cc80e5 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 e717a8d..81fc972 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -427,8 +427,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1070" - endingLineNumber = "1070" + startingLineNumber = "1071" + endingLineNumber = "1071" landmarkName = "collectionView(_:cellForItemAt:)" landmarkType = "7"> @@ -698,8 +698,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "70" - endingLineNumber = "70" + startingLineNumber = "71" + endingLineNumber = "71" landmarkName = "addActions()" landmarkType = "7"> @@ -1285,8 +1285,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "267" - endingLineNumber = "267" + startingLineNumber = "268" + endingLineNumber = "268" landmarkName = "entry(model:remarkId:)" landmarkType = "7"> @@ -2045,8 +2045,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1081" - endingLineNumber = "1081" + startingLineNumber = "1082" + endingLineNumber = "1082" landmarkName = "collectionView(_:didSelectItemAt:)" landmarkType = "7"> @@ -2093,8 +2093,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "342" - endingLineNumber = "342" + startingLineNumber = "343" + endingLineNumber = "343" landmarkName = "addActions()" landmarkType = "7"> @@ -2109,8 +2109,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "331" - endingLineNumber = "331" + startingLineNumber = "332" + endingLineNumber = "332" landmarkName = "addActions()" landmarkType = "7"> @@ -2125,8 +2125,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "333" - endingLineNumber = "333" + startingLineNumber = "334" + endingLineNumber = "334" landmarkName = "addActions()" landmarkType = "7"> @@ -2300,8 +2300,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "78" - endingLineNumber = "78" + startingLineNumber = "79" + endingLineNumber = "79" landmarkName = "addActions()" landmarkType = "7"> @@ -2398,8 +2398,8 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "318" endingLineNumber = "318" - landmarkName = "reloadData()" - landmarkType = "7"> + landmarkName = "ReviewFailedController" + landmarkType = "3"> @@ -3467,8 +3467,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1022" - endingLineNumber = "1022" + startingLineNumber = "1023" + endingLineNumber = "1023" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -3819,8 +3819,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "224" - endingLineNumber = "224" + startingLineNumber = "225" + endingLineNumber = "225" landmarkName = "addActions()" landmarkType = "7"> @@ -3835,8 +3835,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "231" - endingLineNumber = "231" + startingLineNumber = "232" + endingLineNumber = "232" landmarkName = "addActions()" landmarkType = "7"> @@ -3851,28 +3851,28 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" + startingLineNumber = "91" + endingLineNumber = "91" + landmarkName = "addActions()" + landmarkType = "7"> + + + + - - - - @@ -3899,8 +3899,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "399" - endingLineNumber = "399" + startingLineNumber = "400" + endingLineNumber = "400" landmarkName = "addActions()" landmarkType = "7"> @@ -3915,8 +3915,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "310" - endingLineNumber = "310" + startingLineNumber = "311" + endingLineNumber = "311" landmarkName = "addActions()" landmarkType = "7"> @@ -4423,8 +4423,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "2050" - endingLineNumber = "2050" + startingLineNumber = "2051" + endingLineNumber = "2051" landmarkName = "init(style:reuseIdentifier:)" landmarkType = "7"> @@ -4471,8 +4471,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "2057" - endingLineNumber = "2057" + startingLineNumber = "2058" + endingLineNumber = "2058" landmarkName = "init(style:reuseIdentifier:)" landmarkType = "7"> @@ -4519,8 +4519,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "696" - endingLineNumber = "696" + startingLineNumber = "697" + endingLineNumber = "697" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -4599,8 +4599,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1009" - endingLineNumber = "1009" + startingLineNumber = "1010" + endingLineNumber = "1010" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -5660,5 +5660,211 @@ landmarkType = "7"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OrderScheduling/Assets.xcassets/.DS_Store b/OrderScheduling/Assets.xcassets/.DS_Store index 51ff801..a5438ff 100644 Binary files a/OrderScheduling/Assets.xcassets/.DS_Store and b/OrderScheduling/Assets.xcassets/.DS_Store differ diff --git a/OrderScheduling/Assets.xcassets/ConditionalSearch/conditional_search.imageset/conditional_search.png b/OrderScheduling/Assets.xcassets/ConditionalSearch/conditional_search.imageset/conditional_search.png index 42ec7ce..71c299e 100644 Binary files a/OrderScheduling/Assets.xcassets/ConditionalSearch/conditional_search.imageset/conditional_search.png and b/OrderScheduling/Assets.xcassets/ConditionalSearch/conditional_search.imageset/conditional_search.png differ diff --git a/OrderScheduling/Assets.xcassets/ConditionalSearch/conditional_search.imageset/conditional_search@2x.png b/OrderScheduling/Assets.xcassets/ConditionalSearch/conditional_search.imageset/conditional_search@2x.png index d7a5e1f..7e64101 100644 Binary files a/OrderScheduling/Assets.xcassets/ConditionalSearch/conditional_search.imageset/conditional_search@2x.png and b/OrderScheduling/Assets.xcassets/ConditionalSearch/conditional_search.imageset/conditional_search@2x.png differ diff --git a/OrderScheduling/Assets.xcassets/ConditionalSearch/conditional_search.imageset/conditional_search@3x.png b/OrderScheduling/Assets.xcassets/ConditionalSearch/conditional_search.imageset/conditional_search@3x.png index aa3f95f..5990f83 100644 Binary files a/OrderScheduling/Assets.xcassets/ConditionalSearch/conditional_search.imageset/conditional_search@3x.png and b/OrderScheduling/Assets.xcassets/ConditionalSearch/conditional_search.imageset/conditional_search@3x.png differ diff --git a/OrderScheduling/Common/View/ConditionalSearchTool.swift b/OrderScheduling/Common/View/ConditionalSearchTool.swift index 7b5d2d5..7f883a3 100644 --- a/OrderScheduling/Common/View/ConditionalSearchTool.swift +++ b/OrderScheduling/Common/View/ConditionalSearchTool.swift @@ -14,7 +14,7 @@ class ConditionalSearchTool : NSObject { private lazy var searchView = ConditionalSearchView.init() private let disposeBag = DisposeBag() - public let showSearchViewSub = ReplayRelay?>.create(bufferSize: 1) + public let showSearchViewSub = ReplayRelay.create(bufferSize: 1) public var contractSelectedItem : Int? public var contractSelectedItemString : String? @@ -33,8 +33,9 @@ class ConditionalSearchTool : NSObject { showSearchViewSub .observe(on: MainScheduler.instance) - .subscribe(onNext: {[weak self] _ in + .subscribe(onNext: {[weak self] bottom in if let searchView = self?.searchView { + searchView.updateLayout(bottom: bottom) ENTRY.showSearchEntry(view: searchView,name: conitionalSearchEntry) } }) @@ -77,7 +78,7 @@ class ConditionalSearchTool : NSObject { searchView.fromDateButton.rx.tap .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in - CP.showDate(maxDate: Date.init()) {[weak self] date, dateString in + CP.showDate() {[weak self] date, dateString in self?.fromSelectedItem = dateString DispatchQueue.main.async { @@ -90,7 +91,7 @@ class ConditionalSearchTool : NSObject { searchView.toDateButton.rx.tap .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in - CP.showDate(maxDate: Date.init()) {[weak self] date, dateString in + CP.showDate() {[weak self] date, dateString in self?.toSelectedItem = dateString DispatchQueue.main.async { diff --git a/OrderScheduling/Common/View/ConditionalSearchView.swift b/OrderScheduling/Common/View/ConditionalSearchView.swift index 6a4d753..79d6101 100644 --- a/OrderScheduling/Common/View/ConditionalSearchView.swift +++ b/OrderScheduling/Common/View/ConditionalSearchView.swift @@ -15,6 +15,7 @@ class ConditionalSearchView : DDView { public var exitButton : DDButton public var scrollView : DDScrollView public var scrollContentView : DDView + public var bottomView : DDView public var resetButton : DDButton public var searchButton : DDButton @@ -44,6 +45,7 @@ class ConditionalSearchView : DDView { public override init(frame: CGRect) { titleLabel = DDLabel.dd_init(withText: "订单筛选", font: .mediumFont(17), textColor: .hex("000000").alpha(0.8)) exitButton = DDButton.dd_initCustom() + bottomView = DDView.init() scrollView = DDScrollView.init() scrollContentView = DDView.init() resetButton = DDButton.dd_initCustom() @@ -71,20 +73,19 @@ class ConditionalSearchView : DDView { exitButton.setImage(UIImage(named: "conditional_search_exit"), for: .normal) resetButton.setTitle("重置", for: .normal) resetButton.dd_setBackgroundColor(controlBackgroundColor) - searchButton.setTitle("完成", for: .normal) + searchButton.setTitle("搜索", for: .normal) searchButton.dd_setBackgroundColor(.hex("2A5094")) layer.maskedCorners = [.layerMinXMinYCorner,.layerMaxXMinYCorner] layer.masksToBounds = true layer.cornerRadius = auto(16) - - let bottomView = DDView.init() - let contentView = DDView.init() + addSubview(bottomView) bottomView.snp.makeConstraints { make in make.bottom.left.right.equalToSuperview() make.height.equalTo(auto(80)) } + let contentView = DDView.init() contentView.layer.cornerRadius = auto(20) contentView.layer.masksToBounds = true bottomView.addSubview(contentView) @@ -335,4 +336,11 @@ class ConditionalSearchView : DDView { button?.setTitleColor(valueColor, for: .normal) } + func updateLayout(bottom: CGFloat?) { + if let bottom { + bottomView.snp.updateConstraints { make in + make.bottom.equalToSuperview().offset(-bottom) + } + } + } } diff --git a/OrderScheduling/History/ViewController/HistoryController.swift b/OrderScheduling/History/ViewController/HistoryController.swift index c936946..fc58221 100644 --- a/OrderScheduling/History/ViewController/HistoryController.swift +++ b/OrderScheduling/History/ViewController/HistoryController.swift @@ -134,7 +134,7 @@ extension HistoryItemController { searchButton.rx.tap .subscribe(onNext: {[weak self] _ in - self?.conditionalSearchTool.showSearchViewSub.accept(nil) + self?.conditionalSearchTool.showSearchViewSub.accept(UIApplication.shared.dd_keyWindow.safeAreaInsets.bottom) }) .disposed(by: disposeBag) @@ -408,7 +408,7 @@ class HistoryItemController : ZDViewController { private var emptyView = EmptyView() private var searchButton = DDButton.dd_initCustom() - private lazy var conditionalSearchTool = ConditionalSearchTool() + public lazy var conditionalSearchTool = ConditionalSearchTool() public init(type:OrderTypeEnum) { self.type = type @@ -447,11 +447,11 @@ class HistoryItemController : ZDViewController { searchButton.backgroundColor = .hex("2A5094") searchButton.setImage(UIImage(named: "conditional_search"), for: .normal) view.addSubview(searchButton) - searchButton.layer.cornerRadius = auto(15) + searchButton.layer.cornerRadius = auto(20) searchButton.snp.remakeConstraints { make in make.bottom.equalTo(historyItemView.snp.bottom).offset(-auto(30)) make.right.equalTo(historyItemView.snp.right).offset(-auto(20)) - make.width.height.equalTo(auto(30)) + make.width.height.equalTo(auto(40)) } } } diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index 3c2e47a..896b47f 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -17,6 +17,7 @@ import MJRefresh import DDWebImageKit_Private import ESTabBarController_swift import DDUtilsSwiftKit_Private +import DDAudioPlayerKit_Private // MARK: Action extension RescueController { @@ -200,7 +201,7 @@ extension RescuePendingOrderController { searchButton.rx.tap .subscribe(onNext: {[weak self] _ in - self?.conditionalSearchTool.showSearchViewSub.accept(nil) + self?.conditionalSearchTool.showSearchViewSub.accept(UIApplication.shared.dd_keyWindow.safeAreaInsets.bottom) }) .disposed(by: disposeBag) @@ -358,7 +359,7 @@ extension RescuePendingDispatchController { searchButton.rx.tap .subscribe(onNext: {[weak self] _ in - self?.conditionalSearchTool.showSearchViewSub.accept(nil) + self?.conditionalSearchTool.showSearchViewSub.accept(UIApplication.shared.dd_keyWindow.safeAreaInsets.bottom) }) .disposed(by: disposeBag) @@ -447,7 +448,7 @@ extension RescueIsIngController { searchButton.rx.tap .subscribe(onNext: {[weak self] _ in - self?.conditionalSearchTool.showSearchViewSub.accept(nil) + self?.conditionalSearchTool.showSearchViewSub.accept(UIApplication.shared.dd_keyWindow.safeAreaInsets.bottom) }) .disposed(by: disposeBag) @@ -1219,11 +1220,11 @@ class RescuePendingOrderController : ZDViewController { searchButton.backgroundColor = .hex("2A5094") searchButton.setImage(UIImage(named: "conditional_search"), for: .normal) view.addSubview(searchButton) - searchButton.layer.cornerRadius = auto(15) + searchButton.layer.cornerRadius = auto(20) searchButton.snp.remakeConstraints { make in make.bottom.equalTo(pendingOrderView.snp.bottom).offset(-auto(30)) make.right.equalTo(pendingOrderView.snp.right).offset(-auto(20)) - make.width.height.equalTo(auto(30)) + make.width.height.equalTo(auto(40)) } } } @@ -1269,11 +1270,11 @@ class RescuePendingDispatchController : ZDViewController { searchButton.backgroundColor = .hex("2A5094") searchButton.setImage(UIImage(named: "conditional_search"), for: .normal) view.addSubview(searchButton) - searchButton.layer.cornerRadius = auto(15) + searchButton.layer.cornerRadius = auto(20) searchButton.snp.remakeConstraints { make in make.bottom.equalTo(pendingDispatchView.snp.bottom).offset(-auto(30)) make.right.equalTo(pendingDispatchView.snp.right).offset(-auto(20)) - make.width.height.equalTo(auto(30)) + make.width.height.equalTo(auto(40)) } } } @@ -1319,11 +1320,11 @@ class RescueIsIngController : ZDViewController { searchButton.backgroundColor = .hex("2A5094") searchButton.setImage(UIImage(named: "conditional_search"), for: .normal) view.addSubview(searchButton) - searchButton.layer.cornerRadius = auto(15) + searchButton.layer.cornerRadius = auto(20) searchButton.snp.remakeConstraints { make in make.bottom.equalTo(pendingIsIngView.snp.bottom).offset(-auto(30)) make.right.equalTo(pendingIsIngView.snp.right).offset(-auto(20)) - make.width.height.equalTo(auto(30)) + make.width.height.equalTo(auto(40)) } } } diff --git a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift index 2881d34..4e88bec 100644 --- a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift +++ b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift @@ -120,7 +120,7 @@ extension ReviewFailedController { searchButton.rx.tap .subscribe(onNext: {[weak self] _ in - self?.conditionalSearchTool.showSearchViewSub.accept(nil) + self?.conditionalSearchTool.showSearchViewSub.accept(UIApplication.shared.dd_keyWindow.safeAreaInsets.bottom) }) .disposed(by: disposeBag) @@ -301,11 +301,11 @@ open class ReviewFailedController : ZDViewController { make.bottom.equalTo(-view.safeAreaInsets.bottom) } - searchButton.layer.cornerRadius = auto(15) + searchButton.layer.cornerRadius = auto(20) searchButton.snp.remakeConstraints { make in make.bottom.equalToSuperview().offset(-auto(30) - view.safeAreaInsets.bottom) make.right.equalToSuperview().offset(-auto(20)) - make.width.height.equalTo(auto(30)) + make.width.height.equalTo(auto(40)) } } } diff --git a/fastlane/report.xml b/fastlane/report.xml index f38bebd..8e087dc 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +