From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/Entity/Function/SecurityAlarm.cs | 96 ++++-------------------------------------------
1 files changed, 9 insertions(+), 87 deletions(-)
diff --git a/HDL_ON/Entity/Function/SecurityAlarm.cs b/HDL_ON/Entity/Function/SecurityAlarm.cs
index 1ebe9f8..6260cba 100644
--- a/HDL_ON/Entity/Function/SecurityAlarm.cs
+++ b/HDL_ON/Entity/Function/SecurityAlarm.cs
@@ -6,87 +6,9 @@
namespace HDL_ON.Entity
{
-
- public class SecurityCenter
- {
- static SecurityCenter _securityCenter;
-
- public static SecurityCenter Ins
- {
- get
- {
- if (_securityCenter == null)
- {
- _securityCenter = new SecurityCenter();
- }
- return _securityCenter;
- }
- }
-
- /// <summary>
- /// 甯冮槻涓�
- /// </summary>
- public bool InDefense
- {
- get
- {
- foreach (var temp in FunctionList.List.securities)
- {
- if (temp.status == "enable")
- {
- return true;
- }
- }
- return false;
- }
- }
-
- /// <summary>
- /// 鎶ヨ涓�
- /// </summary>
- public bool InAlarm
- {
- get
- {
- foreach (var temp in FunctionList.List.securities)
- {
- if (temp.alarm)
- {
- return true;
- }
- }
- return false;
- }
- }
-
- SecurityAlarm _inDefenseMode;
- /// <summary>
- /// 褰撳墠甯冮槻妯″紡
- /// </summary>
- public SecurityAlarm InDefenseMode
- {
- get
- {
- if (_inDefenseMode == null)
- {
- foreach (var temp in FunctionList.List.securities)
- {
- if (temp.status == "enable")
- {
- _inDefenseMode = temp;
- return _inDefenseMode;
- }
- }
- }
- return _inDefenseMode;
- }
- }
-
-
- }
-
-
-
+ /// <summary>
+ ///
+ /// </summary>
public class SecurityAlarm
{
public SecurityAlarm()
@@ -436,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) + " ";
}
@@ -462,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) + " ";
}
@@ -475,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) + " ";
}
--
Gitblit v1.8.0