From 753e67c3705dddb8e913bd853db151f94f81d600 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 六月 2023 09:45:05 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr'
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 8dbdfa5..697f09c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -185,6 +185,7 @@
lightTemp.SetRGBcolor(lastColor, function);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.RGB, lightTemp.GetRGBcolorString(function));
+ d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
Control.Ins.SendWriteCommand(function, d,false,0);
break;
}
@@ -305,6 +306,10 @@
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
+ if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
+ {
+ d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
+ }
if (btnSwitch.IsSelected)
{
if(function.lastBrightness == 0)
--
Gitblit v1.8.0