From 6a8eb1ce9d8e34c50164a4e24e7098e681ee08b6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 06 十一月 2023 15:08:06 +0800
Subject: [PATCH] 国际化支持：场景增加自动化使能配置
---
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index ce7be67..a98ad05 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -302,7 +302,8 @@
break;
case SPK.LightRGB:
break;
- case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
+ case SPK.HvacFloorHeat:
+ case SPK.FloorHeatStandard:
if (f.status.Find((obj)=>obj.key ==FunctionAttributeKey.Mode) == null)
{
foreach (var dic in f.status)
@@ -391,6 +392,9 @@
break;
}
}
+ break;
+ case SPK.OtherCommon:
+
break;
}
}
@@ -552,7 +556,28 @@
}
else
{
- ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Percent)) });
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.Percent))
+ {
+ ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { (byte)(((int)function.bus.LoopId) + 16), Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Percent)) });
+ }
+ else
+ {
+
+ byte tempCurtainState = 0;
+ if (function.trait_on_off.curValue.ToString() == "stop")
+ {
+ tempCurtainState = 0;
+ }
+ else if (function.trait_on_off.curValue.ToString() == "on")
+ {
+ tempCurtainState = 1;
+ }
+ else
+ {
+ tempCurtainState = 2;
+ }
+ ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { function.bus.LoopId, tempCurtainState });
+ }
}
break;
--
Gitblit v1.8.0