From d1af1b8337591363e60c286348501a841138dbb3 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 24 十二月 2020 16:00:09 +0800
Subject: [PATCH] 20201224-3
---
HDL_ON/DAL/DriverLayer/Packet.cs | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Packet.cs b/HDL_ON/DAL/DriverLayer/Packet.cs
index 3e18471..a1d7c74 100644
--- a/HDL_ON/DAL/DriverLayer/Packet.cs
+++ b/HDL_ON/DAL/DriverLayer/Packet.cs
@@ -91,6 +91,14 @@
}
//澶勭悊鎺ユ敹鍒扮殑鏁版嵁
UdpPacket_DataProcessing(subnetID, deviceID, command, usefulBytes);
+#if DEBUG
+ string ddd = "";
+ foreach(var bb in usefulBytes)
+ {
+ ddd += bb + ",";
+ }
+ MainPage.Log(ddd);
+#endif
//澶勭悊鏄惁瑕侀噸鍙戞暟鎹�
ManagerReceive(subnetID, deviceID, command, usefulBytes);
}
@@ -307,11 +315,11 @@
if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
{
ac.curTempType = receiveBytes[1];
- ac.trait_IndoorTemp.curValue = receiveBytes[2];
+ ac.trait_IndoorTemp.curValue = receiveBytes[2].ToString();
ac.trait_on_off.curValue = receiveBytes[8] == 1 ? "on" : "off";
ac.curModeIndex = receiveBytes[9];
ac.curFanIndex = receiveBytes[10];
- ac.trait_temp.curValue = receiveBytes[11];
+ ac.trait_temp.curValue = receiveBytes[11].ToString();
ac.lastState = "";
switch (ac.trait_mode.curValue.ToString())
{
@@ -401,31 +409,31 @@
{
case "normal":
fh.lastState = Language.StringByID(StringId.Normal);
- fh.trait_temp.curValue = receiveBytes[4];
+ fh.trait_temp.curValue = receiveBytes[4].ToString();
break;
case "day":
fh.lastState = Language.StringByID(StringId.Day);
- fh.trait_temp.curValue = receiveBytes[5];
+ fh.trait_temp.curValue = receiveBytes[5].ToString();
break;
case "night":
fh.lastState = Language.StringByID(StringId.Night);
- fh.trait_temp.curValue = receiveBytes[6];
+ fh.trait_temp.curValue = receiveBytes[6].ToString();
break;
case "timer":
fh.lastState = Language.StringByID(StringId.Auto);
if (receiveBytes[8] == 0)
{
fh.timeFlag = 0;
- fh.trait_temp.curValue = receiveBytes[5];
+ fh.trait_temp.curValue = receiveBytes[5].ToString();
}
else
{
fh.timeFlag = 1;
- fh.trait_temp.curValue = receiveBytes[6];
+ fh.trait_temp.curValue = receiveBytes[6].ToString();
}
break;
case "away":
- fh.trait_temp.curValue = receiveBytes[7];
+ fh.trait_temp.curValue = receiveBytes[7].ToString();
fh.lastState = Language.StringByID(StringId.Away);
break;
}
@@ -535,7 +543,7 @@
case 7:
case 8:
case 19:
- ac.trait_temp.curValue = receiveBytes[1];
+ ac.trait_temp.curValue = receiveBytes[1].ToString();
break;
case 5:
ac.curFanIndex = receiveBytes[1];
@@ -561,7 +569,7 @@
{
if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
{
- ac.trait_IndoorTemp.curValue = receiveBytes[1];
+ ac.trait_IndoorTemp.curValue = receiveBytes[1].ToString();
FunctionPage.UpdataStates(ac);
}
}
@@ -572,6 +580,8 @@
MainPage.Log($"name : {Name} ; mac : {mac}");
if (DB_ResidenceData.Instance.residenceGatewayMAC == mac)
{
+ //鏈湴鎼滅储缃戝叧鎴愬姛
+ Control.Ins.IsSearchLocalGatewaySuccessful = true;
Control.Ins.GatewayOnline = true;
Control.Ins.IsRemote = false;
DAL.Mqtt.MqttClient.DisConnectRemote();//鏂紑mqtt
@@ -642,12 +652,12 @@
receiveFlag += string.Format("{0},{1}", usefulBytes[0], usefulBytes[1]);
break;
case Command.ReadRemark:
- DriverLayer.Control.Ins.myUdp.ReceiveReadRemark(usefulBytes);
+ new Control_Udp().ReceiveReadRemark(usefulBytes);
break;
default:
break;
}
- DriverLayer.Control.Ins.myUdp.ReceiveRepeatManager(receiveFlag);
+ Control_Udp.ReceiveRepeatManager(receiveFlag,usefulBytes);
}
catch (Exception ex)
{
--
Gitblit v1.8.0