update

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

@@ -704,22 +704,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "3BF13C15-AD87-4718-8A58-DC297E3641D1"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "131"
-            endingLineNumber = "131"
-            landmarkName = "reloadCell(models:isPaiban:isAlarm:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -1424,22 +1408,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "A4AB261C-23A1-4E06-9DEF-C27FB6D7E55C"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "360"
-            endingLineNumber = "360"
-            landmarkName = "listContainerView(_:initListFor:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -1472,86 +1440,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "2F438D4C-F5EF-4A0B-8B1C-1E84A0BF5854"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "128"
-            endingLineNumber = "128"
-            landmarkName = "reloadCell(models:isPaiban:isAlarm:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F36A8846-3BDC-4242-83B5-61E332C93611"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "126"
-            endingLineNumber = "126"
-            landmarkName = "reloadCell(models:isPaiban:isAlarm:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "4D9B5DEE-D39F-46E6-A1EC-CEDB6C443D74"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "118"
-            endingLineNumber = "118"
-            landmarkName = "reloadCell(models:isPaiban:isAlarm:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "4D9B5DEE-D39F-46E6-A1EC-CEDB6C443D74 - d1cd717f0f11f8f8"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.VehicleMonitoringListController.reloadCell(models: Swift.Optional&lt;Swift.Array&lt;OrderScheduling.VehicleMonitorListDataModel.ItemModel&gt;&gt;, isPaiban: Swift.Optional&lt;Swift.Bool&gt;, isAlarm: Swift.Optional&lt;Swift.Bool&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/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "120"
-                  endingLineNumber = "120"
-                  offsetFromSymbolStart = "112">
-               </Location>
-               <Location
-                  uuid = "4D9B5DEE-D39F-46E6-A1EC-CEDB6C443D74 - d1cd717f0f11f8f8"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.VehicleMonitoringListController.reloadCell(models: Swift.Optional&lt;Swift.Array&lt;OrderScheduling.VehicleMonitorListDataModel.ItemModel&gt;&gt;, isPaiban: Swift.Optional&lt;Swift.Bool&gt;, isAlarm: Swift.Optional&lt;Swift.Bool&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/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "120"
-                  endingLineNumber = "120"
-                  offsetFromSymbolStart = "100">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -2024,8 +1912,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "106"
+            startingLineNumber = "124"
-            endingLineNumber = "106"
+            endingLineNumber = "124"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2040,8 +1928,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "107"
+            startingLineNumber = "125"
-            endingLineNumber = "107"
+            endingLineNumber = "125"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2056,8 +1944,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "99"
+            startingLineNumber = "112"
-            endingLineNumber = "99"
+            endingLineNumber = "112"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
             <Locations>
@@ -2158,5 +2046,192 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "8FA7581A-4721-4DDC-A470-760CFF53DEE3"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "94"
+            endingLineNumber = "94"
+            landmarkName = "init(models:isPaiban:isAlarm:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "CFE88CBD-3763-4675-8064-E713AF4352B2"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "87"
+            endingLineNumber = "87"
+            landmarkName = "VehicleMonitoringListController"
+            landmarkType = "3">
+            <Locations>
+               <Location
+                  uuid = "CFE88CBD-3763-4675-8064-E713AF4352B2 - b0541ce939b4a961"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.VehicleMonitoringListController.models.getter : Swift.Array&lt;OrderScheduling.VehicleMonitorListDataModel.ItemModel&gt;"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "87"
+                  endingLineNumber = "87"
+                  offsetFromSymbolStart = "90">
+               </Location>
+               <Location
+                  uuid = "CFE88CBD-3763-4675-8064-E713AF4352B2 - a7b368d4fe5b049d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.VehicleMonitoringListController.models.setter : Swift.Array&lt;OrderScheduling.VehicleMonitorListDataModel.ItemModel&gt;"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "87"
+                  endingLineNumber = "87"
+                  offsetFromSymbolStart = "116">
+               </Location>
+               <Location
+                  uuid = "CFE88CBD-3763-4675-8064-E713AF4352B2 - ac2d955fe34a052"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.VehicleMonitoringListController.models.modify : Swift.Array&lt;OrderScheduling.VehicleMonitorListDataModel.ItemModel&gt;"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "87"
+                  endingLineNumber = "87"
+                  offsetFromSymbolStart = "0">
+               </Location>
+               <Location
+                  uuid = "CFE88CBD-3763-4675-8064-E713AF4352B2 - 7a477f44e5382d60"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.VehicleMonitoringListController.models.modify : Swift.Array&lt;OrderScheduling.VehicleMonitorListDataModel.ItemModel&gt; 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/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "87"
+                  endingLineNumber = "87"
+                  offsetFromSymbolStart = "15">
+               </Location>
+               <Location
+                  uuid = "CFE88CBD-3763-4675-8064-E713AF4352B2 - 8aa018803f78ad9a"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.VehicleMonitoringListController.init(models: Swift.Optional&lt;Swift.Array&lt;OrderScheduling.VehicleMonitorListDataModel.ItemModel&gt;&gt;, isPaiban: Swift.Optional&lt;Swift.Bool&gt;, isAlarm: Swift.Optional&lt;Swift.Bool&gt;) -&gt; OrderScheduling.VehicleMonitoringListController"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "87"
+                  endingLineNumber = "87"
+                  offsetFromSymbolStart = "296">
+               </Location>
+               <Location
+                  uuid = "CFE88CBD-3763-4675-8064-E713AF4352B2 - 78c233389ba1f304"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.VehicleMonitoringListController.init(coder: __C.NSCoder) -&gt; Swift.Optional&lt;OrderScheduling.VehicleMonitoringListController&gt;"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "87"
+                  endingLineNumber = "87"
+                  offsetFromSymbolStart = "165">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "1862170E-48F8-49ED-A4FB-1427F57A06C1"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "86"
+            endingLineNumber = "86"
+            landmarkName = "VehicleMonitoringListController"
+            landmarkType = "3">
+            <Locations>
+               <Location
+                  uuid = "1862170E-48F8-49ED-A4FB-1427F57A06C1 - 517911a69d8f5dd9"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.VehicleMonitoringListController.vehicleMonitoringListView.getter : OrderScheduling.VehicleMonitoringListView"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "86"
+                  endingLineNumber = "86"
+                  offsetFromSymbolStart = "49">
+               </Location>
+               <Location
+                  uuid = "1862170E-48F8-49ED-A4FB-1427F57A06C1 - 8aa018803f78ad7b"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.VehicleMonitoringListController.init(models: Swift.Optional&lt;Swift.Array&lt;OrderScheduling.VehicleMonitorListDataModel.ItemModel&gt;&gt;, isPaiban: Swift.Optional&lt;Swift.Bool&gt;, isAlarm: Swift.Optional&lt;Swift.Bool&gt;) -&gt; OrderScheduling.VehicleMonitoringListController"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "86"
+                  endingLineNumber = "86"
+                  offsetFromSymbolStart = "238">
+               </Location>
+               <Location
+                  uuid = "1862170E-48F8-49ED-A4FB-1427F57A06C1 - 78c233389ba1f3e5"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.VehicleMonitoringListController.init(coder: __C.NSCoder) -&gt; Swift.Optional&lt;OrderScheduling.VehicleMonitoringListController&gt;"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "86"
+                  endingLineNumber = "86"
+                  offsetFromSymbolStart = "116">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

OrderScheduling/Rescue/ViewController/DispatchOrderController.swift

@@ -409,7 +409,7 @@ open class DispatchOrderPannelCell : DDTableViewCell {
 
         radiusView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
-            make.height.greaterThanOrEqualTo(auto(44))
+            make.height.greaterThanOrEqualTo(auto(44)).priority(.high)
         }
         
         stateLabel.snp.makeConstraints { make in

OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift

@@ -356,36 +356,37 @@ extension VehicleMonitoringController : JXCategoryListContainerViewDelegate {
     }
     
     public func listContainerView(_ listContainerView: JXCategoryListContainerView!, initListFor index: Int) -> JXCategoryListContentViewDelegate! {
-        let vc = VehicleMonitoringListController()
+        var vc : VehicleMonitoringListController?
+        
         if USER.supplierType == 2 {
             if index == 0 {
-                vc.reloadCell(models: dataModel?.rosterList,isPaiban: true)
+                vc = VehicleMonitoringListController(models: dataModel?.rosterList,isPaiban: true)
             }else if index == 1 {
-                vc.reloadCell(models: dataModel?.onLineList)
+                vc = VehicleMonitoringListController(models: dataModel?.onLineList)
             }else if index == 2 {
-                vc.reloadCell(models: dataModel?.lostConnectionList)
+                vc = VehicleMonitoringListController(models: dataModel?.lostConnectionList)
             }else if index == 3 {
-                vc.reloadCell(models: dataModel?.leisureList)
+                vc = VehicleMonitoringListController(models: dataModel?.leisureList)
             }else if index == 4 {
-                vc.reloadCell(models: dataModel?.busyList)
+                vc = VehicleMonitoringListController(models: dataModel?.busyList)
             }else if index == 5 {
-                vc.reloadCell(models: dataModel?.alarmList,isAlarm: true)
+                vc = VehicleMonitoringListController(models: dataModel?.alarmList,isAlarm: true)
             }
         }else{
             if index == 0 {
-                vc.reloadCell(models: dataModel?.onLineList)
+                vc = VehicleMonitoringListController(models: dataModel?.onLineList)
             }else if index == 1 {
-                vc.reloadCell(models: dataModel?.lostConnectionList)
+                vc = VehicleMonitoringListController(models: dataModel?.lostConnectionList)
             }else if index == 2 {
-                vc.reloadCell(models: dataModel?.leisureList)
+                vc = VehicleMonitoringListController(models: dataModel?.leisureList)
             }else if index == 3 {
-                vc.reloadCell(models: dataModel?.busyList)
+                vc = VehicleMonitoringListController(models: dataModel?.busyList)
             }else if index == 4 {
-                vc.reloadCell(models: dataModel?.alarmList,isAlarm: true)
+                vc = VehicleMonitoringListController(models: dataModel?.alarmList,isAlarm: true)
             }
         }
         
-        vc.selectCellBlock = {[weak self] model in
+        vc?.selectCellBlock = {[weak self] model in
             // 去掉其他tableview的选中
             for index in 0..<(self?.dataModel?.rosterList.count ?? 0) {
                 let _model = self?.dataModel?.rosterList[index]
@@ -413,8 +414,8 @@ extension VehicleMonitoringController : JXCategoryListContainerViewDelegate {
             }
             self?.preciousTableView?.reloadData()
             model.isSelected = true
-            vc.vehicleMonitoringListView.tableView.reloadData()
+            vc?.vehicleMonitoringListView.tableView.reloadData()
-            self?.preciousTableView = vc.vehicleMonitoringListView.tableView
+            self?.preciousTableView = vc?.vehicleMonitoringListView.tableView
             
             // 设置当前选中的annotation
             self?.vehicleMonitoringView.maMapView.maMapView.setCenter(CLLocationCoordinate2D(latitude: Double(model.lat ?? "0")!, longitude: Double(model.lon ?? "0")!), animated: true)
@@ -422,9 +423,9 @@ extension VehicleMonitoringController : JXCategoryListContainerViewDelegate {
             // 当前annotation展开，其他闭合
             self?.vehicleMonitoringView.maMapView.maMapView.removeAnnotations(self?.mapAnnotaions)
             self?.mapAnnotaions.removeAll()
-            for index in 0..<vc.models.count {
+            for index in 0..<(vc?.models.count ?? 0) {
-                let model = vc.models[index]
+                let model = vc?.models[index]
-                let coordinate = CLLocationCoordinate2D(latitude: Double(model.lat ?? "") ?? 0, longitude: Double(model.lon ?? "") ?? 0)
+                let coordinate = CLLocationCoordinate2D(latitude: Double(model?.lat ?? "") ?? 0, longitude: Double(model?.lon ?? "") ?? 0)
                 let pointAnnotation = MAPointAnnotation.init()
                 pointAnnotation.annotationClass = VehicleMonitoringPointAnnotation.self
                 pointAnnotation.coordinate = coordinate
@@ -493,7 +494,7 @@ extension VehicleMonitoringController : JXCategoryViewDelegate {
 }
 
 open class VehicleMonitoringController : ZDViewController {
-    private let vehicleMonitoringView = VehicleMonitoringView(titles:[""])
+    private let vehicleMonitoringView = VehicleMonitoringView(titles:[])
     public var zIndex = 0
     private let disposeBag = DisposeBag()
     private let reloadRelay = ReplayRelay<Any?>.create(bufferSize: 1)

OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift

@@ -90,6 +90,19 @@ open class VehicleMonitoringListController : DDViewController {
     private var isAlarm : Bool?
     private var emptyView = EmptyView()
 
+    public init(models:[VehicleMonitorListDataModel.ItemModel]?,isPaiban:Bool? = false,isAlarm:Bool? = false) {
+        self.isPaiban = isPaiban
+        self.isAlarm = isAlarm
+        if let models {
+            self.models.append(contentsOf: models)
+        }
+        super.init(nibName: nil, bundle: nil)
+    }
+    
+    public required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
     open override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -102,6 +115,11 @@ open class VehicleMonitoringListController : DDViewController {
         }
         
         vehicleMonitoringListView.tableView.backgroundColor = .hex("FAFAFA")
+        if self.models.isEmpty == false {
+            emptyView.isHidden = true
+        }else{
+            emptyView.isHidden = false
+        }
         vehicleMonitoringListView.tableView.addSubview(emptyView)
         emptyView.snp.makeConstraints { make in
             make.centerX.centerY.equalToSuperview()
@@ -112,24 +130,6 @@ open class VehicleMonitoringListController : DDViewController {
         vehicleMonitoringListView.tableView.delegate = self
         vehicleMonitoringListView.tableView.dataSource = self
     }
-    
-    public func reloadCell(models:[VehicleMonitorListDataModel.ItemModel]?,isPaiban:Bool? = false,isAlarm:Bool? = false) {
-        self.isPaiban = isPaiban
-        self.isAlarm = isAlarm
-        
-        self.models.removeAll()
-        if let models {
-            self.models.append(contentsOf: models)
-        }
-        
-        if self.models.isEmpty == false {
-            emptyView.isHidden = true
-        }else{
-            emptyView.isHidden = false
-        }
-        
-        vehicleMonitoringListView.tableView.reloadData()
-    }
 }
 
 open class VehicleMonitoringListView : DDView {
@@ -204,8 +204,8 @@ open  class VehicleMonitoringListCell : DDTableViewCell {
         radiusView.addSubview(line)
         
         radiusView.snp.makeConstraints { make in
-            make.height.greaterThanOrEqualTo(auto(44))
             make.edges.equalToSuperview()
+            make.height.greaterThanOrEqualTo(auto(44)).priority(.high)
         }
         
         icon.snp.makeConstraints { make in
@@ -228,13 +228,13 @@ open  class VehicleMonitoringListCell : DDTableViewCell {
         nameLabel.snp.makeConstraints { make in
             make.left.equalTo(dateLabel.snp.right).offset(auto(10))
             make.width.equalTo(auto(60))
-            make.centerY.equalToSuperview()
+            make.top.bottom.equalToSuperview()
         }
         
         phoneLabel.snp.makeConstraints { make in
             make.left.equalTo(nameLabel.snp.right).offset(auto(5))
             make.width.equalTo(auto(100))
-            make.centerY.equalToSuperview()
+            make.top.bottom.equalToSuperview()
         }
         
         callButton.snp.makeConstraints { make in