From 4a9318077bd095fbc7c57c593e5ca8185603dac4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/DAL/DriverLayer/Packet.cs | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Packet.cs b/HDL_ON/DAL/DriverLayer/Packet.cs
index c0a5517..f229efc 100644
--- a/HDL_ON/DAL/DriverLayer/Packet.cs
+++ b/HDL_ON/DAL/DriverLayer/Packet.cs
@@ -163,12 +163,12 @@
case Command.ReadLightAllLoopBrightnessACK:
for (int i = 0; i < receiveBytes[0]; i++)
{
- var light = FunctionList.List.lights.Find((obj) => obj.bus_Data.SubnetID == subnetID && obj.bus_Data.DeviceID == deviceID && obj.bus_Data.loopId == (i + 1));
+ var light = FunctionList.List.lights.Find((obj) => obj.bus.SubnetID == subnetID && obj.bus.DeviceID == deviceID && obj.bus.LoopId == (i + 1));
if (light != null)
{
if (light.functionType != FunctionType.RGB)
{
- light.trait_on_off.curValue = receiveBytes[light.bus_Data.loopId] == 0 ? "off" : "on";
+ light.trait_on_off.curValue = receiveBytes[light.bus.LoopId] == 0 ? "off" : "on";
if (light.trait_on_off.curValue.ToString() == "on")
{
light.brightness = receiveBytes[2];
@@ -191,7 +191,7 @@
}
else
{
- var e = FunctionList.List.electricals.Find((obj) => obj.bus_Data.SubnetID == subnetID && obj.bus_Data.DeviceID == deviceID && obj.bus_Data.loopId == i);
+ var e = FunctionList.List.electricals.Find((obj) => obj.bus.SubnetID == subnetID && obj.bus.DeviceID == deviceID && obj.bus.LoopId == i);
if (e != null)
{
var fan = e as Fan;
@@ -247,7 +247,7 @@
case Command.ReadCurtainStutasACK:
foreach (var curtain in FunctionList.List.curtains)
{
- if (curtain.bus_Data.SubnetID == subnetID && curtain.bus_Data.DeviceID == deviceID)
+ if (curtain.bus.SubnetID == subnetID && curtain.bus.DeviceID == deviceID)
{
if (receiveBytes[0] == 17)
{
@@ -264,7 +264,7 @@
}
else
{
- if (curtain.bus_Data.loopId != receiveBytes[0])
+ if (curtain.bus.LoopId != receiveBytes[0])
continue;
switch (receiveBytes[1])
{
@@ -307,11 +307,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 +401,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;
}
@@ -443,10 +443,10 @@
string tag = receiveBytes[1] + "_" + subnetID + "_" + deviceID + "_" + receiveBytes[2];
foreach (var sensor in FunctionList.List.sensorsEnvironmentalScience)
{
- if (sensor.bus_Data != null)
+ if (sensor.bus != null)
{
- if ((int)sensor.functionType % 256 == receiveBytes[1] && sensor.bus_Data.SubnetID == subnetID &&
- sensor.bus_Data.DeviceID == deviceID && sensor.bus_Data.loopId == receiveBytes[2])
+ if ((int)sensor.functionType % 256 == receiveBytes[1] && sensor.bus.SubnetID == subnetID &&
+ sensor.bus.DeviceID == deviceID && sensor.bus.LoopId == receiveBytes[2])
{
switch (dt)
{
@@ -476,10 +476,10 @@
string tag1 = receiveBytes[1] + "_" + subnetID + "_" + deviceID + "_" + receiveBytes[2];
foreach (var sensor in FunctionList.List.sensorsEnvironmentalScience)
{
- if (sensor.bus_Data != null)
+ if (sensor.bus != null)
{
- if ((int)sensor.functionType % 256 == receiveBytes[1] && sensor.bus_Data.SubnetID == subnetID &&
- sensor.bus_Data.DeviceID == deviceID && sensor.bus_Data.loopId == receiveBytes[2])
+ if ((int)sensor.functionType % 256 == receiveBytes[1] && sensor.bus.SubnetID == subnetID &&
+ sensor.bus.DeviceID == deviceID && sensor.bus.LoopId == receiveBytes[2])
{
//0淇濈暀 1鏃犵鍙�4Byte鏁村舰 2鏈夌鍙�4Byte鏁村舰 3Float褰紙浠Ｂ憋級
switch (receiveBytes[3])
@@ -535,7 +535,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 +561,7 @@
{
if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
{
- ac.trait_IndoorTemp.curValue = receiveBytes[1];
+ ac.trait_IndoorTemp.curValue = receiveBytes[1].ToString();
FunctionPage.UpdataStates(ac);
}
}
@@ -642,12 +642,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