筛选改的和安卓一样

2024-01-05 10:26:33 +08:00
parent 8661e027d0
commit 20404c0603
7 changed files with 178 additions and 119 deletions
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
--- 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 = "1093"
-            endingLineNumber = "1093"
+            startingLineNumber = "1073"
+            endingLineNumber = "1073"
            landmarkName = "collectionView(_:cellForItemAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -1221,8 +1221,8 @@
            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "357"
-            endingLineNumber = "357"
+            startingLineNumber = "373"
+            endingLineNumber = "373"
            landmarkName = "reloadData()"
            landmarkType = "7">
         </BreakpointContent>
@@ -1285,8 +1285,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "283"
-            endingLineNumber = "283"
+            startingLineNumber = "275"
+            endingLineNumber = "275"
            landmarkName = "entry(model:remarkId:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -2045,9 +2045,9 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1104"
-            endingLineNumber = "1104"
-            landmarkName = "collectionView(_:didSelectItemAt:)"
+            startingLineNumber = "1084"
+            endingLineNumber = "1084"
+            landmarkName = "collectionView(_:cellForItemAt:)"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
@@ -2093,8 +2093,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "358"
-            endingLineNumber = "358"
+            startingLineNumber = "350"
+            endingLineNumber = "350"
            landmarkName = "addActions()"
            landmarkType = "7">
         </BreakpointContent>
@@ -2109,8 +2109,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "347"
-            endingLineNumber = "347"
+            startingLineNumber = "339"
+            endingLineNumber = "339"
            landmarkName = "addActions()"
            landmarkType = "7">
         </BreakpointContent>
@@ -2125,8 +2125,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "349"
-            endingLineNumber = "349"
+            startingLineNumber = "341"
+            endingLineNumber = "341"
            landmarkName = "addActions()"
            landmarkType = "7">
         </BreakpointContent>
@@ -2284,8 +2284,8 @@
            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "168"
-            endingLineNumber = "168"
+            startingLineNumber = "166"
+            endingLineNumber = "166"
            landmarkName = "addActions()"
            landmarkType = "7">
         </BreakpointContent>
@@ -2380,8 +2380,8 @@
            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "356"
-            endingLineNumber = "356"
+            startingLineNumber = "372"
+            endingLineNumber = "372"
            landmarkName = "reloadData()"
            landmarkType = "7">
         </BreakpointContent>
@@ -2396,8 +2396,8 @@
            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "355"
-            endingLineNumber = "355"
+            startingLineNumber = "371"
+            endingLineNumber = "371"
            landmarkName = "reloadData()"
            landmarkType = "7">
         </BreakpointContent>
@@ -2412,8 +2412,8 @@
            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "278"
-            endingLineNumber = "278"
+            startingLineNumber = "276"
+            endingLineNumber = "276"
            landmarkName = "viewDidLoad()"
            landmarkType = "7">
         </BreakpointContent>
@@ -2428,8 +2428,8 @@
            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "272"
-            endingLineNumber = "272"
+            startingLineNumber = "270"
+            endingLineNumber = "270"
            landmarkName = "viewDidLoad()"
            landmarkType = "7">
         </BreakpointContent>
@@ -3003,8 +3003,8 @@
            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "256"
-            endingLineNumber = "256"
+            startingLineNumber = "254"
+            endingLineNumber = "254"
            landmarkName = "init(nibName:bundle:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -3419,8 +3419,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1040"
-            endingLineNumber = "1040"
+            startingLineNumber = "1020"
+            endingLineNumber = "1020"
            landmarkName = "tableView(_:cellForRowAt:)"
            landmarkType = "7">
            <Locations>
@@ -3467,8 +3467,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1045"
-            endingLineNumber = "1045"
+            startingLineNumber = "1025"
+            endingLineNumber = "1025"
            landmarkName = "tableView(_:cellForRowAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -3819,8 +3819,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "240"
-            endingLineNumber = "240"
+            startingLineNumber = "232"
+            endingLineNumber = "232"
            landmarkName = "addActions()"
            landmarkType = "7">
         </BreakpointContent>
@@ -3835,8 +3835,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "247"
-            endingLineNumber = "247"
+            startingLineNumber = "239"
+            endingLineNumber = "239"
            landmarkName = "addActions()"
            landmarkType = "7">
         </BreakpointContent>
@@ -3883,8 +3883,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "402"
-            endingLineNumber = "402"
+            startingLineNumber = "386"
+            endingLineNumber = "386"
            landmarkName = "addActions()"
            landmarkType = "7">
         </BreakpointContent>
@@ -3899,8 +3899,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "412"
-            endingLineNumber = "412"
+            startingLineNumber = "396"
+            endingLineNumber = "396"
            landmarkName = "addActions()"
            landmarkType = "7">
         </BreakpointContent>
@@ -3915,9 +3915,9 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "326"
-            endingLineNumber = "326"
-            landmarkName = "addActions()"
+            startingLineNumber = "318"
+            endingLineNumber = "318"
+            landmarkName = "getRefuseParameters(view:model:remarkId:)"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
@@ -4423,8 +4423,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2109"
-            endingLineNumber = "2109"
+            startingLineNumber = "2140"
+            endingLineNumber = "2140"
            landmarkName = "init(style:reuseIdentifier:)"
            landmarkType = "7">
            <Locations>
@@ -4471,8 +4471,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2116"
-            endingLineNumber = "2116"
+            startingLineNumber = "2147"
+            endingLineNumber = "2147"
            landmarkName = "init(style:reuseIdentifier:)"
            landmarkType = "7">
            <Locations>
@@ -4519,8 +4519,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "719"
-            endingLineNumber = "719"
+            startingLineNumber = "699"
+            endingLineNumber = "699"
            landmarkName = "tableView(_:cellForRowAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -4599,8 +4599,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1032"
-            endingLineNumber = "1032"
+            startingLineNumber = "1012"
+            endingLineNumber = "1012"
            landmarkName = "tableView(_:cellForRowAt:)"
            landmarkType = "7">
            <Locations>
@@ -5796,8 +5796,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "378"
-            endingLineNumber = "378"
+            startingLineNumber = "370"
+            endingLineNumber = "370"
            landmarkName = "addActions()"
            landmarkType = "7">
            <Locations>
@@ -5844,8 +5844,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1148"
-            endingLineNumber = "1148"
+            startingLineNumber = "1128"
+            endingLineNumber = "1128"
            landmarkName = "addSubviews()"
            landmarkType = "7">
         </BreakpointContent>
@@ -5860,8 +5860,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1191"
-            endingLineNumber = "1191"
+            startingLineNumber = "1171"
+            endingLineNumber = "1171"
            landmarkName = "addSubviews()"
            landmarkType = "7">
         </BreakpointContent>
@@ -5876,10 +5876,10 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1244"
-            endingLineNumber = "1244"
-            landmarkName = "viewDidLoad()"
-            landmarkType = "7">
+            startingLineNumber = "1224"
+            endingLineNumber = "1224"
+            landmarkName = "acceptOrderRelay"
+            landmarkType = "24">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
@@ -5892,10 +5892,10 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1293"
-            endingLineNumber = "1293"
-            landmarkName = "viewDidLoad()"
-            landmarkType = "7">
+            startingLineNumber = "1290"
+            endingLineNumber = "1290"
+            landmarkName = "emptyView"
+            landmarkType = "24">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
@@ -5908,10 +5908,10 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1341"
-            endingLineNumber = "1341"
-            landmarkName = "viewDidLoad()"
-            landmarkType = "7">
+            startingLineNumber = "1355"
+            endingLineNumber = "1355"
+            landmarkName = "emptyView"
+            landmarkType = "24">
         </BreakpointContent>
      </BreakpointProxy>
   </Breakpoints>
--- a/OrderScheduling/Common/View/ConditionalSearchTool.swift
+++ b/OrderScheduling/Common/View/ConditionalSearchTool.swift
@@ -148,8 +148,6 @@ class ConditionalSearchTool : NSObject {
                self?.serviceSelectedItemString = nil
                self?.serviceNameItem = nil

-//                self?.resetSub.accept(nil)
-//                self?.isFilterSub.accept(self?.isFiltered() ?? false)
            })
            .disposed(by: disposeBag)
        
@@ -168,7 +166,7 @@ class ConditionalSearchTool : NSObject {
    }
    
    func isFiltered() -> Bool {
-        if orderCodeItem?.isEmpty == false || carOwnerItem?.isEmpty == false || licenseItem?.isEmpty == false || serviceSelectedItem != nil || fromSelectedItem?.isEmpty == false || toSelectedItem?.isEmpty == false || serviceSelectedItem != nil || serviceNameItem?.isEmpty == false {
+        if orderCodeItem?.isEmpty == false || carOwnerItem?.isEmpty == false || licenseItem?.isEmpty == false || contractSelectedItem != nil || contractNameItem?.isEmpty == false || fromSelectedItem?.isEmpty == false || toSelectedItem?.isEmpty == false || serviceSelectedItem != nil || serviceNameItem?.isEmpty == false {
            return true
        }
        return false
--- a/OrderScheduling/History/ViewController/HistoryController.swift
+++ b/OrderScheduling/History/ViewController/HistoryController.swift
@@ -153,15 +153,8 @@ extension HistoryItemController  {
        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?.dismissFilterView()
                
                self?.historyItemView.tableView.mj_header?.beginRefreshing()
            })
@@ -333,9 +326,13 @@ extension HistoryController : JXCategoryViewDelegate,JXCategoryListContainerView
                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)
                }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)
@@ -511,6 +508,23 @@ class HistoryItemController : ZDViewController {
        })
    }
    
+    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()
+    }
+    
    open override func viewWillAppear(_ animated: Bool) {
        super.viewWillAppear(animated)
        
--- a/OrderScheduling/Rescue/ViewController/RescueController.swift
+++ b/OrderScheduling/Rescue/ViewController/RescueController.swift
@@ -220,15 +220,7 @@ extension RescuePendingOrderController {
        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?.dismissFilterView()
                
                self?.pendingOrderView.tableView.mj_header?.beginRefreshing()
            })
@@ -375,15 +367,7 @@ extension RescuePendingDispatchController {
        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?.dismissFilterView()
                
                self?.pendingDispatchView.tableView.mj_header?.beginRefreshing()
            })
@@ -461,15 +445,7 @@ extension RescueIsIngController {
        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?.dismissFilterView()
                
                self?.pendingIsIngView.tableView.mj_header?.beginRefreshing()
            })
@@ -528,9 +504,13 @@ extension RescueController : JXCategoryViewDelegate,JXCategoryListContainerViewD
                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)
                }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)
@@ -1273,6 +1253,23 @@ class RescuePendingOrderController : RescueParentController {
            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()
+    }
 }

 // MARK: 待派车
@@ -1321,6 +1318,23 @@ class RescuePendingDispatchController : RescueParentController {
            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()
+    }
 }

 // MARK: 救援中
@@ -1369,6 +1383,23 @@ class RescueIsIngController : RescueParentController {
            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()
+    }
 }


--- a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift
+++ b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift
@@ -138,9 +138,15 @@ extension ReviewFailedController {
                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()
                }
            })
            .disposed(by: disposeBag)
@@ -148,15 +154,7 @@ extension ReviewFailedController {
        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?.dismissFilterView()
                
                self?.reviewFailedView.tableView.mj_header?.beginRefreshing()
            })
@@ -347,6 +345,24 @@ open class ReviewFailedController : ZDViewController {
        conditionalSearchTool.isFilterSub.accept(conditionalSearchTool.isFiltered())
    }

+    open override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        
+        dismissFilterView()
+    }
+    
+    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
    }
--- a/fastlane/report.xml
+++ b/fastlane/report.xml
@@ -5,17 +5,17 @@
    
    
      
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.00022">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000184">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="1: gym" time="75.087357">
+      <testcase classname="fastlane.lanes" name="1: gym" time="58.139487">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="2: pgyer" time="14.619423">
+      <testcase classname="fastlane.lanes" name="2: pgyer" time="10.349756">
        
      </testcase>