update

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

@@ -427,8 +427,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1056"
+            startingLineNumber = "1050"
-            endingLineNumber = "1056"
+            endingLineNumber = "1050"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1211,22 +1211,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F1FBFA4A-886F-406C-88FB-38CB0C978156"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "328"
-            endingLineNumber = "328"
-            landmarkName = "reloadData()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -1285,8 +1269,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "268"
+            startingLineNumber = "266"
-            endingLineNumber = "268"
+            endingLineNumber = "266"
             landmarkName = "entry(model:remarkId:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1301,8 +1285,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "171"
+            startingLineNumber = "180"
-            endingLineNumber = "171"
+            endingLineNumber = "180"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1317,8 +1301,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "172"
+            startingLineNumber = "181"
-            endingLineNumber = "172"
+            endingLineNumber = "181"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1397,8 +1381,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "140"
+            startingLineNumber = "149"
-            endingLineNumber = "140"
+            endingLineNumber = "149"
             landmarkName = "init(models:isPaiban:isAlarm:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1413,8 +1397,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "131"
+            startingLineNumber = "140"
-            endingLineNumber = "131"
+            endingLineNumber = "140"
             landmarkName = "VehicleMonitoringListController"
             landmarkType = "3">
             <Locations>
@@ -1521,8 +1505,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "130"
+            startingLineNumber = "139"
-            endingLineNumber = "130"
+            endingLineNumber = "139"
             landmarkName = "VehicleMonitoringListController"
             landmarkType = "3">
             <Locations>
@@ -1997,8 +1981,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "156"
+            startingLineNumber = "165"
-            endingLineNumber = "156"
+            endingLineNumber = "165"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2013,8 +1997,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "767"
+            startingLineNumber = "778"
-            endingLineNumber = "767"
+            endingLineNumber = "778"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2045,8 +2029,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1067"
+            startingLineNumber = "1061"
-            endingLineNumber = "1067"
+            endingLineNumber = "1061"
             landmarkName = "collectionView(_:didSelectItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2093,8 +2077,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "343"
+            startingLineNumber = "341"
-            endingLineNumber = "343"
+            endingLineNumber = "341"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2109,8 +2093,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "332"
+            startingLineNumber = "330"
-            endingLineNumber = "332"
+            endingLineNumber = "330"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2125,8 +2109,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "334"
+            startingLineNumber = "332"
-            endingLineNumber = "334"
+            endingLineNumber = "332"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2284,8 +2268,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "147"
+            startingLineNumber = "145"
-            endingLineNumber = "147"
+            endingLineNumber = "145"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2348,8 +2332,8 @@
             filePath = "OrderScheduling/Main/MainTabBarController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "49"
+            startingLineNumber = "54"
-            endingLineNumber = "49"
+            endingLineNumber = "54"
             landmarkName = "tabBarController(_:didSelect:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2364,8 +2348,8 @@
             filePath = "OrderScheduling/Main/MainTabBarController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "50"
+            startingLineNumber = "55"
-            endingLineNumber = "50"
+            endingLineNumber = "55"
             landmarkName = "tabBarController(_:didSelect:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2380,8 +2364,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "327"
+            startingLineNumber = "314"
-            endingLineNumber = "327"
+            endingLineNumber = "314"
             landmarkName = "reloadData()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2396,8 +2380,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "326"
+            startingLineNumber = "313"
-            endingLineNumber = "326"
+            endingLineNumber = "313"
             landmarkName = "reloadData()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2412,8 +2396,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "258"
+            startingLineNumber = "257"
-            endingLineNumber = "258"
+            endingLineNumber = "257"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2428,8 +2412,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "252"
+            startingLineNumber = "251"
-            endingLineNumber = "252"
+            endingLineNumber = "251"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3003,8 +2987,8 @@
             filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "236"
+            startingLineNumber = "235"
-            endingLineNumber = "236"
+            endingLineNumber = "235"
             landmarkName = "init(nibName:bundle:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3419,8 +3403,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1003"
+            startingLineNumber = "997"
-            endingLineNumber = "1003"
+            endingLineNumber = "997"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
             <Locations>
@@ -3467,8 +3451,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1008"
+            startingLineNumber = "1002"
-            endingLineNumber = "1008"
+            endingLineNumber = "1002"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3819,8 +3803,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "225"
+            startingLineNumber = "223"
-            endingLineNumber = "225"
+            endingLineNumber = "223"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3835,8 +3819,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "232"
+            startingLineNumber = "230"
-            endingLineNumber = "232"
+            endingLineNumber = "230"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3883,8 +3867,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "379"
+            startingLineNumber = "375"
-            endingLineNumber = "379"
+            endingLineNumber = "375"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3899,8 +3883,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "389"
+            startingLineNumber = "385"
-            endingLineNumber = "389"
+            endingLineNumber = "385"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -3915,8 +3899,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "311"
+            startingLineNumber = "309"
-            endingLineNumber = "311"
+            endingLineNumber = "309"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -4423,8 +4407,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2046"
+            startingLineNumber = "2030"
-            endingLineNumber = "2046"
+            endingLineNumber = "2030"
             landmarkName = "init(style:reuseIdentifier:)"
             landmarkType = "7">
             <Locations>
@@ -4471,8 +4455,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2053"
+            startingLineNumber = "2037"
-            endingLineNumber = "2053"
+            endingLineNumber = "2037"
             landmarkName = "init(style:reuseIdentifier:)"
             landmarkType = "7">
             <Locations>
@@ -4519,8 +4503,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "682"
+            startingLineNumber = "676"
-            endingLineNumber = "682"
+            endingLineNumber = "676"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4599,8 +4583,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "995"
+            startingLineNumber = "989"
-            endingLineNumber = "995"
+            endingLineNumber = "989"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
             <Locations>
@@ -4823,8 +4807,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "813"
+            startingLineNumber = "824"
-            endingLineNumber = "813"
+            endingLineNumber = "824"
             landmarkName = "addSubviews()"
             landmarkType = "7">
          </BreakpointContent>
@@ -4999,8 +4983,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "878"
+            startingLineNumber = "889"
-            endingLineNumber = "878"
+            endingLineNumber = "889"
             landmarkName = "viewSafeAreaInsetsDidChange()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5079,8 +5063,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1286"
+            startingLineNumber = "1297"
-            endingLineNumber = "1286"
+            endingLineNumber = "1297"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
             <Locations>
@@ -5127,8 +5111,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1298"
+            startingLineNumber = "1309"
-            endingLineNumber = "1298"
+            endingLineNumber = "1309"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
             <Locations>
@@ -5175,8 +5159,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1300"
+            startingLineNumber = "1311"
-            endingLineNumber = "1300"
+            endingLineNumber = "1311"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
             <Locations>
@@ -5270,8 +5254,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1127"
+            startingLineNumber = "1138"
-            endingLineNumber = "1127"
+            endingLineNumber = "1138"
             landmarkName = "listContainerView(_:initListFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -5286,8 +5270,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1430"
+            startingLineNumber = "1441"
-            endingLineNumber = "1430"
+            endingLineNumber = "1441"
             landmarkName = "updateData(taskModel:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -5318,8 +5302,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1289"
+            startingLineNumber = "1300"
-            endingLineNumber = "1289"
+            endingLineNumber = "1300"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -5334,8 +5318,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1302"
+            startingLineNumber = "1313"
-            endingLineNumber = "1302"
+            endingLineNumber = "1313"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -5350,8 +5334,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1132"
+            startingLineNumber = "1143"
-            endingLineNumber = "1132"
+            endingLineNumber = "1143"
             landmarkName = "categoryView(_:didSelectedItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -5366,8 +5350,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1301"
+            startingLineNumber = "1312"
-            endingLineNumber = "1301"
+            endingLineNumber = "1312"
             landmarkName = "init(taskModels:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -5398,8 +5382,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "639"
+            startingLineNumber = "650"
-            endingLineNumber = "639"
+            endingLineNumber = "650"
             landmarkName = "showListDetail(vehicleModel:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -5446,8 +5430,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "858"
+            startingLineNumber = "869"
-            endingLineNumber = "858"
+            endingLineNumber = "869"
             landmarkName = "viewSafeAreaInsetsDidChange()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5462,8 +5446,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "864"
+            startingLineNumber = "875"
-            endingLineNumber = "864"
+            endingLineNumber = "875"
             landmarkName = "viewSafeAreaInsetsDidChange()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5478,8 +5462,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "870"
+            startingLineNumber = "881"
-            endingLineNumber = "870"
+            endingLineNumber = "881"
             landmarkName = "viewSafeAreaInsetsDidChange()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5558,8 +5542,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1436"
+            startingLineNumber = "1447"
-            endingLineNumber = "1436"
+            endingLineNumber = "1447"
             landmarkName = "listView()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5574,8 +5558,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "75"
+            startingLineNumber = "84"
-            endingLineNumber = "75"
+            endingLineNumber = "84"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -5622,8 +5606,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "108"
+            startingLineNumber = "117"
-            endingLineNumber = "108"
+            endingLineNumber = "117"
             landmarkName = "scrollViewDidScroll(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -5638,8 +5622,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "892"
+            startingLineNumber = "903"
-            endingLineNumber = "892"
+            endingLineNumber = "903"
             landmarkName = "viewDidAppear(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -5748,8 +5732,8 @@
             filePath = "OrderScheduling/Common/View/ConditionalSearchTool.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "54"
+            startingLineNumber = "59"
-            endingLineNumber = "54"
+            endingLineNumber = "59"
             landmarkName = "init()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5796,8 +5780,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "363"
+            startingLineNumber = "361"
-            endingLineNumber = "363"
+            endingLineNumber = "361"
             landmarkName = "addActions()"
             landmarkType = "7">
             <Locations>
@@ -5844,8 +5828,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1111"
+            startingLineNumber = "1105"
-            endingLineNumber = "1111"
+            endingLineNumber = "1105"
             landmarkName = "addSubviews()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5860,8 +5844,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1140"
+            startingLineNumber = "1134"
-            endingLineNumber = "1140"
+            endingLineNumber = "1134"
             landmarkName = "addSubviews()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5876,8 +5860,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1193"
+            startingLineNumber = "1187"
-            endingLineNumber = "1193"
+            endingLineNumber = "1187"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5892,8 +5876,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1238"
+            startingLineNumber = "1227"
-            endingLineNumber = "1238"
+            endingLineNumber = "1227"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5908,8 +5892,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1282"
+            startingLineNumber = "1265"
-            endingLineNumber = "1282"
+            endingLineNumber = "1265"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -5930,5 +5914,117 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "1A50CB40-C02B-47EA-B672-53CE7783364B"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1248"
+            endingLineNumber = "1248"
+            landmarkName = "RescuePendingDispatchController"
+            landmarkType = "3">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "3CFCFD48-F5CA-40B4-9D8D-D1CDD3CF8617"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/History/ViewController/HistoryController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "316"
+            endingLineNumber = "316"
+            landmarkName = "listContainerView(_:initListFor:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "AE77EC68-9E4C-4F6F-9550-CEC1BDF41148"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "491"
+            endingLineNumber = "491"
+            landmarkName = "listContainerView(_:initListFor:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "9685B4C9-E01B-4410-9B2D-F34B0FBA15EC"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "488"
+            endingLineNumber = "488"
+            landmarkName = "listContainerView(_:initListFor:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "021ADE10-1AA4-4A97-A961-1C947CEBF11A"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "477"
+            endingLineNumber = "477"
+            landmarkName = "listContainerView(_:initListFor:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "69CD5A88-2548-4BF3-B202-6D7330F8E508"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "305"
+            endingLineNumber = "305"
+            landmarkName = "viewSafeAreaInsetsDidChange()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "C820AA20-EFBF-4BD1-B73A-B1FCC7EBB884"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Common/View/ConditionalSearchView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "369"
+            endingLineNumber = "369"
+            landmarkName = "remakeBottomViewConstraints(bottomSafeArea:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

OrderScheduling/Assets.xcassets/ConditionalSearch/conditional_search_exit.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "conditional_search_reset.png",
+      "filename" : "conditional_search_exit.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "conditional_search_reset@2x.png",
+      "filename" : "conditional_search_exit@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "conditional_search_reset@3x.png",
+      "filename" : "conditional_search_exit@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

OrderScheduling/Common/View/ConditionalSearchTool.swift

@@ -19,7 +19,13 @@ class ConditionalSearchTool : NSObject {
     }
     
     public lazy var searchView = ConditionalSearchView.init()
-    public lazy var coverView = DDView()
+    public var bottomSafeArea : CGFloat = 0.0 {
+        willSet {
+            DispatchQueue.main.async {[weak self] in
+                self?.searchView.remakeBottomViewConstraints(bottomSafeArea: newValue)
+            }
+        }
+    }
     
     private let disposeBag = DisposeBag()
     
@@ -44,7 +50,6 @@ class ConditionalSearchTool : NSObject {
     
     public var searchParameters : OrderListParameters?
     
-    public var resetSub = ReplayRelay<Any?>.create(bufferSize: 1)
     public var searchSub = ReplayRelay<Any?>.create(bufferSize: 1)
     
     public var isFilterSub = ReplayRelay<Bool>.create(bufferSize: 1)
@@ -52,8 +57,6 @@ class ConditionalSearchTool : NSObject {
     
     override init() {
         super.init()
-        coverView.backgroundColor = .hex("848484").alpha(0.3)
-        coverView.isHidden = true
         
         searchView.contractTypeButton.rx.tap
             .observe(on: MainScheduler.instance)
@@ -156,10 +159,17 @@ class ConditionalSearchTool : NSObject {
             })
             .disposed(by: disposeBag)
         
+        searchView.exitButton.rx.tap
+            .observe(on: MainScheduler.instance)
+            .subscribe(onNext: {[weak self] _ in
+                 self?.hideFilterView()
+            })
+            .disposed(by: disposeBag)
         
         searchView.searchButton.rx.tap
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
+                self?.hideFilterView()
                 self?.searchSub.accept(nil)
                 self?.isFilterSub.accept(self?.isFiltered() ?? false)
             })
@@ -177,54 +187,12 @@ class ConditionalSearchTool : NSObject {
         return false
     }
 
-    func dismissFilterView(at superView: UIView?) {
+    @objc func showFilterView() {
-        isShowed = false
+        ENTRY.showSearchEntry(view: searchView, name: conditionalSearchEntry, bottomHeight: bottomSafeArea)
-        
-        searchView.snp.updateConstraints({ make in
-            make.height.equalTo(0)
-        })
-        
-        UIView.animate(withDuration: 0.25) {
-            superView?.layoutIfNeeded()
-        }
-        
-        coverView.isHidden = true
     }
     
-    func showFilterView(at superView: UIView?) {
+    func hideFilterView() {
-        isShowed = true
+        ENTRY.dismiss(name: conditionalSearchEntry)
-        
-        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){
@@ -233,6 +201,7 @@ class ConditionalSearchTool : NSObject {
         if type == .reviewFailed {
             backgroundColor = .clear
             titleColor = .hex("FFFFFF").alpha(0.7)
+            filterButton.titleLabel?.font = .mediumFont(14)
         }else{
             backgroundColor = .hex("FAFAFA")
             titleColor = .hex("737373").alpha(0.55)
@@ -246,11 +215,11 @@ class ConditionalSearchTool : NSObject {
                 make.height.equalTo(filterButton).multipliedBy(0.5)
                 make.left.equalTo(filterButton.snp.left)
             }
+            filterButton.titleLabel?.font = .regularFont(auto(12))
         }
         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)
     }

OrderScheduling/Common/View/ConditionalSearchView.swift

@@ -17,6 +17,7 @@ class ConditionalSearchView : DDView {
     public var bottomView : DDView
     public var resetButton : DDButton
     public var searchButton : DDButton
+    public var exitButton : DDButton
     
     public let orderInfoTitleLabel : DDLabel
     public let orderCodeTextFiled : DDTextField
@@ -43,6 +44,7 @@ class ConditionalSearchView : DDView {
     
     let layerView = UIView()
     let borderLayer1 = CAGradientLayer()
+    let bottomSafeArea : CGFloat = 0.0
     
     public override init(frame: CGRect) {
         titleLabel = DDLabel.dd_init(withText: "订单筛选", font: .mediumFont(17), textColor: .hex("000000").alpha(0.8))
@@ -51,6 +53,7 @@ class ConditionalSearchView : DDView {
         scrollContentView = DDView.init()
         resetButton = DDButton.dd_initCustom()
         searchButton = DDButton.dd_initCustom()
+        exitButton = DDButton.dd_initCustom()
 
         orderInfoTitleLabel = DDLabel.dd_init(withText: "任务信息", font: .mediumFont(16), textColor: .hex("000000").alpha(0.8))
         orderCodeTextFiled = DDTextField.init()
@@ -73,37 +76,43 @@ class ConditionalSearchView : DDView {
         backgroundColor = .white
         resetButton.setTitle("重置", for: .normal)
         resetButton.titleLabel?.font = .mediumFont(15)
-        resetButton.setImage(UIImage(named: "conditional_search_reset"), for: .normal)
         resetButton.setTitleColor(.hex("000000"), for: .normal)
-        resetButton.dd_customize(with: .ImageLeftPaddingTitleRightWithWholeCenter, padding: 5)
+        resetButton.dd_setBackgroundColor(controlBackgroundColor)
         searchButton.setTitle("搜索", for: .normal)
         searchButton.titleLabel?.font = .mediumFont(15)
         searchButton.dd_setBackgroundColor(.hex("2A5094"))
         searchButton.layer.cornerRadius = auto(20)
-        layer.maskedCorners = [.layerMinXMaxYCorner,.layerMaxXMaxYCorner]
+        layer.maskedCorners = [.layerMinXMinYCorner,.layerMaxXMinYCorner]
         layer.masksToBounds = true
         layer.cornerRadius = auto(16)
  
         addSubview(bottomView)
-        bottomView.snp.makeConstraints { make in
+        bottomView.snp.remakeConstraints { make in
-            make.bottom.left.right.equalToSuperview()
+            make.left.right.equalToSuperview()
             make.height.equalTo(auto(80))
+            make.bottom.equalTo(0)
         }
         
+        resetButton.layer.maskedCorners = [.layerMinXMinYCorner,.layerMinXMaxYCorner]
+        resetButton.layer.masksToBounds = true
+        resetButton.layer.cornerRadius = auto(20)
         bottomView.addSubview(resetButton)
+        searchButton.layer.maskedCorners = [.layerMaxXMinYCorner,.layerMaxXMaxYCorner]
+        searchButton.layer.masksToBounds = true
+        searchButton.layer.cornerRadius = auto(20)
         bottomView.addSubview(searchButton)
         
         resetButton.snp.makeConstraints { make in
             make.centerY.equalToSuperview()
+            make.right.equalTo(snp.centerX)
             make.height.equalTo(auto(40))
-            make.width.equalTo(auto(60))
+            make.width.equalTo(auto(170))
-            make.right.equalTo(searchButton.snp.left).offset(-auto(60))
         }
         
         searchButton.snp.makeConstraints { make in
             make.centerY.equalToSuperview()
-            make.right.equalToSuperview().offset(-auto(10))
+            make.left.equalTo(snp.centerX)
-            make.width.equalTo(auto(200))
+            make.width.equalTo(auto(170))
             make.height.equalTo(auto(40))
         }
         
@@ -126,6 +135,14 @@ class ConditionalSearchView : DDView {
             make.centerX.equalToSuperview()
         }
         
+        exitButton.setImage(UIImage(named: "conditional_search_exit"), for: .normal)
+        addSubview(exitButton)
+        exitButton.snp.makeConstraints { make in
+            make.centerY.equalTo(titleLabel)
+            make.right.equalToSuperview().offset(-auto(15))
+            make.width.height.equalTo(auto(20))
+        }
+        
         addSubview(scrollView)
         scrollView.snp.makeConstraints { make in
             make.top.equalTo(layerView.snp.bottom).offset(auto(10)).priority(.high)
@@ -347,4 +364,12 @@ class ConditionalSearchView : DDView {
         button?.setTitle(value, for: .normal)
         button?.setTitleColor(valueColor, for: .normal)
     }
+    
+    func remakeBottomViewConstraints(bottomSafeArea: CGFloat) {
+        bottomView.snp.remakeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.height.equalTo(auto(80))
+            make.bottom.equalTo(-bottomSafeArea)
+        }
+    }
 }

OrderScheduling/Entry/Entry.swift

@@ -449,51 +449,50 @@ open class Entry {
         attributes.statusBar = .light
         SwiftEntryKit.display(entry: view, using: attributes)
     }
-//    
+    
-//    func showSearchEntry(view: UIView, name: String? = nil) {
+    func showSearchEntry(view: UIView, name: String? = nil, bottomHeight: CGFloat) {
-//        var attributes = EKAttributes()
+        var attributes = EKAttributes()
-//        attributes = .topToast
+        attributes = .bottomFloat
-//        attributes.name = name
+        attributes.name = name
-//        attributes.precedence = .override(priority: .min, dropEnqueuedEntries: false)
+        attributes.precedence = .override(priority: .min, dropEnqueuedEntries: false)
-//        attributes.displayMode = .inferred
+        attributes.displayMode = .inferred
-//        attributes.displayDuration = .infinity
+        attributes.displayDuration = .infinity
-//        attributes.screenBackground = .color(color: .black.with(alpha: 0.3))
+        attributes.screenBackground = .color(color: .black.with(alpha: 0.3))
-//        attributes.entryBackground = .color(color: .clear)
+        attributes.entryBackground = .color(color: .clear)
-//        attributes.screenInteraction = .absorbTouches
+        attributes.screenInteraction = .absorbTouches
-//        attributes.entryInteraction = .absorbTouches
+        attributes.entryInteraction = .absorbTouches
-//        attributes.scroll = .disabled
+        attributes.scroll = .disabled
-//        attributes.entranceAnimation = .init(
+        attributes.entranceAnimation = .init(
-//            translate: .init(
+            translate: .init(
-//                duration: 0.25,
+                duration: 0.25,
-//                spring: .init(damping: 1, initialVelocity: 0)
+                spring: .init(damping: 1, initialVelocity: 0)
-//            )
+            )
-//        )
+        )
-//        attributes.exitAnimation = .init(
+        attributes.exitAnimation = .init(
-//            translate: .init(duration: 0.25)
+            translate: .init(duration: 0.25)
-//        )
+        )
-//        attributes.popBehavior = .animated(
+        attributes.popBehavior = .animated(
-//            animation: .init(
+            animation: .init(
-//                translate: .init(duration: 0.25)
+                translate: .init(duration: 0.25)
-//            )
+            )
-//        )
+        )
-//        attributes.shadow = .active(
+        attributes.shadow = .active(
-//            with: .init(
+            with: .init(
-//                color: .black,
+                color: .black,
-//                opacity: 0.3,
+                opacity: 0.3,
-//                radius: 6
+                radius: 6
-//            )
+            )
-//        )
+        )
-//        attributes.positionConstraints.size = .init(
+        attributes.positionConstraints.size = .init(
-//            width: .fill,
+            width: .fill,
-//            height: .constant(value: auto(500))
+            height: .constant(value: auto(450) + bottomHeight)
-//        )
+        )
-//        attributes.positionConstraints.verticalOffset = 0
+        attributes.positionConstraints.verticalOffset = 0
-//        attributes.positionConstraints.safeArea = .empty(fillSafeArea: false)
+        attributes.positionConstraints.safeArea = .overridden
-//        attributes.positionConstraints.verticalOffset = 44 + auto(44)
+        attributes.positionConstraints.rotation.isEnabled = false
-//        attributes.positionConstraints.rotation.isEnabled = false
+        attributes.statusBar = .light
-//        attributes.statusBar = .light
+        SwiftEntryKit.display(entry: view, using: attributes, presentInsideKeyWindow: true)
-//        SwiftEntryKit.display(entry: view, using: attributes, presentInsideKeyWindow: true)
+    }
-//    }
     
     public func isCurrentlyDisplaying(entryNamed name: String? = nil) -> Bool {
         return SwiftEntryKit.isCurrentlyDisplaying(entryNamed: name)

OrderScheduling/History/ViewController/HistoryController.swift

@@ -73,7 +73,7 @@ extension HistoryController {
                 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.isShowOrDismissFilterView(at: vc?.view)
+                    vc?.conditionalSearchTool.showFilterView()
                 }
             })
             .disposed(by: disposeBag)
@@ -146,9 +146,6 @@ extension HistoryItemController  {
         conditionalSearchTool.searchSub
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
-                
-                self?.conditionalSearchTool.dismissFilterView(at: self?.historyItemView)
-                
                 self?.historyItemView.tableView.mj_header?.beginRefreshing()
             })
             .disposed(by: disposeBag)
@@ -419,7 +416,7 @@ open class HistoryController : ZDViewController {
     }
 }
 
-class HistoryItemController : ZDViewController {
+class HistoryItemController : ConditionalSearchParentController {
     private let disposeBag = DisposeBag()
     private let historyItemView = HistoryItemView()
     private var resultArr : [OrderListDataModel] = []
@@ -429,8 +426,6 @@ class HistoryItemController : ZDViewController {
     private var type : OrderTypeEnum
     private var emptyView = EmptyView()
 
-    public lazy var conditionalSearchTool = ConditionalSearchTool()
-    
     public init(type:OrderTypeEnum) {
         self.type = type
         super.init(nibName: nil, bundle: nil)
@@ -464,19 +459,6 @@ class HistoryItemController : ZDViewController {
         
         historyItemView.tableView.delegate = self
         historyItemView.tableView.dataSource = self
-        
-        conditionalSearchTool.addFilterView(at: historyItemView)
-    }
-
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        conditionalSearchTool.dismissFilterView(at: historyItemView)
-    }
-    
-    open override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        
-        conditionalSearchTool.isFilterSub.accept(conditionalSearchTool.isFiltered())
     }
     
 }
@@ -716,10 +698,3 @@ class HistoryItemView : DDView {
         fatalError("init(coder:) has not been implemented")
     }
 }
-
-// MARK: JXCategoryListContentViewDelegate
-extension HistoryItemController : JXCategoryListContentViewDelegate {
-    func listView() -> UIView! {
-        return view
-    }
-}

OrderScheduling/Main/MainTabBarController.swift

@@ -35,6 +35,11 @@ open class MainTabBarController : ESTabBarController,UITabBarControllerDelegate
             
             tabBar.shadowImage = UIImage()
             tabBar.backgroundImage = UIImage()
+            
+            let line = UIView()
+            line.backgroundColor = .hex("#B8B8B8").alpha(0.2)
+            line.frame = CGRectMake(0, 0, tabBar.width, 0.4)
+            tabBar.addSubview(line)
         }
         
         delegate = self

OrderScheduling/Rescue/ViewController/RescueController.swift

@@ -77,8 +77,8 @@ extension RescueController {
             .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
+                    let vc = containerView.validListDict[key] as? ConditionalSearchParentController
-                    vc?.conditionalSearchTool.isShowOrDismissFilterView(at: vc?.view)
+                    vc?.conditionalSearchTool.showFilterView()
                 }
             })
             .disposed(by: disposeBag)
@@ -213,8 +213,6 @@ extension RescuePendingOrderController {
         conditionalSearchTool.searchSub
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
-                self?.conditionalSearchTool.dismissFilterView(at: self?.pendingOrderView)
-                
                 self?.pendingOrderView.tableView.mj_header?.beginRefreshing()
             })
             .disposed(by: disposeBag)
@@ -360,8 +358,6 @@ extension RescuePendingDispatchController {
         conditionalSearchTool.searchSub
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
-                self?.conditionalSearchTool.dismissFilterView(at: self?.pendingDispatchView)
-                
                 self?.pendingDispatchView.tableView.mj_header?.beginRefreshing()
             })
             .disposed(by: disposeBag)
@@ -438,8 +434,6 @@ extension RescueIsIngController {
         conditionalSearchTool.searchSub
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
-                self?.conditionalSearchTool.dismissFilterView(at: self?.pendingIsIngView)
-                
                 self?.pendingIsIngView.tableView.mj_header?.beginRefreshing()
             })
             .disposed(by: disposeBag)
@@ -479,7 +473,7 @@ extension RescueController : JXCategoryViewDelegate,JXCategoryListContainerViewD
     }
     
     func listContainerView(_ listContainerView: JXCategoryListContainerView!, initListFor index: Int) -> JXCategoryListContentViewDelegate! {
-        var vc : RescueParentController
+        var vc : ConditionalSearchParentController
         if index == 0 {
             vc = RescuePendingOrderController.init()
             pendingTableView = (vc as? RescuePendingOrderController)?.pendingOrderView.tableView
@@ -1172,7 +1166,7 @@ class RescueController : ZDViewController {
 }
 
 // MARK: 待派单
-class RescuePendingOrderController : RescueParentController {
+class RescuePendingOrderController : ConditionalSearchParentController {
     private let disposeBag = DisposeBag()
     public let pendingOrderView = RescuePendingOrderView()
     public let refuseOrderConfirmView = RefuseOrderConfirmView()
@@ -1211,17 +1205,12 @@ class RescuePendingOrderController : RescueParentController {
         pendingOrderView.tableView.delegate = self
         pendingOrderView.tableView.dataSource = self
         
-        conditionalSearchTool.addFilterView(at: pendingOrderView)
     }
 
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        conditionalSearchTool.dismissFilterView(at: pendingOrderView)
-    }
 }
 
 // MARK: 待派车
-class RescuePendingDispatchController : RescueParentController {
+class RescuePendingDispatchController : ConditionalSearchParentController {
     private let disposeBag = DisposeBag()
     public let pendingDispatchView = RescuePendingDispatchView()
     private var resultArr : [OrderListDataModel] = []
@@ -1254,18 +1243,12 @@ class RescuePendingDispatchController : RescueParentController {
         pendingDispatchView.tableView.backgroundColor = .hex("FAFAFA")
         pendingDispatchView.tableView.delegate = self
         pendingDispatchView.tableView.dataSource = self
-        
-        conditionalSearchTool.addFilterView(at: pendingDispatchView)
     }
 
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        conditionalSearchTool.dismissFilterView(at: pendingDispatchView)
-    }
 }
 
 // MARK: 救援中
-class RescueIsIngController : RescueParentController {
+class RescueIsIngController : ConditionalSearchParentController {
     private let disposeBag = DisposeBag()
     public let pendingIsIngView = RescueIsIngView()
     private var resultArr : [OrderListDataModel] = []
@@ -1299,18 +1282,12 @@ class RescueIsIngController : RescueParentController {
         pendingIsIngView.tableView.delegate = self
         pendingIsIngView.tableView.dataSource = self
 
-        conditionalSearchTool.addFilterView(at: pendingIsIngView)
-    }
-
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        conditionalSearchTool.dismissFilterView(at: pendingIsIngView)
     }
 }
 
 
 // MARK: SUPER
-class RescueParentController : ZDViewController, JXCategoryListContentViewDelegate  {
+class ConditionalSearchParentController : ZDViewController, JXCategoryListContentViewDelegate  {
     public lazy var conditionalSearchTool = ConditionalSearchTool()
 
     func listView() -> UIView! {
@@ -1322,6 +1299,13 @@ class RescueParentController : ZDViewController, JXCategoryListContentViewDelega
         
         conditionalSearchTool.isFilterSub.accept(conditionalSearchTool.isFiltered())
     }
+    
+    override func viewSafeAreaInsetsDidChange() {
+        super.viewSafeAreaInsetsDidChange()
+        if parent?.view.safeAreaInsets.bottom != 0 {
+            conditionalSearchTool.bottomSafeArea = (parent?.view.safeAreaInsets.bottom ?? 0) - 49
+        }
+    }
 }
 
 // MARK: Cell

OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift

@@ -121,7 +121,7 @@ extension ReviewFailedController {
         filterButton.rx.tap
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
-                self?.conditionalSearchTool.isShowOrDismissFilterView(at: self?.view)
+                self?.conditionalSearchTool.showFilterView()
             })
             .disposed(by: disposeBag)
         
@@ -135,8 +135,6 @@ extension ReviewFailedController {
         conditionalSearchTool.searchSub
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in
-                self?.conditionalSearchTool.dismissFilterView(at: self?.reviewFailedView)
-                
                 self?.reviewFailedView.tableView.mj_header?.beginRefreshing()
             })
             .disposed(by: disposeBag)
@@ -146,7 +144,8 @@ extension ReviewFailedController {
             .subscribe(onNext: {[weak self] _ in
                 MCOUNT.newestMessage()
                 self?.reviewFailedView.tableView.mj_header?.beginRefreshing()
-                self?.conditionalSearchTool.resetSub.accept(nil)
+                /// 点击tabbar item重置
+                ConditionalSearchTool.resetFilterButton(self?.filterButton, filterState: false, type: .reviewFailed)
             })
             .disposed(by: disposeBag)
         
@@ -290,8 +289,6 @@ open class ReviewFailedController : ZDViewController {
 //        }
         ConditionalSearchTool.configFilterButton(filterButton,type: .reviewFailed)
         navigationItem.rightBarButtonItem = UIBarButtonItem(customView: filterButton)
-        
-        conditionalSearchTool.addFilterView(at: reviewFailedView)
     }
     
     open override func viewSafeAreaInsetsDidChange() {
@@ -303,21 +300,11 @@ open class ReviewFailedController : ZDViewController {
                 make.left.right.equalToSuperview()
                 make.bottom.equalTo(-view.safeAreaInsets.bottom)
             }
+            
+            conditionalSearchTool.bottomSafeArea = view.safeAreaInsets.bottom - 49
         }
     }
 
-    open override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        
-        conditionalSearchTool.isFilterSub.accept(conditionalSearchTool.isFiltered())
-    }
-
-    open override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        
-        conditionalSearchTool.dismissFilterView(at: reviewFailedView)
-    }
-
     open override var preferredStatusBarStyle: UIStatusBarStyle {
         return .lightContent
     }

OrderScheduling/Strings/EntryStrings.swift

@@ -27,4 +27,4 @@ public let notObtainUserPermissionsEntry = "notObtainPermissionsEntry"
 
 public let vehicleMonitoringConfigEntry = "vehicleMonitoringConfigEntry"
 
-public let conitionalSearchEntry = "conitionalSearchEntry"
+public let conditionalSearchEntry = "conditionalSearchEntry"

OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift

@@ -593,6 +593,17 @@ extension VehicleMonitoringController {
                 middleImage = UIImage(named: "vehicleMonitor_offline_cell_flag_bg")
                 break
             }
+            
+            switch vehicleModel.onlineStatus?.code {
+            case .onLine:
+                annotationView.bigStateLabel.textColor = .white
+                annotationView.middleStateLabel.textColor = .white
+                break
+            default:
+                annotationView.bigStateLabel.textColor = .hex("CCCCCC")
+                annotationView.middleStateLabel.textColor = .hex("CCCCCC")
+                break
+            }
         }
         if vehicleModel.isSelected == true {
             annotationView.bigImageView.isHidden = false

OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift

@@ -69,6 +69,15 @@ extension VehicleMonitoringListController : UITableViewDelegate,UITableViewDataS
             break
         }
         
+        switch model.onlineStatus?.code {
+        case .onLine:
+            cell?.stateLabel.textColor = .white
+            break
+        default:
+            cell?.stateLabel.textColor = .hex("CCCCCC")
+            break
+        }
+        
         cell?.iconTapGes.rx.event
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] _ in