diff --git a/DataVAPI.Tools/IOT/ScreenMonitorModel.cs b/DataVAPI.Tools/IOT/ScreenMonitorModel.cs
index b3f9e04..86e4ea9 100644
--- a/DataVAPI.Tools/IOT/ScreenMonitorModel.cs
+++ b/DataVAPI.Tools/IOT/ScreenMonitorModel.cs
@@ -240,12 +240,24 @@ namespace DataVAPI.Tool.IOT
set
{
_DeviceZT = value;
- if (_DeviceZT == "在线") DeviceColor = new ALYColor { r = 13, g = 254, b = 73, a = 1 };
- else DeviceColor = new ALYColor { r = 249, g = 191, b = 0, a = 1 };
+ if (_DeviceZT == "在线") DeviceColor = new ALYColor { r = 0, g = 255, b = 0, a = 1 };
+ else DeviceColor = new ALYColor { r = 255, g = 55, b = 0, a = 1 };
}
}
private string _DeviceZT { get; set; }
///
+ /// 设备状态异常
+ ///
+ public string DeviceStatus
+ {
+ get { return _DeviceStatus; }
+ set
+ {
+ _DeviceStatus = value;
+ }
+ }
+ private string _DeviceStatus { get; set; }
+ ///
/// 是否有告警
///
public bool IsAlarm
@@ -254,8 +266,18 @@ namespace DataVAPI.Tool.IOT
set
{
_IsAlarm = value;
- if (_IsAlarm) AlarmColor = new ALYColor { r = 245, g = 13, b = 13, a = 1 };
- else AlarmColor = new ALYColor { r = 245, g = 13, b = 13, a = 0 };
+ if (_IsAlarm)
+ {
+ AlarmColor = new ALYColor { r = 255, g = 55, b = 0, a = 1 };
+ DeviceStatus = "异常";
+ StatusColor = new ALYColor { r = 255, g = 55, b = 0, a = 1 };
+ }
+ else
+ {
+ AlarmColor = new ALYColor { r = 245, g = 13, b = 13, a = 0 };
+ DeviceStatus = "正常";
+ StatusColor = new ALYColor { r = 0, g = 255, b = 0, a = 1 };
+ }
}
}
private bool _IsAlarm { get; set; }
@@ -269,13 +291,20 @@ namespace DataVAPI.Tool.IOT
///
public ALYColor AlarmColor { get; set; }
///
+ /// 颜色
+ ///
+ public ALYColor StatusColor { get; set; }
+ ///
/// 初始化
///
public DevStatus()
{
IsAlarm = false;
AlarmColor = new ALYColor { r = 245, g = 13, b = 13, a = 0 };
- DeviceColor = new ALYColor { r = 249, g = 191, b = 0, a = 1 };
+ DeviceColor = new ALYColor { r = 255, g = 55, b = 0, a = 1 };
+ StatusColor = new ALYColor { r = 255, g = 55, b = 0, a = 1 };
+
+ DeviceStatus = "正常";
}
///
/// 设置属性