From c877bc16eb02df246e48377101af0fa5ec626c14 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 23 八月 2021 10:00:49 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/DAL/DriverLayer/Control.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index bdbbe68..e3d0166 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -639,6 +639,7 @@
Dictionary<string, string> keys = new Dictionary<string, string>();
keys.Add("sid", securityAlarm.sid);
keys.Add("status", state);
+ keys.Add("alarm", securityAlarm.alarm.ToString());
var aLinkData = new AlinkReadFunctionStatusObj()
{
id = Ins.msg_id.ToString(),
@@ -793,6 +794,7 @@
if (updataLocalSecurity != null)
{
updataLocalSecurity.status = updataSecurity.status;
+ updataLocalSecurity.alarm = updataSecurity.alarm;
}
}
HomePage.LoadEvent_RefreshSecurityStatus();
--
Gitblit v1.8.0