筛选功能约束问题
This commit is contained in:
DDIsFriend
@@ -35,23 +35,23 @@ extension ReviewFailedController {
|
||||
})
|
||||
.disposed(by: disposeBag)
|
||||
|
||||
MCOUNT.pendingCountRelay
|
||||
.observe(on: MainScheduler.instance)
|
||||
.subscribe(onNext: {[weak self] count in
|
||||
if count > 0 {
|
||||
self?.pendingView.countLabel.isHidden = false
|
||||
self?.pendingView.countLabel.text = String(count)
|
||||
self?.pendingView.countLabel.snp.updateConstraints({ make in
|
||||
make.width.equalTo(20)
|
||||
})
|
||||
}else{
|
||||
self?.pendingView.countLabel.isHidden = true
|
||||
self?.pendingView.countLabel.snp.updateConstraints({ make in
|
||||
make.width.equalTo(0)
|
||||
})
|
||||
}
|
||||
})
|
||||
.disposed(by: disposeBag)
|
||||
// MCOUNT.pendingCountRelay
|
||||
// .observe(on: MainScheduler.instance)
|
||||
// .subscribe(onNext: {[weak self] count in
|
||||
// if count > 0 {
|
||||
// self?.pendingView.countLabel.isHidden = false
|
||||
// self?.pendingView.countLabel.text = String(count)
|
||||
// self?.pendingView.countLabel.snp.updateConstraints({ make in
|
||||
// make.width.equalTo(20)
|
||||
// })
|
||||
// }else{
|
||||
// self?.pendingView.countLabel.isHidden = true
|
||||
// self?.pendingView.countLabel.snp.updateConstraints({ make in
|
||||
// make.width.equalTo(0)
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
// .disposed(by: disposeBag)
|
||||
|
||||
reviewFailedView.tableView.mj_header = MJRefreshNormalHeader(refreshingBlock: {[weak self] in
|
||||
self?.pageNum = 1
|
||||
@@ -111,29 +111,53 @@ extension ReviewFailedController {
|
||||
})
|
||||
.disposed(by: disposeBag)
|
||||
|
||||
pendingTapGes.rx.event
|
||||
.observe(on: MainScheduler.instance)
|
||||
.subscribe(onNext: { _ in
|
||||
WEBTOOL.open(name: .todoList,appending: nil)
|
||||
// pendingTapGes.rx.event
|
||||
// .observe(on: MainScheduler.instance)
|
||||
// .subscribe(onNext: { _ in
|
||||
// WEBTOOL.open(name: .todoList,appending: nil)
|
||||
// })
|
||||
// .disposed(by: disposeBag)
|
||||
|
||||
filterButton.rx.tap
|
||||
.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
|
||||
})
|
||||
.disposed(by: disposeBag)
|
||||
|
||||
searchButton.rx.tap
|
||||
.subscribe(onNext: {[weak self] _ in
|
||||
self?.conditionalSearchTool.showSearchViewSub.accept(UIApplication.shared.dd_keyWindow.safeAreaInsets.bottom)
|
||||
})
|
||||
.disposed(by: disposeBag)
|
||||
|
||||
conditionalSearchTool.resetSub
|
||||
conditionalSearchTool.isFilterSub
|
||||
.observe(on: MainScheduler.instance)
|
||||
.subscribe(onNext: {[weak self] _ in
|
||||
self?.reviewFailedView.tableView.mj_header?.beginRefreshing()
|
||||
.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)
|
||||
}else{
|
||||
self?.filterButton.setTitleColor(.hex("FFFFFF").alpha(0.7), for: .normal)
|
||||
self?.filterButton.setImage(UIImage(named: "conditional_search_unselected")?.withTintColor(.hex("FFFFFF")), for: .normal)
|
||||
}
|
||||
})
|
||||
.disposed(by: disposeBag)
|
||||
|
||||
conditionalSearchTool.searchSub
|
||||
.observe(on: MainScheduler.instance)
|
||||
.subscribe(onNext: {[weak self] _ in
|
||||
self?.conditionalSearchTool.searchView.snp.updateConstraints({ make in
|
||||
make.height.equalTo(0)
|
||||
})
|
||||
|
||||
UIView.animate(withDuration: 0.25) {
|
||||
self?.conditionalSearchTool.searchView.superview?.layoutIfNeeded()
|
||||
}
|
||||
|
||||
self?.conditionalSearchTool.coverView.isHidden = true
|
||||
|
||||
self?.reviewFailedView.tableView.mj_header?.beginRefreshing()
|
||||
})
|
||||
.disposed(by: disposeBag)
|
||||
@@ -215,11 +239,11 @@ open class ReviewFailedController : ZDViewController {
|
||||
private var resultArr : [OrderListDataModel] = []
|
||||
private let messageTapGes = UITapGestureRecognizer()
|
||||
private let messageView = MessageView()
|
||||
private let pendingTapGes = UITapGestureRecognizer()
|
||||
private let pendingView = MessageView()
|
||||
// private let pendingTapGes = UITapGestureRecognizer()
|
||||
// private let pendingView = MessageView()
|
||||
private var emptyView = EmptyView()
|
||||
|
||||
private var searchButton = DDButton.dd_initCustom()
|
||||
private let filterButton = DDButton.dd_initCustom()
|
||||
private lazy var conditionalSearchTool = ConditionalSearchTool()
|
||||
|
||||
public override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
|
||||
@@ -277,18 +301,32 @@ open class ReviewFailedController : ZDViewController {
|
||||
make.width.greaterThanOrEqualTo(40)
|
||||
}
|
||||
|
||||
pendingView.titleLabel.text = "待办"
|
||||
pendingView.addGestureRecognizer(pendingTapGes)
|
||||
navigationItem.rightBarButtonItem = UIBarButtonItem(customView: pendingView)
|
||||
pendingView.snp.makeConstraints { make in
|
||||
make.height.equalTo(40)
|
||||
make.width.greaterThanOrEqualTo(40)
|
||||
}
|
||||
// pendingView.titleLabel.text = "待办"
|
||||
// pendingView.addGestureRecognizer(pendingTapGes)
|
||||
// navigationItem.rightBarButtonItem = UIBarButtonItem(customView: pendingView)
|
||||
// pendingView.snp.makeConstraints { make in
|
||||
// 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)
|
||||
navigationItem.rightBarButtonItem = UIBarButtonItem(customView: filterButton)
|
||||
|
||||
searchButton.backgroundColor = .hex("2A5094")
|
||||
searchButton.setImage(UIImage(named: "conditional_search"), for: .normal)
|
||||
view.addSubview(searchButton)
|
||||
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)
|
||||
})
|
||||
}
|
||||
|
||||
open override func viewSafeAreaInsetsDidChange() {
|
||||
@@ -300,16 +338,15 @@ open class ReviewFailedController : ZDViewController {
|
||||
make.left.right.equalToSuperview()
|
||||
make.bottom.equalTo(-view.safeAreaInsets.bottom)
|
||||
}
|
||||
|
||||
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(40))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
open override func viewWillAppear(_ animated: Bool) {
|
||||
super.viewWillAppear(animated)
|
||||
|
||||
conditionalSearchTool.isFilterSub.accept(conditionalSearchTool.isFiltered())
|
||||
}
|
||||
|
||||
open override var preferredStatusBarStyle: UIStatusBarStyle {
|
||||
return .lightContent
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user