From 6e8dba90956d7068df68144aa4c6d1189e596255 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 09 七月 2021 17:17:03 +0800
Subject: [PATCH] 调光设备本地控制问题
---
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index 789428d..160eee7 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -437,17 +437,21 @@
switch (function.spk)
{
case SPK.LightCCT:
- byte b0 = 100;//寮�鍏虫搷浣滀緷鎹畂n_off瀛楁锛屽疄闄呭紑鍏冲�间緷鎹産rightness锛屽綋on_off涓烘墦寮�锛宐rightness涓嶈兘涓�0
- if(commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
+ byte b0 = 100;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
{
if (function.trait_on_off.curValue.ToString() == "off")
{
b0 = 0;
}
+ else
+ {
+ b0 = function.lastBrightness == 0 ? (byte)100 : Convert.ToByte(function.lastBrightness);
+ }
}
else
{
- b0 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));// == 0 ? (byte)100 : Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
+ b0 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
}
var bytes0 = new byte[] { function.bus.LoopId,
b0,
@@ -459,22 +463,21 @@
ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes0, 1);
break;
case SPK.LightRGB:
- byte b = 100;//寮�鍏虫搷浣滀緷鎹畂n_off瀛楁锛屽疄闄呭紑鍏冲�间緷鎹産rightness锛屽綋on_off涓烘墦寮�锛宐rightness涓嶈兘涓�0
- if (function.trait_on_off.curValue.ToString() == "off")
+ byte b = 100;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
{
- b = 0;
- }
- else
- {
- byte lightBri1 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
- if (lightBri1 == 0)
+ if (function.trait_on_off.curValue.ToString() == "off")
{
- b = 100;
+ b = 0;
}
else
{
- b = lightBri1;
+ b = function.lastBrightness == 0 ? (byte)100 : Convert.ToByte(function.lastBrightness);
}
+ }
+ else
+ {
+ b = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
}
var tempLight = new Light();
var bytes = new byte[] { function.bus.LoopId,
@@ -488,22 +491,21 @@
break;
case SPK.LightDimming:
byte b1 = 100;
- if (function.trait_on_off.curValue.ToString() == "off")
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
{
- b1 = 0;
- }
- else
- {
- byte lightBri = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
- if (lightBri == 0)
+ if (function.trait_on_off.curValue.ToString() == "off")
{
- b1 = 100;
+ b1 = 0;
}
else
{
- b1 = lightBri;
+ b1 = function.lastBrightness == 0 ? (byte)100 : Convert.ToByte(function.lastBrightness);
}
}
+ else
+ {
+ b1 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
+ }
ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] {
function.bus.LoopId,
b1,
--
Gitblit v1.8.0