修改全屏手机的底部空间，还有测试的一些需求

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

@@ -427,8 +427,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1070"
+            startingLineNumber = "1071"
-            endingLineNumber = "1070"
+            endingLineNumber = "1071"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -698,8 +698,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "70"
+            startingLineNumber = "71"
-            endingLineNumber = "70"
+            endingLineNumber = "71"
             landmarkName = "addActions()"
             landmarkType = "7">
             <Locations>
@@ -1285,8 +1285,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "267"
+            startingLineNumber = "268"
-            endingLineNumber = "267"
+            endingLineNumber = "268"
             landmarkName = "entry(model:remarkId:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2045,8 +2045,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1081"
+            startingLineNumber = "1082"
-            endingLineNumber = "1081"
+            endingLineNumber = "1082"
             landmarkName = "collectionView(_:didSelectItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2093,8 +2093,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "342"
+            startingLineNumber = "343"
-            endingLineNumber = "342"
+            endingLineNumber = "343"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2109,8 +2109,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "331"
+            startingLineNumber = "332"
-            endingLineNumber = "331"
+            endingLineNumber = "332"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2125,8 +2125,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "333"
+            startingLineNumber = "334"
-            endingLineNumber = "333"
+            endingLineNumber = "334"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2300,8 +2300,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "78"
+            startingLineNumber = "79"
-            endingLineNumber = "78"
+            endingLineNumber = "79"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2398,8 +2398,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "318"
             endingLineNumber = "318"
-            landmarkName = "reloadData()"
+            landmarkName = "ReviewFailedController"
-            landmarkType = "7">
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -3419,8 +3419,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1017"
+            startingLineNumber = "1018"
-            endingLineNumber = "1017"
+            endingLineNumber = "1018"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
             <Locations>
@@ -3467,8 +3467,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1022"
+            startingLineNumber = "1023"
-            endingLineNumber = "1022"
+            endingLineNumber = "1023"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3819,8 +3819,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "224"
+            startingLineNumber = "225"
-            endingLineNumber = "224"
+            endingLineNumber = "225"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3835,8 +3835,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "231"
+            startingLineNumber = "232"
-            endingLineNumber = "231"
+            endingLineNumber = "232"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3851,28 +3851,28 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "91"
+            endingLineNumber = "91"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A4DCC1D5-79CD-4B7F-AF77-4B6A0202507D"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
             startingLineNumber = "90"
             endingLineNumber = "90"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "A4DCC1D5-79CD-4B7F-AF77-4B6A0202507D"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "89"
-            endingLineNumber = "89"
-            landmarkName = "addActions()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -3883,8 +3883,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "389"
+            startingLineNumber = "390"
-            endingLineNumber = "389"
+            endingLineNumber = "390"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3899,8 +3899,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "399"
+            startingLineNumber = "400"
-            endingLineNumber = "399"
+            endingLineNumber = "400"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3915,8 +3915,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "310"
+            startingLineNumber = "311"
-            endingLineNumber = "310"
+            endingLineNumber = "311"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -4423,8 +4423,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2050"
+            startingLineNumber = "2051"
-            endingLineNumber = "2050"
+            endingLineNumber = "2051"
             landmarkName = "init(style:reuseIdentifier:)"
             landmarkType = "7">
             <Locations>
@@ -4471,8 +4471,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2057"
+            startingLineNumber = "2058"
-            endingLineNumber = "2057"
+            endingLineNumber = "2058"
             landmarkName = "init(style:reuseIdentifier:)"
             landmarkType = "7">
             <Locations>
@@ -4519,8 +4519,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "696"
+            startingLineNumber = "697"
-            endingLineNumber = "696"
+            endingLineNumber = "697"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4599,8 +4599,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1009"
+            startingLineNumber = "1010"
-            endingLineNumber = "1009"
+            endingLineNumber = "1010"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
             <Locations>
@@ -5660,5 +5660,211 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "B4ED898B-B599-411A-A3DE-B3AEA9AE9AE7"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Common/View/ConditionalSearchTool.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "15"
+            endingLineNumber = "15"
+            landmarkName = "ConditionalSearchTool"
+            landmarkType = "3">
+            <Locations>
+               <Location
+                  uuid = "B4ED898B-B599-411A-A3DE-B3AEA9AE9AE7 - 45140ac5b94ed63c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.ConditionalSearchTool.searchView.getter : OrderScheduling.ConditionalSearchView"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/View/ConditionalSearchTool.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "15"
+                  endingLineNumber = "15"
+                  offsetFromSymbolStart = "608">
+               </Location>
+               <Location
+                  uuid = "B4ED898B-B599-411A-A3DE-B3AEA9AE9AE7 - 87493e3e13a0cbc8"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.ConditionalSearchTool.searchView.setter : OrderScheduling.ConditionalSearchView"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/View/ConditionalSearchTool.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "15"
+                  endingLineNumber = "15"
+                  offsetFromSymbolStart = "0">
+               </Location>
+               <Location
+                  uuid = "B4ED898B-B599-411A-A3DE-B3AEA9AE9AE7 - 14463ed1528f5f39"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.ConditionalSearchTool.searchView.modify : OrderScheduling.ConditionalSearchView"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/View/ConditionalSearchTool.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "15"
+                  endingLineNumber = "15"
+                  offsetFromSymbolStart = "0">
+               </Location>
+               <Location
+                  uuid = "B4ED898B-B599-411A-A3DE-B3AEA9AE9AE7 - e50492d12d045b1b"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.ConditionalSearchTool.searchView.modify : OrderScheduling.ConditionalSearchView with unmangled suffix &quot;.resume.0&quot;"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/%3Ccompiler-generated%3E"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "0"
+                  endingLineNumber = "0"
+                  offsetFromSymbolStart = "20">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "48E81B42-3369-4324-BA64-E7652951DF6F"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Common/View/ConditionalSearchTool.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "32"
+            endingLineNumber = "32"
+            landmarkName = "init()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "BEB59567-5E42-4686-B576-1DDBF87DB80D"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Common/View/ConditionalSearchTool.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "38"
+            endingLineNumber = "38"
+            landmarkName = "init()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "7DE5C61B-A03C-442F-BCB9-81BF4AEEA4CB"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "362"
+            endingLineNumber = "362"
+            landmarkName = "addActions()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "2AA0A341-CD49-4548-90F7-6E0AC6503302"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Common/View/ConditionalSearchView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "340"
+            endingLineNumber = "340"
+            landmarkName = "updateLayout(bottom:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "EFED7A5B-E70B-4B9D-A029-39BC04F78AFF"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Common/View/ConditionalSearchTool.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "37"
+            endingLineNumber = "37"
+            landmarkName = "init()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "1C35974D-0370-4B7E-AC98-C52286B0F664"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Common/View/ConditionalSearchView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "341"
+            endingLineNumber = "341"
+            landmarkName = "updateLayout(bottom:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "1C35974D-0370-4B7E-AC98-C52286B0F664 - b91ec168141fd471"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.ConditionalSearchView.updateLayout(bottom: Swift.Optional&lt;CoreGraphics.CGFloat&gt;) -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/View/ConditionalSearchView.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "341"
+                  endingLineNumber = "341"
+                  offsetFromSymbolStart = "772">
+               </Location>
+               <Location
+                  uuid = "1C35974D-0370-4B7E-AC98-C52286B0F664 - 196bc1da8fca170a"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (SnapKit.ConstraintMaker) -&gt; () in OrderScheduling.ConditionalSearchView.updateLayout(bottom: Swift.Optional&lt;CoreGraphics.CGFloat&gt;) -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Common/View/ConditionalSearchView.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "342"
+                  endingLineNumber = "342"
+                  offsetFromSymbolStart = "540">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

OrderScheduling/Common/View/ConditionalSearchTool.swift

@@ -14,7 +14,7 @@ class ConditionalSearchTool : NSObject {
 
     private lazy var searchView = ConditionalSearchView.init()
     private let disposeBag = DisposeBag()
-    public let showSearchViewSub = ReplayRelay<ControlEvent<Void>?>.create(bufferSize: 1)
+    public let showSearchViewSub = ReplayRelay<CGFloat?>.create(bufferSize: 1)
     
     public var contractSelectedItem : Int?
     public var contractSelectedItemString : String?
@@ -33,8 +33,9 @@ class ConditionalSearchTool : NSObject {
         
         showSearchViewSub
             .observe(on: MainScheduler.instance)
-            .subscribe(onNext: {[weak self] _ in
+            .subscribe(onNext: {[weak self] bottom in
                 if let searchView = self?.searchView {
+                    searchView.updateLayout(bottom: bottom)
                     ENTRY.showSearchEntry(view: searchView,name: conitionalSearchEntry)
                 }
             })
@@ -77,7 +78,7 @@ class ConditionalSearchTool : NSObject {
         searchView.fromDateButton.rx.tap
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
-                CP.showDate(maxDate: Date.init()) {[weak self] date, dateString in
+                CP.showDate() {[weak self] date, dateString in
                     self?.fromSelectedItem = dateString
                     
                     DispatchQueue.main.async {
@@ -90,7 +91,7 @@ class ConditionalSearchTool : NSObject {
         searchView.toDateButton.rx.tap
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
-                CP.showDate(maxDate: Date.init()) {[weak self] date, dateString in
+                CP.showDate() {[weak self] date, dateString in
                     self?.toSelectedItem = dateString
                     
                     DispatchQueue.main.async {

OrderScheduling/Common/View/ConditionalSearchView.swift

@@ -15,6 +15,7 @@ class ConditionalSearchView : DDView {
     public var exitButton : DDButton
     public var scrollView : DDScrollView
     public var scrollContentView : DDView
+    public var bottomView : DDView
     public var resetButton : DDButton
     public var searchButton : DDButton
     
@@ -44,6 +45,7 @@ class ConditionalSearchView : DDView {
     public override init(frame: CGRect) {
         titleLabel = DDLabel.dd_init(withText: "订单筛选", font: .mediumFont(17), textColor: .hex("000000").alpha(0.8))
         exitButton = DDButton.dd_initCustom()
+        bottomView = DDView.init()
         scrollView = DDScrollView.init()
         scrollContentView = DDView.init()
         resetButton = DDButton.dd_initCustom()
@@ -71,20 +73,19 @@ class ConditionalSearchView : DDView {
         exitButton.setImage(UIImage(named: "conditional_search_exit"), for: .normal)
         resetButton.setTitle("重置", for: .normal)
         resetButton.dd_setBackgroundColor(controlBackgroundColor)
-        searchButton.setTitle("完成", for: .normal)
+        searchButton.setTitle("搜索", for: .normal)
         searchButton.dd_setBackgroundColor(.hex("2A5094"))
         layer.maskedCorners = [.layerMinXMinYCorner,.layerMaxXMinYCorner]
         layer.masksToBounds = true
         layer.cornerRadius = auto(16)
  
-        let bottomView = DDView.init()
-        let contentView = DDView.init()
         addSubview(bottomView)
         bottomView.snp.makeConstraints { make in
             make.bottom.left.right.equalToSuperview()
             make.height.equalTo(auto(80))
         }
         
+        let contentView = DDView.init()
         contentView.layer.cornerRadius = auto(20)
         contentView.layer.masksToBounds = true
         bottomView.addSubview(contentView)
@@ -335,4 +336,11 @@ class ConditionalSearchView : DDView {
         button?.setTitleColor(valueColor, for: .normal)
     }
     
+    func updateLayout(bottom: CGFloat?) {
+        if let bottom {
+            bottomView.snp.updateConstraints { make in
+                make.bottom.equalToSuperview().offset(-bottom)
+            }
+        }
+    }
 }

OrderScheduling/History/ViewController/HistoryController.swift

@@ -134,7 +134,7 @@ extension HistoryItemController  {
         
         searchButton.rx.tap
             .subscribe(onNext: {[weak self] _ in
-                self?.conditionalSearchTool.showSearchViewSub.accept(nil)
+                self?.conditionalSearchTool.showSearchViewSub.accept(UIApplication.shared.dd_keyWindow.safeAreaInsets.bottom)
             })
             .disposed(by: disposeBag)
         
@@ -408,7 +408,7 @@ class HistoryItemController : ZDViewController {
     private var emptyView = EmptyView()
 
     private var searchButton = DDButton.dd_initCustom()
-    private lazy var conditionalSearchTool = ConditionalSearchTool()
+    public lazy var conditionalSearchTool = ConditionalSearchTool()
     
     public init(type:OrderTypeEnum) {
         self.type = type
@@ -447,11 +447,11 @@ class HistoryItemController : ZDViewController {
         searchButton.backgroundColor = .hex("2A5094")
         searchButton.setImage(UIImage(named: "conditional_search"), for: .normal)
         view.addSubview(searchButton)
-        searchButton.layer.cornerRadius = auto(15)
+        searchButton.layer.cornerRadius = auto(20)
         searchButton.snp.remakeConstraints { make in
             make.bottom.equalTo(historyItemView.snp.bottom).offset(-auto(30))
             make.right.equalTo(historyItemView.snp.right).offset(-auto(20))
-            make.width.height.equalTo(auto(30))
+            make.width.height.equalTo(auto(40))
         }
     }
 }

OrderScheduling/Rescue/ViewController/RescueController.swift

@@ -17,6 +17,7 @@ import MJRefresh
 import DDWebImageKit_Private
 import ESTabBarController_swift
 import DDUtilsSwiftKit_Private
+import DDAudioPlayerKit_Private
 
 // MARK: Action
 extension RescueController {
@@ -200,7 +201,7 @@ extension RescuePendingOrderController {
         
         searchButton.rx.tap
             .subscribe(onNext: {[weak self] _ in
-                self?.conditionalSearchTool.showSearchViewSub.accept(nil)
+                self?.conditionalSearchTool.showSearchViewSub.accept(UIApplication.shared.dd_keyWindow.safeAreaInsets.bottom)
             })
             .disposed(by: disposeBag)
           
@@ -358,7 +359,7 @@ extension RescuePendingDispatchController {
         
         searchButton.rx.tap
             .subscribe(onNext: {[weak self] _ in
-                self?.conditionalSearchTool.showSearchViewSub.accept(nil)
+                self?.conditionalSearchTool.showSearchViewSub.accept(UIApplication.shared.dd_keyWindow.safeAreaInsets.bottom)
             })
             .disposed(by: disposeBag)
         
@@ -447,7 +448,7 @@ extension RescueIsIngController {
         
         searchButton.rx.tap
             .subscribe(onNext: {[weak self] _ in
-                self?.conditionalSearchTool.showSearchViewSub.accept(nil)
+                self?.conditionalSearchTool.showSearchViewSub.accept(UIApplication.shared.dd_keyWindow.safeAreaInsets.bottom)
             })
             .disposed(by: disposeBag)
         
@@ -1219,11 +1220,11 @@ class RescuePendingOrderController : ZDViewController {
         searchButton.backgroundColor = .hex("2A5094")
         searchButton.setImage(UIImage(named: "conditional_search"), for: .normal)
         view.addSubview(searchButton)
-        searchButton.layer.cornerRadius = auto(15)
+        searchButton.layer.cornerRadius = auto(20)
         searchButton.snp.remakeConstraints { make in
             make.bottom.equalTo(pendingOrderView.snp.bottom).offset(-auto(30))
             make.right.equalTo(pendingOrderView.snp.right).offset(-auto(20))
-            make.width.height.equalTo(auto(30))
+            make.width.height.equalTo(auto(40))
         }
     }
 }
@@ -1269,11 +1270,11 @@ class RescuePendingDispatchController : ZDViewController {
         searchButton.backgroundColor = .hex("2A5094")
         searchButton.setImage(UIImage(named: "conditional_search"), for: .normal)
         view.addSubview(searchButton)
-        searchButton.layer.cornerRadius = auto(15)
+        searchButton.layer.cornerRadius = auto(20)
         searchButton.snp.remakeConstraints { make in
             make.bottom.equalTo(pendingDispatchView.snp.bottom).offset(-auto(30))
             make.right.equalTo(pendingDispatchView.snp.right).offset(-auto(20))
-            make.width.height.equalTo(auto(30))
+            make.width.height.equalTo(auto(40))
         }
     }
 }
@@ -1319,11 +1320,11 @@ class RescueIsIngController : ZDViewController {
         searchButton.backgroundColor = .hex("2A5094")
         searchButton.setImage(UIImage(named: "conditional_search"), for: .normal)
         view.addSubview(searchButton)
-        searchButton.layer.cornerRadius = auto(15)
+        searchButton.layer.cornerRadius = auto(20)
         searchButton.snp.remakeConstraints { make in
             make.bottom.equalTo(pendingIsIngView.snp.bottom).offset(-auto(30))
             make.right.equalTo(pendingIsIngView.snp.right).offset(-auto(20))
-            make.width.height.equalTo(auto(30))
+            make.width.height.equalTo(auto(40))
         }
     }
 }

OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift

@@ -120,7 +120,7 @@ extension ReviewFailedController {
         
         searchButton.rx.tap
             .subscribe(onNext: {[weak self] _ in
-                self?.conditionalSearchTool.showSearchViewSub.accept(nil)
+                self?.conditionalSearchTool.showSearchViewSub.accept(UIApplication.shared.dd_keyWindow.safeAreaInsets.bottom)
             })
             .disposed(by: disposeBag)
         
@@ -301,11 +301,11 @@ open class ReviewFailedController : ZDViewController {
                 make.bottom.equalTo(-view.safeAreaInsets.bottom)
             }
             
-            searchButton.layer.cornerRadius = auto(15)
+            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(30))
+                make.width.height.equalTo(auto(40))
             }
         }
     }

fastlane/report.xml

@@ -5,17 +5,17 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000201">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000229">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: gym" time="59.624824">
+      <testcase classname="fastlane.lanes" name="1: gym" time="87.600581">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: pgyer" time="10.149935">
+      <testcase classname="fastlane.lanes" name="2: pgyer" time="10.742434">
         
       </testcase>