diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
index 8a9780e..eade679 100644
Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 1854d30..84e0474 100644
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -704,22 +704,6 @@
landmarkType = "7">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2040,8 +1928,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "107"
- endingLineNumber = "107"
+ startingLineNumber = "125"
+ endingLineNumber = "125"
landmarkName = "viewDidLoad()"
landmarkType = "7">
@@ -2056,8 +1944,8 @@
filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "99"
- endingLineNumber = "99"
+ startingLineNumber = "112"
+ endingLineNumber = "112"
landmarkName = "viewDidLoad()"
landmarkType = "7">
@@ -2158,5 +2046,192 @@
landmarkType = "7">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift
index 6c52309..0e64d2b 100644
--- a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift
+++ b/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
diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
index c75d9ad..42713ea 100644
--- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
+++ b/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()
- self?.preciousTableView = vc.vehicleMonitoringListView.tableView
+ vc?.vehicleMonitoringListView.tableView.reloadData()
+ 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...create(bufferSize: 1)
diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift
index 266ee44..1bd77dd 100644
--- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift
+++ b/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