From 223ed8e3003f9534887b6ae9c9eb4353aebf1748 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 28 八月 2021 19:24:18 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7

---
 HDL_ON/DAL/DriverLayer/Control.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index dd35712..3c5196e 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -772,7 +772,7 @@
                         {
                             Ins.GatewayId = device.device_mac;
                         }
-                        reportIp = "239.0.168.188";// device.ip_address;//涓绘挱鍦板潃涔熻兘鎺у埗璁惧
+                        reportIp = "255.255.255.255";//"239.0.168.188";// device.ip_address;//涓绘挱鍦板潃涔熻兘鎺у埗璁惧
                     }
                 }
                 else if (receiveObj.Topic == CommunicationTopic.ct.ReadStatus + "_reply" ||
@@ -964,6 +964,7 @@
                                 }
                                 break;
                             case SPK.FloorHeatStandard:
+                                localFunction.lastState = "";
                                 switch (localFunction.GetAttrState(FunctionAttributeKey.Mode))
                                 {
                                     case "normal":

--
Gitblit v1.8.0