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

搜索功能

Browse Source
This commit is contained in:
DDIsFriend
2024-01-03 11:54:31 +08:00
parent 527dc9f97c
commit d2268e3f0a
33 changed files with 887 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,8 +64,8 @@ extension ReviewFailedController {
})
refreshRelay
.flatMapLatest { pageNum in
return Observable.zip(RQ.orderList(parameters: OrderListParameters(pageNum: pageNum, queryType: .TO_AUDIT_FAILED)).asObservable(), Observable.just(pageNum))
.flatMapLatest {[weak self] pageNum in
return Observable.zip(RQ.orderList(parameters: self?.conditionalSearchTool.getParameters(pageNum: pageNum,queryType: .TO_AUDIT_FAILED) ?? OrderListParameters(pageNum: pageNum, queryType: .TO_AUDIT_FAILED)).asObservable(), Observable.just(pageNum))
}
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] (response, pageNum) in
@@ -118,6 +118,26 @@ extension ReviewFailedController {
})
.disposed(by: disposeBag)
searchButton.rx.tap
.subscribe(onNext: {[weak self] _ in
self?.conditionalSearchTool.showSearchViewSub.accept(nil)
})
.disposed(by: disposeBag)
conditionalSearchTool.resetSub
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
self?.reviewFailedView.tableView.mj_header?.beginRefreshing()
})
.disposed(by: disposeBag)
conditionalSearchTool.searchSub
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
self?.reviewFailedView.tableView.mj_header?.beginRefreshing()
})
.disposed(by: disposeBag)
preRefreshRelay
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
@@ -199,6 +219,9 @@ open class ReviewFailedController : ZDViewController {
private let pendingView = MessageView()
private var emptyView = EmptyView()
private var searchButton = DDButton.dd_initCustom()
private lazy var conditionalSearchTool = ConditionalSearchTool()
public override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
MCOUNT.reviewFailedCountRelay
@@ -261,6 +284,11 @@ open class ReviewFailedController : ZDViewController {
make.height.equalTo(40)
make.width.greaterThanOrEqualTo(40)
}
searchButton.backgroundColor = .hex("2A5094")
searchButton.setImage(UIImage(named: "conditional_search"), for: .normal)
view.addSubview(searchButton)
}
open override func viewSafeAreaInsetsDidChange() {
@@ -272,6 +300,13 @@ open class ReviewFailedController : ZDViewController {
make.left.right.equalToSuperview()
make.bottom.equalTo(-view.safeAreaInsets.bottom)
}
searchButton.layer.cornerRadius = auto(15)
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))
}
}
}