From 46719b11d11b6544b57cf966cf498fbedf9b613e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 18 五月 2022 16:02:49 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr1215
---
HDL_ON/DAL/DriverLayer/Control.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 5f9b849..bd24f80 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -460,6 +460,7 @@
var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id,resend);
MainPage.Log($"鏈湴閫氳 鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}");
+ //Control.Ins.MsgInfoList.Add($"鏈湴閫氳 鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}"+"\r\n");
}
}
//杩滅▼閫氳
@@ -666,7 +667,7 @@
gatewayId = DB_ResidenceData.Instance.HomeGateway.gatewayId,
sid = securityAlarm.sid, status = state, userSecurityId = securityAlarm.userSecurityId
} });
- MainPage.Log($"瀹夐槻鎺у埗缁撴灉:{result.Code}");
+ MainPage.Log($"瀹夐槻鎺у埗缁撴灉:code锛歿result.Code}锛沵sg锛歿result.message}");
}
else
{
@@ -951,6 +952,7 @@
/// <summary>
/// 鏇存柊璁惧鐘舵��
/// A鍗忚鏁版嵁
+ /// Tag Link鐘舵�佸鐞�
/// </summary>
/// <param name="updateBytes"></param>
public void UpdataFunctionStatus(string revString, byte[] usefulBytes,bool isCloudData = false)
@@ -1194,6 +1196,7 @@
case SPK.AirFreshStandard:
case SPK.HvacAirFresh:
case SPK.SensorGas:
+ case SPK.SensorHelp:
//璁惧鐘舵�佹帹閫�
//鐘舵�佹洿鏂�
Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
--
Gitblit v1.8.0