筛选bug fixed

OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -427,8 +427,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1073"
+            startingLineNumber = "1056"
-            endingLineNumber = "1073"
+            endingLineNumber = "1056"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1221,8 +1221,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "373"
+            startingLineNumber = "328"
-            endingLineNumber = "373"
+            endingLineNumber = "328"
             landmarkName = "reloadData()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1285,8 +1285,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "275"
+            startingLineNumber = "268"
-            endingLineNumber = "275"
+            endingLineNumber = "268"
             landmarkName = "entry(model:remarkId:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2045,9 +2045,9 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1084"
+            startingLineNumber = "1067"
-            endingLineNumber = "1084"
+            endingLineNumber = "1067"
-            landmarkName = "collectionView(_:cellForItemAt:)"
+            landmarkName = "collectionView(_:didSelectItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -2093,8 +2093,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "350"
+            startingLineNumber = "343"
-            endingLineNumber = "350"
+            endingLineNumber = "343"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2109,8 +2109,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "339"
+            startingLineNumber = "332"
-            endingLineNumber = "339"
+            endingLineNumber = "332"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2125,8 +2125,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "341"
+            startingLineNumber = "334"
-            endingLineNumber = "341"
+            endingLineNumber = "334"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2284,8 +2284,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "166"
+            startingLineNumber = "147"
-            endingLineNumber = "166"
+            endingLineNumber = "147"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2300,8 +2300,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "97"
+            startingLineNumber = "90"
-            endingLineNumber = "97"
+            endingLineNumber = "90"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2316,8 +2316,8 @@
             filePath = "OrderScheduling/History/ViewController/HistoryController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "92"
+            startingLineNumber = "85"
-            endingLineNumber = "92"
+            endingLineNumber = "85"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2380,8 +2380,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "372"
+            startingLineNumber = "327"
-            endingLineNumber = "372"
+            endingLineNumber = "327"
             landmarkName = "reloadData()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2396,8 +2396,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "371"
+            startingLineNumber = "326"
-            endingLineNumber = "371"
+            endingLineNumber = "326"
             landmarkName = "reloadData()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2412,8 +2412,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "276"
+            startingLineNumber = "258"
-            endingLineNumber = "276"
+            endingLineNumber = "258"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2428,8 +2428,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "270"
+            startingLineNumber = "252"
-            endingLineNumber = "270"
+            endingLineNumber = "252"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3003,8 +3003,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "254"
+            startingLineNumber = "236"
-            endingLineNumber = "254"
+            endingLineNumber = "236"
             landmarkName = "init(nibName:bundle:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3419,8 +3419,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1020"
+            startingLineNumber = "1003"
-            endingLineNumber = "1020"
+            endingLineNumber = "1003"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
             <Locations>
@@ -3467,8 +3467,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1025"
+            startingLineNumber = "1008"
-            endingLineNumber = "1025"
+            endingLineNumber = "1008"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3819,8 +3819,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "232"
+            startingLineNumber = "225"
-            endingLineNumber = "232"
+            endingLineNumber = "225"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3835,8 +3835,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "239"
+            startingLineNumber = "232"
-            endingLineNumber = "239"
+            endingLineNumber = "232"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3851,8 +3851,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "109"
+            startingLineNumber = "102"
-            endingLineNumber = "109"
+            endingLineNumber = "102"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3867,8 +3867,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "108"
+            startingLineNumber = "101"
-            endingLineNumber = "108"
+            endingLineNumber = "101"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3883,8 +3883,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "386"
+            startingLineNumber = "379"
-            endingLineNumber = "386"
+            endingLineNumber = "379"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3899,8 +3899,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "396"
+            startingLineNumber = "389"
-            endingLineNumber = "396"
+            endingLineNumber = "389"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3915,9 +3915,9 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "318"
+            startingLineNumber = "311"
-            endingLineNumber = "318"
+            endingLineNumber = "311"
-            landmarkName = "getRefuseParameters(view:model:remarkId:)"
+            landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -3931,8 +3931,8 @@
             filePath = "OrderScheduling/History/ViewController/HistoryController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "141"
+            startingLineNumber = "134"
-            endingLineNumber = "141"
+            endingLineNumber = "134"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -4423,8 +4423,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2140"
+            startingLineNumber = "2046"
-            endingLineNumber = "2140"
+            endingLineNumber = "2046"
             landmarkName = "init(style:reuseIdentifier:)"
             landmarkType = "7">
             <Locations>
@@ -4471,8 +4471,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2147"
+            startingLineNumber = "2053"
-            endingLineNumber = "2147"
+            endingLineNumber = "2053"
             landmarkName = "init(style:reuseIdentifier:)"
             landmarkType = "7">
             <Locations>
@@ -4519,8 +4519,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "699"
+            startingLineNumber = "682"
-            endingLineNumber = "699"
+            endingLineNumber = "682"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4599,8 +4599,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1012"
+            startingLineNumber = "995"
-            endingLineNumber = "1012"
+            endingLineNumber = "995"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
             <Locations>
@@ -5670,8 +5670,8 @@
             filePath = "OrderScheduling/Common/View/ConditionalSearchTool.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "17"
+            startingLineNumber = "21"
-            endingLineNumber = "17"
+            endingLineNumber = "21"
             landmarkName = "ConditionalSearchTool"
             landmarkType = "3">
             <Locations>
@@ -5748,8 +5748,8 @@
             filePath = "OrderScheduling/Common/View/ConditionalSearchTool.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "49"
+            startingLineNumber = "54"
-            endingLineNumber = "49"
+            endingLineNumber = "54"
             landmarkName = "init()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5780,8 +5780,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "78"
+            startingLineNumber = "79"
-            endingLineNumber = "78"
+            endingLineNumber = "79"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5796,8 +5796,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "370"
+            startingLineNumber = "363"
-            endingLineNumber = "370"
+            endingLineNumber = "363"
             landmarkName = "addActions()"
             landmarkType = "7">
             <Locations>
@@ -5844,8 +5844,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1128"
+            startingLineNumber = "1111"
-            endingLineNumber = "1128"
+            endingLineNumber = "1111"
             landmarkName = "addSubviews()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5860,8 +5860,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1171"
+            startingLineNumber = "1140"
-            endingLineNumber = "1171"
+            endingLineNumber = "1140"
             landmarkName = "addSubviews()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5876,10 +5876,10 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1224"
+            startingLineNumber = "1193"
-            endingLineNumber = "1224"
+            endingLineNumber = "1193"
-            landmarkName = "acceptOrderRelay"
+            landmarkName = "viewDidLoad()"
-            landmarkType = "24">
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -5892,10 +5892,10 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1290"
+            startingLineNumber = "1238"
-            endingLineNumber = "1290"
+            endingLineNumber = "1238"
-            landmarkName = "emptyView"
+            landmarkName = "viewDidLoad()"
-            landmarkType = "24">
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -5908,10 +5908,26 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1355"
+            startingLineNumber = "1282"
-            endingLineNumber = "1355"
+            endingLineNumber = "1282"
-            landmarkName = "emptyView"
+            landmarkName = "viewDidLoad()"
-            landmarkType = "24">
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "26D99E75-56EA-462E-9E2B-DE87BB0CEA62"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "149"
+            endingLineNumber = "149"
+            landmarkName = "addActions()"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

OrderScheduling/Common/View/ConditionalSearchTool.swift

@@ -11,8 +11,12 @@ import RxRelay
 import RxCocoa
 import SnapKit
 import DDControlsKit_Private
+import DDAutoUIKit_Private
 
 class ConditionalSearchTool : NSObject {
+    enum FilterButtonTypeEnum {
+    case rescue,reviewFailed,history
+    }
     
     public lazy var searchView = ConditionalSearchView.init()
     public lazy var coverView = DDView()
@@ -44,6 +48,7 @@ class ConditionalSearchTool : NSObject {
     public var searchSub = ReplayRelay<Any?>.create(bufferSize: 1)
     
     public var isFilterSub = ReplayRelay<Bool>.create(bufferSize: 1)
+    public var isShowed : Bool = false
     
     override init() {
         super.init()
@@ -171,4 +176,105 @@ class ConditionalSearchTool : NSObject {
         }
         return false
     }
+    
+    func dismissFilterView(at superView: UIView?) {
+        isShowed = false
+        
+        searchView.snp.updateConstraints({ make in
+            make.height.equalTo(0)
+        })
+        
+        UIView.animate(withDuration: 0.25) {
+            superView?.layoutIfNeeded()
+        }
+        
+        coverView.isHidden = true
+    }
+    
+    func showFilterView(at superView: UIView?) {
+        isShowed = true
+        
+        searchView.snp.updateConstraints({ make in
+            make.height.equalTo(auto(450))
+        })
+        
+        UIView.animate(withDuration: 0.25) {
+            superView?.layoutIfNeeded()
+        }
+        
+        coverView.isHidden = false
+    }
+    
+    func isShowOrDismissFilterView(at superView: UIView?) {
+        if isShowed == true {
+            dismissFilterView(at: superView)
+        }else{
+            showFilterView(at: superView)
+        }
+    }
+    
+    func addFilterView(at superView: UIView?) {
+        superView?.addSubview(coverView)
+        superView?.addSubview(searchView)
+        
+        coverView.snp.remakeConstraints({ make in
+            make.edges.equalToSuperview()
+        })
+        
+        searchView.snp.remakeConstraints({ make in
+            make.left.top.right.equalToSuperview()
+            make.height.equalTo(0)
+        })
+    }
+    
+    class func configFilterButton(_ filterButton: DDButton, type: FilterButtonTypeEnum){
+        var backgroundColor : UIColor
+        var titleColor : UIColor
+        if type == .reviewFailed {
+            backgroundColor = .clear
+            titleColor = .hex("FFFFFF").alpha(0.7)
+        }else{
+            backgroundColor = .hex("FAFAFA")
+            titleColor = .hex("737373").alpha(0.55)
+            
+            let seperateLine = DDView()
+            seperateLine.backgroundColor = .hex("737373").alpha(0.3)
+            filterButton.addSubview(seperateLine)
+            seperateLine.snp.makeConstraints { make in
+                make.centerY.equalTo(filterButton)
+                make.width.equalTo(1)
+                make.height.equalTo(filterButton).multipliedBy(0.5)
+                make.left.equalTo(filterButton.snp.left)
+            }
+        }
+        filterButton.dd_setBackgroundColor(backgroundColor)
+        filterButton.setTitle("筛选", for: .normal)
+        filterButton.setTitleColor(titleColor, for: .normal)
+        filterButton.titleLabel?.font = .regularFont(auto(12))
+        filterButton.setImage(UIImage(named: "conditional_search_unselected")?.withTintColor(titleColor), for: .normal)
+        filterButton.dd_customize(with: .ImageRightPaddingTitleLeftWithWholeCenter, padding: 5)
+    }
+    
+    class func resetFilterButton(_ filterButton: DDButton?, filterState: Bool, type: FilterButtonTypeEnum) {
+        var titleColor : UIColor
+        if type == .reviewFailed {
+            titleColor = .hex("FFFFFF").alpha(0.7)
+        }else{
+            titleColor = .hex("737373").alpha(0.55)
+        }
+        if filterState == true {
+            filterButton?.setTitleColor(.hex("3678FF"), for: .normal)
+            filterButton?.setImage(UIImage(named: "conditional_search"), for: .normal)
+            filterButton?.setTitle("已筛选", for: .normal)
+            filterButton?.dd_customize(with: .ImageRightPaddingTitleLeftWithWholeCenter, padding: 5)
+            filterButton?.sizeToFit()
+        }else{
+            filterButton?.setTitleColor(titleColor, for: .normal)
+            filterButton?.setImage(UIImage(named: "conditional_search_unselected")?.withTintColor(titleColor), for: .normal)
+            filterButton?.setTitle("筛选", for: .normal)
+            filterButton?.dd_customize(with: .ImageRightPaddingTitleLeftWithWholeCenter, padding: 5)
+            filterButton?.sizeToFit()
+        }
+    }
+
 }

OrderScheduling/Common/View/ConditionalSearchView.swift

@@ -196,7 +196,7 @@ class ConditionalSearchView : DDView {
         contractTextFiled.backgroundColor = controlBackgroundColor
         contractTextFiled.layer.cornerRadius = auto(6)
         contractTextFiled.tintColor = .gray
-        contractTextFiled.attributedPlaceholder = NSAttributedString(string: "车主/报案人姓名/电话", attributes: [.foregroundColor : noneColor,.font : UIFont.mediumFont(14)])
+        contractTextFiled.attributedPlaceholder = NSAttributedString(string: "合同名称", attributes: [.foregroundColor : noneColor,.font : UIFont.mediumFont(14)])
         contractTextFiled.textAlignment = .center
         contractTextFiled.font = valueFont
         scrollContentView.addSubview(contractTextFiled)

OrderScheduling/History/ViewController/HistoryController.swift

@@ -68,19 +68,12 @@ extension HistoryController {
             .disposed(by: disposeBag)
         
         filterButton.rx.tap
+            .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
                 if let containerView = self?.categoryView.listContainer as? JXCategoryListContainerView,let selectedIndex = self?.categoryView.selectedIndex {
                     let key = NSNumber(value: selectedIndex)
                     let vc = containerView.validListDict[key] as? HistoryItemController
-                    vc?.conditionalSearchTool.searchView.snp.updateConstraints({ make in
+                    vc?.conditionalSearchTool.isShowOrDismissFilterView(at: vc?.view)
-                        make.height.equalTo(auto(450))
-                    })
-                    
-                    UIView.animate(withDuration: 0.25) {
-                        vc?.view.layoutIfNeeded()
-                    }
-                    
-                    vc?.conditionalSearchTool.coverView.isHidden = false
                 }
             })
             .disposed(by: disposeBag)
@@ -154,7 +147,7 @@ extension HistoryItemController  {
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
                 
-                self?.dismissFilterView()
+                self?.conditionalSearchTool.dismissFilterView(at: self?.historyItemView)
                 
                 self?.historyItemView.tableView.mj_header?.beginRefreshing()
             })
@@ -323,17 +316,7 @@ extension HistoryController : JXCategoryViewDelegate,JXCategoryListContainerView
         vc.conditionalSearchTool.isFilterSub
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] isFilter in
-                if isFilter == true {
+                ConditionalSearchTool.resetFilterButton(self?.filterButton, filterState: isFilter, type: .history)
-                    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)
-                }else{
-                    self?.filterButton.setTitleColor(.hex("737373").alpha(0.55), for: .normal)
-                    self?.filterButton.setImage(UIImage(named: "conditional_search_unselected")?.withTintColor(.hex("737373")), for: .normal)
-                    self?.filterButton.setTitle("筛选", for: .normal)
-                    self?.filterButton.dd_customize(with: .ImageRightPaddingTitleLeftWithWholeCenter, padding: 5)
-                }
             })
             .disposed(by: disposeBag)
         
@@ -343,7 +326,7 @@ extension HistoryController : JXCategoryViewDelegate,JXCategoryListContainerView
 
 open class HistoryController : ZDViewController {
     private let categoryView = JXCategoryTitleView()
-    private let filterButton = DDButton.dd_initCustom()
+    private var filterButton = DDButton.dd_initCustom()
     private lazy var categoryContainerView = JXCategoryListContainerView(type: .scrollView, delegate: self)
     private let reloadToDoMessageCountRelay = ReplayRelay<Any?>.create(bufferSize: 1)
     private let disposeBag = DisposeBag()
@@ -380,21 +363,7 @@ open class HistoryController : ZDViewController {
         categoryView.indicators = [indicator]
         
         /// 筛选
-        let seperateLine = DDView()
+        ConditionalSearchTool.configFilterButton(filterButton, type: .history)
-        seperateLine.backgroundColor = .hex("737373").alpha(0.3)
-        filterButton.addSubview(seperateLine)
-        seperateLine.snp.makeConstraints { make in
-            make.centerY.equalTo(filterButton)
-            make.width.equalTo(1)
-            make.height.equalTo(filterButton).multipliedBy(0.5)
-            make.left.equalTo(filterButton.snp.left)
-        }
-        filterButton.dd_setBackgroundColor(.hex("FAFAFA"))
-        filterButton.setTitle("筛选", for: .normal)
-        filterButton.setTitleColor(.hex("737373").alpha(0.55), for: .normal)
-        filterButton.titleLabel?.font = .regularFont(auto(12))
-        filterButton.setImage(UIImage(named: "conditional_search_unselected")?.withTintColor(.hex("737373")), for: .normal)
-        filterButton.dd_customize(with: .ImageRightPaddingTitleLeftWithWholeCenter, padding: 5)
         view.addSubview(filterButton)
         filterButton.snp.makeConstraints { make in
             make.left.equalTo(categoryView.snp.right)
@@ -496,33 +465,12 @@ class HistoryItemController : ZDViewController {
         historyItemView.tableView.delegate = self
         historyItemView.tableView.dataSource = self
         
-        historyItemView.addSubview(conditionalSearchTool.coverView)
+        conditionalSearchTool.addFilterView(at: historyItemView)
-        conditionalSearchTool.coverView.snp.remakeConstraints({ make in
-            make.edges.equalToSuperview()
-        })
-        
-        historyItemView.addSubview(conditionalSearchTool.searchView)
-        conditionalSearchTool.searchView.snp.remakeConstraints({ make in
-            make.left.top.right.equalToSuperview()
-            make.height.equalTo(0)
-        })
-    }
-    
-    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
     }
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
-        dismissFilterView()
+        conditionalSearchTool.dismissFilterView(at: historyItemView)
     }
     
     open override func viewWillAppear(_ animated: Bool) {

OrderScheduling/Rescue/ViewController/RescueController.swift

@@ -73,19 +73,12 @@ extension RescueController {
             .disposed(by: disposeBag)
         
         filterButton.rx.tap
+            .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
                 if let containerView = self?.categoryView.listContainer as? JXCategoryListContainerView,let selectedIndex = self?.categoryView.selectedIndex {
                     let key = NSNumber(value: selectedIndex)
                     let vc = containerView.validListDict[key] as? RescueParentController
-                    vc?.conditionalSearchTool.searchView.snp.updateConstraints({ make in
+                    vc?.conditionalSearchTool.isShowOrDismissFilterView(at: vc?.view)
-                        make.height.equalTo(auto(450))
-                    })
-                    
-                    UIView.animate(withDuration: 0.25) {
-                        vc?.view.layoutIfNeeded()
-                    }
-                    
-                    vc?.conditionalSearchTool.coverView.isHidden = false
                 }
             })
             .disposed(by: disposeBag)
@@ -220,7 +213,7 @@ extension RescuePendingOrderController {
         conditionalSearchTool.searchSub
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
-                self?.dismissFilterView()
+                self?.conditionalSearchTool.dismissFilterView(at: self?.pendingOrderView)
                 
                 self?.pendingOrderView.tableView.mj_header?.beginRefreshing()
             })
@@ -367,7 +360,7 @@ extension RescuePendingDispatchController {
         conditionalSearchTool.searchSub
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
-                self?.dismissFilterView()
+                self?.conditionalSearchTool.dismissFilterView(at: self?.pendingDispatchView)
                 
                 self?.pendingDispatchView.tableView.mj_header?.beginRefreshing()
             })
@@ -445,7 +438,7 @@ extension RescueIsIngController {
         conditionalSearchTool.searchSub
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
-                self?.dismissFilterView()
+                self?.conditionalSearchTool.dismissFilterView(at: self?.pendingIsIngView)
                 
                 self?.pendingIsIngView.tableView.mj_header?.beginRefreshing()
             })
@@ -501,17 +494,7 @@ extension RescueController : JXCategoryViewDelegate,JXCategoryListContainerViewD
         vc.conditionalSearchTool.isFilterSub
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] isFilter in
-                if isFilter == true {
+                ConditionalSearchTool.resetFilterButton(self?.filterButton, filterState: isFilter, type: .rescue)
-                    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)
-                }else{
-                    self?.filterButton.setTitleColor(.hex("737373").alpha(0.55), for: .normal)
-                    self?.filterButton.setImage(UIImage(named: "conditional_search_unselected")?.withTintColor(.hex("737373")), for: .normal)
-                    self?.filterButton.setTitle("筛选", for: .normal)
-                    self?.filterButton.dd_customize(with: .ImageRightPaddingTitleLeftWithWholeCenter, padding: 5)
-                }
             })
             .disposed(by: disposeBag)
         
@@ -1136,21 +1119,7 @@ class RescueController : ZDViewController {
         }
         
         /// 筛选
-        let seperateLine = DDView()
+        ConditionalSearchTool.configFilterButton(filterButton, type: .rescue)
-        seperateLine.backgroundColor = .hex("737373").alpha(0.3)
-        filterButton.addSubview(seperateLine)
-        seperateLine.snp.makeConstraints { make in
-            make.centerY.equalTo(filterButton)
-            make.width.equalTo(1)
-            make.height.equalTo(filterButton).multipliedBy(0.5)
-            make.left.equalTo(filterButton.snp.left)
-        }
-        filterButton.dd_setBackgroundColor(.hex("FAFAFA"))
-        filterButton.setTitle("筛选", for: .normal)
-        filterButton.setTitleColor(.hex("737373").alpha(0.55), for: .normal)
-        filterButton.titleLabel?.font = .regularFont(auto(12))
-        filterButton.setImage(UIImage(named: "conditional_search_unselected")?.withTintColor(.hex("737373")), for: .normal)
-        filterButton.dd_customize(with: .ImageRightPaddingTitleLeftWithWholeCenter, padding: 5)
         view.addSubview(filterButton)
         filterButton.snp.makeConstraints { make in
             make.left.equalTo(categoryView.snp.right)
@@ -1242,33 +1211,12 @@ class RescuePendingOrderController : RescueParentController {
         pendingOrderView.tableView.delegate = self
         pendingOrderView.tableView.dataSource = self
         
-        pendingOrderView.addSubview(conditionalSearchTool.coverView)
+        conditionalSearchTool.addFilterView(at: pendingOrderView)
-        conditionalSearchTool.coverView.snp.remakeConstraints({ make in
-            make.edges.equalToSuperview()
-        })
-        
-        pendingOrderView.addSubview(conditionalSearchTool.searchView)
-        conditionalSearchTool.searchView.snp.remakeConstraints({ make in
-            make.left.top.right.equalToSuperview()
-            make.height.equalTo(0)
-        })
-    }
-    
-    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
     }
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
-        dismissFilterView()
+        conditionalSearchTool.dismissFilterView(at: pendingOrderView)
     }
 }
 
@@ -1307,33 +1255,12 @@ class RescuePendingDispatchController : RescueParentController {
         pendingDispatchView.tableView.delegate = self
         pendingDispatchView.tableView.dataSource = self
         
-        pendingDispatchView.addSubview(conditionalSearchTool.coverView)
+        conditionalSearchTool.addFilterView(at: pendingDispatchView)
-        conditionalSearchTool.coverView.snp.remakeConstraints({ make in
-            make.edges.equalToSuperview()
-        })
-        
-        pendingDispatchView.addSubview(conditionalSearchTool.searchView)
-        conditionalSearchTool.searchView.snp.remakeConstraints({ make in
-            make.left.top.right.equalToSuperview()
-            make.height.equalTo(0)
-        })
-    }
-    
-    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
     }
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
-        dismissFilterView()
+        conditionalSearchTool.dismissFilterView(at: pendingDispatchView)
     }
 }
 
@@ -1372,33 +1299,12 @@ class RescueIsIngController : RescueParentController {
         pendingIsIngView.tableView.delegate = self
         pendingIsIngView.tableView.dataSource = self
 
-        pendingIsIngView.addSubview(conditionalSearchTool.coverView)
+        conditionalSearchTool.addFilterView(at: pendingIsIngView)
-        conditionalSearchTool.coverView.snp.remakeConstraints({ make in
-            make.edges.equalToSuperview()
-        })
-        
-        pendingIsIngView.addSubview(conditionalSearchTool.searchView)
-        conditionalSearchTool.searchView.snp.remakeConstraints({ make in
-            make.left.top.right.equalToSuperview()
-            make.height.equalTo(0)
-        })
-    }
-    
-    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
     }
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
-        dismissFilterView()
+        conditionalSearchTool.dismissFilterView(at: pendingIsIngView)
     }
 }
 

OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift

@@ -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
+                self?.conditionalSearchTool.isShowOrDismissFilterView(at: self?.view)
-                    make.height.equalTo(auto(450))
-                })
-                
-                UIView.animate(withDuration: 0.25) {
-                    self?.view.layoutIfNeeded()
-                }
-                
-                self?.conditionalSearchTool.coverView.isHidden = false
             })
             .disposed(by: disposeBag)
         
         conditionalSearchTool.isFilterSub
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] isFilter in
-                if isFilter == true {
+                ConditionalSearchTool.resetFilterButton(self?.filterButton, filterState: isFilter, type: .reviewFailed)
-                    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()
-                }
             })
             .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)
 //        }
-
+        ConditionalSearchTool.configFilterButton(filterButton,type: .reviewFailed)
-        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)
         
-        reviewFailedView.addSubview(conditionalSearchTool.coverView)
+        conditionalSearchTool.addFilterView(at: reviewFailedView)
-        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() {
@@ -348,19 +315,7 @@ 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 {

fastlane/report.xml

@@ -5,17 +5,17 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000184">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.00017">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: gym" time="58.139487">
+      <testcase classname="fastlane.lanes" name="1: gym" time="64.032872">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: pgyer" time="10.349756">
+      <testcase classname="fastlane.lanes" name="2: pgyer" time="13.002704">
         
       </testcase>