diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index bf8d618..829f3b3 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 36b9097..ba7997b 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2029,8 +2029,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "691" - endingLineNumber = "691" + startingLineNumber = "705" + endingLineNumber = "705" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -2348,8 +2348,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "222" - endingLineNumber = "222" + startingLineNumber = "224" + endingLineNumber = "224" landmarkName = "addAction()" landmarkType = "7"> @@ -2460,8 +2460,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "258" - endingLineNumber = "258" + startingLineNumber = "260" + endingLineNumber = "260" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -2508,8 +2508,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "234" - endingLineNumber = "234" + startingLineNumber = "236" + endingLineNumber = "236" landmarkName = "dd_mapView(_:viewFor:)" landmarkType = "7"> @@ -2556,8 +2556,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "429" - endingLineNumber = "429" + startingLineNumber = "431" + endingLineNumber = "431" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -2572,8 +2572,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "427" - endingLineNumber = "427" + startingLineNumber = "429" + endingLineNumber = "429" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -2588,8 +2588,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "430" - endingLineNumber = "430" + startingLineNumber = "432" + endingLineNumber = "432" landmarkName = "reloadData(index:)" landmarkType = "7"> @@ -3771,8 +3771,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "274" - endingLineNumber = "274" + startingLineNumber = "276" + endingLineNumber = "276" landmarkName = "dd_mapView(_:didAnnotationViewTapped:)" landmarkType = "7"> @@ -4813,22 +4813,6 @@ - - - - @@ -4871,8 +4855,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "318" - endingLineNumber = "318" + startingLineNumber = "320" + endingLineNumber = "320" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -4887,8 +4871,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "514" - endingLineNumber = "514" + startingLineNumber = "493" + endingLineNumber = "493" landmarkName = "selectVehicle(vehicleModel:currentTableViewVehicleModels:selectIndex:mapView:)" landmarkType = "7"> @@ -4903,8 +4887,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "359" - endingLineNumber = "359" + startingLineNumber = "361" + endingLineNumber = "361" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -4919,8 +4903,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "346" - endingLineNumber = "346" + startingLineNumber = "348" + endingLineNumber = "348" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -4967,8 +4951,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "365" - endingLineNumber = "365" + startingLineNumber = "367" + endingLineNumber = "367" landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkType = "7"> @@ -5015,8 +4999,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "376" - endingLineNumber = "376" + startingLineNumber = "378" + endingLineNumber = "378" landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkType = "7"> @@ -5031,8 +5015,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "800" - endingLineNumber = "800" + startingLineNumber = "813" + endingLineNumber = "813" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5111,8 +5095,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1188" - endingLineNumber = "1188" + startingLineNumber = "1218" + endingLineNumber = "1218" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5159,8 +5143,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1200" - endingLineNumber = "1200" + startingLineNumber = "1230" + endingLineNumber = "1230" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5207,8 +5191,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1202" - endingLineNumber = "1202" + startingLineNumber = "1232" + endingLineNumber = "1232" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5302,8 +5286,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1029" - endingLineNumber = "1029" + startingLineNumber = "1059" + endingLineNumber = "1059" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -5318,8 +5302,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1330" - endingLineNumber = "1330" + startingLineNumber = "1360" + endingLineNumber = "1360" landmarkName = "updateData(taskModel:)" landmarkType = "7"> @@ -5350,8 +5334,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1191" - endingLineNumber = "1191" + startingLineNumber = "1221" + endingLineNumber = "1221" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5366,8 +5350,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1204" - endingLineNumber = "1204" + startingLineNumber = "1234" + endingLineNumber = "1234" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5382,8 +5366,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1034" - endingLineNumber = "1034" + startingLineNumber = "1064" + endingLineNumber = "1064" landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkType = "7"> @@ -5398,8 +5382,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1203" - endingLineNumber = "1203" + startingLineNumber = "1233" + endingLineNumber = "1233" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5414,8 +5398,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "366" - endingLineNumber = "366" + startingLineNumber = "368" + endingLineNumber = "368" landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkType = "7"> @@ -5430,8 +5414,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "597" - endingLineNumber = "597" + startingLineNumber = "604" + endingLineNumber = "604" landmarkName = "showListDetail(vehicleModel:)" landmarkType = "7"> @@ -5446,8 +5430,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "144" - endingLineNumber = "144" + startingLineNumber = "146" + endingLineNumber = "146" landmarkName = "addAction()" landmarkType = "7"> @@ -5462,8 +5446,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "189" - endingLineNumber = "189" + startingLineNumber = "191" + endingLineNumber = "191" landmarkName = "addAction()" landmarkType = "7"> @@ -5478,8 +5462,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "780" - endingLineNumber = "780" + startingLineNumber = "793" + endingLineNumber = "793" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5494,8 +5478,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "786" - endingLineNumber = "786" + startingLineNumber = "799" + endingLineNumber = "799" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5510,8 +5494,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "792" - endingLineNumber = "792" + startingLineNumber = "805" + endingLineNumber = "805" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5548,5 +5532,53 @@ landmarkType = "7"> + + + + + + + + + + + + diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index 900b07b..26ac066 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -81,17 +81,19 @@ extension VehicleMonitoringController { } /// 选中信息也要置空 - self?.currentTableView = nil - self?.selectedTableView = nil - self?.selectedVehicleId = nil - self?.selectedModel = nil - + self?.resetSelectedOfData() + /// 刷新列表数据 self?.vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.reloadDataWithoutListContainer() self?.vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.listContainer.reloadData() self?.categoryView(self?.vehicleMonitoringView.vehicleMonitoringPannelView.categoryView, didSelectedItemAt: self?.vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.selectedIndex ?? 0) }else{ self?.view.dd_makeToast(response?.msg) + self?.dataModel = nil + self?.mapModel = nil + self?.vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.titles = [] + self?.vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.counts = [] + self?.vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.reloadData() } }) .disposed(by: disposeBag) @@ -434,31 +436,8 @@ extension VehicleMonitoringController : JXCategoryViewDelegate { extension VehicleMonitoringController { func selectVehicle(vehicleModel: VehicleMonitorListDataModel.ItemModel, currentTableViewVehicleModels: [VehicleMonitorListDataModel.ItemModel],selectIndex: Int, mapView: MAMapView) { - // 去掉其他tableview的选中 - for index in 0..<(dataModel?.rosterList.count ?? 0) { - let _model = dataModel?.rosterList[index] - _model?.isSelected = false - } - for index in 0..<(dataModel?.onLineList.count ?? 0) { - let _model = dataModel?.onLineList[index] - _model?.isSelected = false - } - for index in 0..<(dataModel?.lostConnectionList.count ?? 0) { - let _model = dataModel?.lostConnectionList[index] - _model?.isSelected = false - } - for index in 0..<(dataModel?.leisureList.count ?? 0) { - let _model = dataModel?.leisureList[index] - _model?.isSelected = false - } - for index in 0..<(dataModel?.busyList.count ?? 0) { - let _model = dataModel?.busyList[index] - _model?.isSelected = false - } - for index in 0..<(dataModel?.alarmList.count ?? 0) { - let _model = dataModel?.alarmList[index] - _model?.isSelected = false - } + + resetSelectedOfDataModel() /// 在当前mapModel中查找vehicleId,如果找到的话就先删除再添加 if let selectedModel = currentTableViewVehicleModels.first(where: {[weak self] model in @@ -515,6 +494,34 @@ extension VehicleMonitoringController { selectedTableView = currentTableView } + func resetSelectedOfDataModel() { + // 去掉其他tableview的选中 + for index in 0..<(dataModel?.rosterList.count ?? 0) { + let _model = dataModel?.rosterList[index] + _model?.isSelected = false + } + for index in 0..<(dataModel?.onLineList.count ?? 0) { + let _model = dataModel?.onLineList[index] + _model?.isSelected = false + } + for index in 0..<(dataModel?.lostConnectionList.count ?? 0) { + let _model = dataModel?.lostConnectionList[index] + _model?.isSelected = false + } + for index in 0..<(dataModel?.leisureList.count ?? 0) { + let _model = dataModel?.leisureList[index] + _model?.isSelected = false + } + for index in 0..<(dataModel?.busyList.count ?? 0) { + let _model = dataModel?.busyList[index] + _model?.isSelected = false + } + for index in 0..<(dataModel?.alarmList.count ?? 0) { + let _model = dataModel?.alarmList[index] + _model?.isSelected = false + } + } + func annotationViewStateConfig(annotationView: VehicleMonitoringPointAnnotation,vehicleModel: VehicleMonitorListDataModel.ItemModel, shouldShowSmallAnnotation: Bool) { var backgroundColor : UIColor? var bigImage : UIImage? @@ -645,6 +652,13 @@ extension VehicleMonitoringController { pannelPanGes.expand(.max) } } + + func resetSelectedOfData() { + currentTableView = nil + selectedTableView = nil + selectedVehicleId = nil + selectedModel = nil + } } open class VehicleMonitoringController : ZDViewController { @@ -689,7 +703,6 @@ open class VehicleMonitoringController : ZDViewController { open override func viewDidLoad() { super.viewDidLoad() dd_navigationItemTitle = "车辆监控" - dd_navigationBarBackgroundColor = .hex("354683") dd_navigationBarTitleTextAttributes = [.foregroundColor : UIColor.white(alpha: 0.7),.font:UIFont.mediumFont(17)] dd_navigationBarBarButtonItemAttributes = [.foregroundColor : UIColor.white] navigationItem.leftBarButtonItems = nil @@ -806,6 +819,23 @@ open class VehicleMonitoringController : ZDViewController { vehicleMonitoringView.maMapView.maMapView.logoCenter = CGPoint(x: vehicleMonitoringView.maMapView.maMapView.logoCenter.x, y: CGRectGetMaxY(vehicleMonitoringView.maMapView.maMapView.frame) - 30) } + open override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + dd_navigationBarBackgroundColor = .hex("354683") + } + + open override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + hideListDetail() + resetSelectedOfData() + resetSelectedOfDataModel() + vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.reloadDataWithoutListContainer() + vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.listContainer.reloadData() + if vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.titles.count > 0 { + categoryView(vehicleMonitoringView.vehicleMonitoringPannelView.categoryView, didSelectedItemAt: vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.selectedIndex) + } + } + open override func reloadData() { super.reloadData() preRefreshRelay.accept(nil)