From 10afb4f79299cae08344fd8245a7217ea49f712e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 八月 2023 11:27:45 +0800
Subject: [PATCH] 空调，地暖温度类型支持
---
HDL_ON/DAL/DriverLayer/Control.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 0df687c..e8a9655 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -261,6 +261,7 @@
/// </summary>
public void OpenTcpClent()
{
+ return;
if (myTcpClient == null)
{
myTcpClient = new Control_TcpClient(reportIp);
@@ -335,6 +336,7 @@
/// </summary>
public void LoginGateway()
{
+ return;//tcp鎺у埗瀛樺湪闂锛屼絾鏄厛涓嶇敤tcp鎺у埗浜嗭紝瑕佺粡杩囨祴璇曞厛 2023-07-29 10:14:32
if (loginGatewayThread == null)
{
loginGatewayThread = new System.Threading.Thread(() =>
@@ -1106,7 +1108,7 @@
Ins.IsLocalEncrypt = device.isLocalEncrypt;
//MainPage.Log("缃戝叧鏈湴鍔犲瘑鐘舵�侊細" + device.local_encrypt.ToString());
//鐧诲綍缃戝叧Tcp
- OpenTcpClent();
+ //OpenTcpClent();
}
@@ -1208,7 +1210,7 @@
/// <summary>
- /// 鏇存柊璁惧鐘舵��
+ /// 鏇存柊缇ゆ帶璁惧鐘舵��
/// A鍗忚鏁版嵁
/// </summary>
public void UpdataGroupControlStatus(string revString, byte[] usefulBytes, bool isCloudData = false)
@@ -1270,7 +1272,7 @@
// return;
//}
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
+ var temp = JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
if (temp != null)
{
Control_Udp.ReceiveRepeatManager(temp.id, usefulBytes);
@@ -1327,7 +1329,11 @@
{
localFunction.time_stamp = temp.time_stamp;
localFunction.SetAttrState(attr.key, attr.value);
-
+
+ }
+ if(localFunction.spk == SPK.AirSwitchP3)
+ {
+ localFunction.online = updateTemp.online;
}
//鏇存柊鐣岄潰鐘舵��
@@ -1347,6 +1353,10 @@
EnergyMainPage.UpdataStatus(localFunction);
}
break;
+ case SPK.AirSwitchP3:
+ AirSwitchP3Page.UpdataState(localFunction);
+ AirSwitchP3SubloopEnergyPage.UpdataStatus(localFunction);
+ break;
case SPK.ElectricEnergy:
EnergyMainPage.UpdataStatus(localFunction);
break;
--
Gitblit v1.8.0