From 299f4b1218c0d3721aa92bf091950d6708942583 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 28 八月 2021 15:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/Entity/Function/SecurityAlarm.cs | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/Entity/Function/SecurityAlarm.cs b/HDL_ON/Entity/Function/SecurityAlarm.cs
index 1ebe9f8..902b12c 100644
--- a/HDL_ON/Entity/Function/SecurityAlarm.cs
+++ b/HDL_ON/Entity/Function/SecurityAlarm.cs
@@ -7,17 +7,17 @@
namespace HDL_ON.Entity
{
- public class SecurityCenter
+ public class SecurityCenter111111
{
- static SecurityCenter _securityCenter;
+ static SecurityCenter111111 _securityCenter;
- public static SecurityCenter Ins
+ public static SecurityCenter111111 Ins
{
get
{
if (_securityCenter == null)
{
- _securityCenter = new SecurityCenter();
+ _securityCenter = new SecurityCenter111111();
}
return _securityCenter;
}
@@ -30,14 +30,11 @@
{
get
{
- foreach (var temp in FunctionList.List.securities)
+ lock (FunctionList.List.securities)
{
- if (temp.status == "enable")
- {
- return true;
- }
+ var temp = FunctionList.List.securities.Find((obj) => obj.status == "enable");
+ return temp == null ? false : true;
}
- return false;
}
}
@@ -48,14 +45,11 @@
{
get
{
- foreach (var temp in FunctionList.List.securities)
+ lock (FunctionList.List.securities)
{
- if (temp.alarm)
- {
- return true;
- }
+ var temp = FunctionList.List.securities.Find((obj) => obj.alarm == true);
+ return temp == null ? false : true;
}
- return false;
}
}
@@ -69,13 +63,10 @@
{
if (_inDefenseMode == null)
{
- foreach (var temp in FunctionList.List.securities)
+ lock (FunctionList.List.securities)
{
- if (temp.status == "enable")
- {
- _inDefenseMode = temp;
- return _inDefenseMode;
- }
+ var temp = FunctionList.List.securities.Find((obj) => obj.status == "enable");
+ return temp;
}
}
return _inDefenseMode;
--
Gitblit v1.8.0