From 294ec07f6e7e7d7c2823cc5f5a1718a3919cc6bb Mon Sep 17 00:00:00 2001
From: ddisfriend <chemailaddress2@gmail.com>
Date: Thu, 7 Aug 2025 16:49:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=98=BE=E7=A4=BA=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=EF=BC=8C=E7=9B=91=E6=8E=A7=E6=8C=89=E9=92=AE=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewController/VehicleMonitoringController.swift  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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)
         }