From 41995c4cd30ca1c5a814ea0af6f70d3b86368137 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 20 八月 2021 09:07:07 +0800
Subject: [PATCH] 2021-08-20 09:06:44
---
HDL_ON/DAL/DriverLayer/Control.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 7cbe4d6..99c5b0e 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -26,7 +26,6 @@
public class Control
{
-
static Control _control;
public static Control Ins
{
@@ -323,6 +322,15 @@
}
}
}
+ /// <summary>
+ /// 瀹夐槻鎺у埗
+ /// </summary>
+ public void ControlArm()
+ {
+ DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
+ //var pack = httpServer.GetSecurityAlarmLogList
+ }
+
/// <summary>
/// 鍙戦�佸懡浠�
@@ -705,8 +713,9 @@
//}
receiveObj.BodyDataString = res[1];
- if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply)
+ if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply || receiveObj.Topic == CommunicationTopic.GatewayBroadcast)
{
+
var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]);
if (bodyJObj == null)
{
@@ -922,6 +931,8 @@
EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
break;
case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment2:
+ case SPK.SensorEnvironment3:
if (localFunction.GetAttributes().Contains(FunctionAttributeKey.Temperature))
{
HomePage.LoadEvent_RefreshEnvirIndoorTemp();
--
Gitblit v1.8.0