From 3cebdfad56d78ba04a214fccd1b942a010aeba77 Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期五, 26 三月 2021 09:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index 35e8539..73d66fe 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -463,11 +463,11 @@
byte lightBri = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
if (lightBri == 0)
{
- b = 100;
+ b1 = 100;
}
else
{
- b = lightBri;
+ b1 = lightBri;
}
}
ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] {
@@ -629,6 +629,9 @@
ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, function.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
break;
}
+ break;
+ case FunctionCategory.AirFresh:
+
break;
}
#region 鍙戦�佸懡浠ょ珛鍗虫洿鏂癠I
@@ -890,6 +893,10 @@
case Command.SetACMode:
case Command.ReadFloorHeat:
case Command.SetFloorHeat:
+ case Command.FreshAirRead:
+ case Command.FreshAirControl:
+ case Command.FreshAirRead_JinMao:
+ case Command.FreshAirControl_JinMao:
this.sendFlag += string.Format("{0}", target.AddData[0]);
break;
case Command.SetLogicLoopColor:
--
Gitblit v1.8.0