2021-12-01-01

xm

2021-12-01 6d73bf6e816570291865674bef8bce8972e4de3f

 HDL_ON/Entity/Function/SecurityAlarm.cs

@@ -6,6 +6,9 @@

namespace HDL_ON.Entity
{
    /// <summary>
    /// 
    /// </summary>
    public class SecurityAlarm
    {
        public SecurityAlarm()
@@ -39,6 +42,10 @@
        /// 撒防:disable
        /// </summary>
        public string status = "disable";
        /// <summary>
        /// 报警状态
        /// </summary>
        public bool alarm = false;
        /// <summary>
        /// 类型
        /// "all"--全宅布防，
@@ -351,11 +358,11 @@
                case SPK.SensorSmoke:
                    foreach (var con in condition)
                    {
                        if (con.value == "true")
                        if (con.value == "true" || con.value == "alarm")
                        {
                            text += Language.StringByID(StringId.InAlarm) + " ";
                        }
                        else if (con.value == "false")
                        else if (con.value == "false" || con.value == "normal")
                        {
                            text += Language.StringByID(StringId.Normal) + " ";
                        }
@@ -377,11 +384,11 @@
                case SPK.SensorWater:
                    foreach (var con in condition)
                    {
                        if (con.value == "true")
                        if (con.value == "true" || con.value == "alarm")
                        {
                            text += Language.StringByID(StringId.WaterLeakage) + " ";
                        }
                        else if (con.value == "false")
                        else if (con.value == "false" || con.value == "normal")
                        {
                            text += Language.StringByID(StringId.Normal) + " ";
                        }
@@ -390,11 +397,11 @@
                case SPK.SensorDoorWindow:
                    foreach (var con in condition)
                    {
                        if (con.value == "true")
                        if (con.value == "true" || con.value == "open")
                        {
                            text += Language.StringByID(StringId.Open) + " ";
                        }
                        else if (con.value == "false")
                        else if (con.value == "false" || con.value == "close")
                        {
                            text += Language.StringByID(StringId.Close) + " ";
                        }
@@ -572,6 +579,6 @@
    {
        public string sid;
        public string status ="disable" ;
        public string alarm ="false";
        public bool alarm = false;
    }
}