dezhong/OrderScheduling
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

筛选bug fixed

Browse Source
This commit is contained in:
DDIsFriend
2024-01-05 13:24:20 +08:00
parent 20404c0603
commit db04b43af5
8 changed files with 245 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift
View File

@@ -119,42 +119,23 @@ extension ReviewFailedController {
// .disposed(by: disposeBag)
filterButton.rx.tap
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
self?.conditionalSearchTool.searchView.snp.updateConstraints({ make in
make.height.equalTo(auto(450))
})
UIView.animate(withDuration: 0.25) {
self?.view.layoutIfNeeded()
}
self?.conditionalSearchTool.coverView.isHidden = false
self?.conditionalSearchTool.isShowOrDismissFilterView(at: self?.view)
})
.disposed(by: disposeBag)
conditionalSearchTool.isFilterSub
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] isFilter in
if isFilter == true {
self?.filterButton.setTitleColor(.hex("3678FF"), for: .normal)
self?.filterButton.setImage(UIImage(named: "conditional_search"), for: .normal)
self?.filterButton.setTitle("已筛选", for: .normal)
self?.filterButton.dd_customize(with: .ImageRightPaddingTitleLeftWithWholeCenter, padding: 5)
self?.filterButton.sizeToFit()
}else{
self?.filterButton.setTitleColor(.hex("FFFFFF").alpha(0.7), for: .normal)
self?.filterButton.setImage(UIImage(named: "conditional_search_unselected")?.withTintColor(.hex("FFFFFF")), for: .normal)
self?.filterButton.setTitle("筛选", for: .normal)
self?.filterButton.dd_customize(with: .ImageRightPaddingTitleLeftWithWholeCenter, padding: 5)
self?.filterButton.sizeToFit()
}
ConditionalSearchTool.resetFilterButton(self?.filterButton, filterState: isFilter, type: .reviewFailed)
})
.disposed(by: disposeBag)
conditionalSearchTool.searchSub
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
self?.dismissFilterView()
self?.conditionalSearchTool.dismissFilterView(at: self?.reviewFailedView)
self?.reviewFailedView.tableView.mj_header?.beginRefreshing()
})
@@ -165,6 +146,7 @@ extension ReviewFailedController {
.subscribe(onNext: {[weak self] _ in
MCOUNT.newestMessage()
self?.reviewFailedView.tableView.mj_header?.beginRefreshing()
self?.conditionalSearchTool.resetSub.accept(nil)
})
.disposed(by: disposeBag)
@@ -306,25 +288,10 @@ open class ReviewFailedController : ZDViewController {
// make.height.equalTo(40)
// make.width.greaterThanOrEqualTo(40)
// }
filterButton.setTitle("筛选", for: .normal)
filterButton.setTitleColor(.hex("FFFFFF").alpha(0.7), for: .normal)
filterButton.titleLabel?.font = .mediumFont(auto(14))
filterButton.setImage(UIImage(named: "conditional_search_unselected")?.withTintColor(.hex("FFFFFF")), for: .normal)
filterButton.dd_customize(with: .ImageRightPaddingTitleLeftWithWholeCenter, padding: 5)
ConditionalSearchTool.configFilterButton(filterButton,type: .reviewFailed)
navigationItem.rightBarButtonItem = UIBarButtonItem(customView: filterButton)
reviewFailedView.addSubview(conditionalSearchTool.coverView)
reviewFailedView.addSubview(conditionalSearchTool.searchView)
conditionalSearchTool.coverView.snp.remakeConstraints({ make in
make.edges.equalToSuperview()
})
conditionalSearchTool.searchView.snp.remakeConstraints({ make in
make.left.top.right.equalToSuperview()
make.height.equalTo(0)
})
conditionalSearchTool.addFilterView(at: reviewFailedView)
}
open override func viewSafeAreaInsetsDidChange() {
@@ -348,21 +315,9 @@ open class ReviewFailedController : ZDViewController {
open override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
dismissFilterView()
conditionalSearchTool.dismissFilterView(at: reviewFailedView)
}
func dismissFilterView() {
conditionalSearchTool.searchView.snp.updateConstraints({ make in
make.height.equalTo(0)
})
UIView.animate(withDuration: 0.25) {[weak self] in
self?.conditionalSearchTool.searchView.superview?.layoutIfNeeded()
}
conditionalSearchTool.coverView.isHidden = true
}
open override var preferredStatusBarStyle: UIStatusBarStyle {
return .lightContent
}