diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index 011f60b..3c605a5 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -125,6 +125,7 @@ extension VehicleMonitoringController { items.append((item.alarmTypeString ?? "")+":"+(item.vehicleName ?? "")) } self?.vehicleMonitoringView.offlineView.offLineLabel.items = items + self?.vehicleMonitoringView.alarmView.count.text = String(items.count) self?.vehicleMonitoringView.offlineView.isHidden = false self?.vehicleMonitoringView.alarmView.isHidden = false }else{ @@ -765,7 +766,7 @@ extension VehicleMonitoringController { vehicleMonitoringListDetailView.updateData(taskModels: vehicleModel.taskList ?? []) /// 视频按钮显示规则 - if USER.supplierType == 1 && vehicleModel.terminalType == VehicleMonitorListDataModel.ItemModel.TerminalTypeEnum.GPS.rawValue { + if let number = vehicleModel.number, number.isEmpty == false { vehicleMonitoringListDetailView.videoButton.isHidden = false }else{ vehicleMonitoringListDetailView.videoButton.isHidden = true @@ -1077,7 +1078,6 @@ open class VehicleMonitoringView : DDView { alarmView.snp.makeConstraints { make in make.top.equalToSuperview().offset(10) make.right.equalToSuperview().offset(-10) - make.width.height.equalTo(50) } offlineView.snp.makeConstraints { make in @@ -1141,12 +1141,13 @@ open class VehicleAlarmView : DDView { addSubview(count) imageView.snp.makeConstraints { make in - make.centerX.centerY.equalToSuperview() - make.width.height.lessThanOrEqualToSuperview() + make.left.top.bottom.equalToSuperview() + make.width.height.equalTo(50) } count.snp.makeConstraints { make in - make.right.equalTo(imageView.snp.right) + make.left.equalTo(imageView.snp.right).offset(-15) + make.right.lessThanOrEqualToSuperview() make.top.equalTo(imageView.snp.top) }