From 271015c6e90c195103cc7f34eda87966acd74dcc Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期日, 13 十二月 2020 20:46:12 +0800
Subject: [PATCH] 2020121301
---
HDL_ON/DAL/DriverLayer/Control.cs | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 96a1719..9d0256a 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -183,18 +183,18 @@
/// </summary>
public void SearchLoaclGateway()
{
- OpenUdp(DB_ResidenceData.residenceData.GatewayType == 0 ? 6000 : 8585);
+ OpenUdp(DB_ResidenceData.Instance.GatewayType == 0 ? 6000 : 8585);
new System.Threading.Thread(() =>
{
for (int i = 0; i < 5; i++)
{
if (GatewayOnline)
break;
- if (DB_ResidenceData.residenceData.GatewayType == 0)
+ if (DB_ResidenceData.Instance.GatewayType == 0)
{
myUdp.ControlBytesSend(Command.ReadGateway, 255, 255, new byte[] { (byte)new Random().Next(255), (byte)new Random().Next(255) });
}
- else if (DB_ResidenceData.residenceData.GatewayType == 1)
+ else if (DB_ResidenceData.Instance.GatewayType == 1)
{
myUdp.SearchLocalGateway();
}
@@ -245,13 +245,13 @@
var actionObjs = new List<ApiAlinkControlActionObj>();
actionObjs.Add(apiControlData);
var pack = httpServer.ControlDevice(actionObjs);
- MainPage.Log($"{pack.Code}:{pack.Data}");
+ //MainPage.Log($"{pack.Code}:{pack.Data}");
}
//鏈湴閫氳
else
{
//Bus鎺у埗
- if (DB_ResidenceData.residenceData.GatewayType == 0)
+ if (DB_ResidenceData.Instance.GatewayType == 0)
{
try
{
@@ -273,7 +273,7 @@
var functionControlDataObj = function.GetGatewayAlinkControlData(commandDictionary);
var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
- myUdp.SendLocalHdlLinkData(sendBytes);
+ Ins.myUdp.SendLocalHdlLinkData(sendBytes);
}
}
}
@@ -299,7 +299,7 @@
}
else
{
- if (DB_ResidenceData.residenceData.GatewayType == 0)
+ if (DB_ResidenceData.Instance.GatewayType == 0)
{
try
{
@@ -394,7 +394,7 @@
if (res.Length == 2)
{
var topics = res[0].Split("\r\n");
- MainPage.Log(res[1]);
+ //MainPage.Log(res[1]);
foreach (var ts in topics)
{
var key = ts.Split(":");
@@ -424,7 +424,7 @@
if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply)
{
var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
- if (device.device_mac == DB_ResidenceData.residenceData.residenceGatewayMAC)
+ if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC)
{
Ins.GatewayOnline = true;
if(!string.IsNullOrEmpty( device.gatewayId))
@@ -464,7 +464,7 @@
{
try
{
- bool hadChange = false;//鐘舵�佹湁鍙樺寲鍐嶆洿鏂扮晫闈�
+ //bool hadChange = false;//鐘舵�佹湁鍙樺寲鍐嶆洿鏂扮晫闈�
var updataObj = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
if (updataObj != null)
{
@@ -479,14 +479,15 @@
continue;
}
locatAttr.curValue = attr.value;
- hadChange = true;
+ //hadChange = true;
}
}
}
- if (!hadChange)//鐘舵�佹湁鍙樺寲鍐嶆洿鏂扮晫闈�
- {
- continue;
- }
+ //2020-12-13 濡傛灉鎺у埗鏃讹紝绔嬪嵆鏇存柊鐣岄潰鍗崇姸鎬侊紝鏀跺埌鏁版嵁涓嶇敤鍦ㄥ鐞嗭紝鐩墠鍙慨鏀硅澶囩姸鎬侊紝鐣岄潰娌℃湁鏇存柊锛岃繕鏄渶瑕佹帴鏀舵暟鎹洿鏂�
+ //if (!hadChange)//鐘舵�佹湁鍙樺寲鍐嶆洿鏂扮晫闈�
+ //{
+ // continue;
+ //}
//鏇存柊鐣岄潰鐘舵��
switch (updataObj.spk)
{
--
Gitblit v1.8.0