From c1e3ff02ca39fe65d0685b06d1e1f63e25eaedb5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 六月 2023 14:54:12 +0800
Subject: [PATCH] 2023年06月07日14:53:51
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 55bc4b3..1fd9624 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -104,10 +104,10 @@
function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
- if(dimmerBar.Progress > 0)
- {
- d.Add(FunctionAttributeKey.OnOff, "on");
- }
+ //if(dimmerBar.Progress > 0)
+ //{
+ // d.Add(FunctionAttributeKey.OnOff, "on");
+ //}
Control.Ins.SendWriteCommand(function, d);
btnBrightnessText.Text = dimmerBar.Progress + "%";
};
@@ -131,7 +131,7 @@
}
else
{
- if (500 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
+ if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
{
function.refreshTime = DateTime.Now;
new System.Threading.Thread(() =>
@@ -179,18 +179,22 @@
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 (btnSwitch.IsSelected)
+ if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
{
- if(function.lastBrightness == 0)
- {
- function.lastBrightness = 100;
- }
- d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
+ d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
}
- else
- {
- function.lastBrightness = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.Brightness));
- }
+ //if (btnSwitch.IsSelected)
+ //{
+ // if(function.lastBrightness == 0)
+ // {
+ // function.lastBrightness = 100;
+ // }
+ // d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
+ //}
+ //else
+ //{
+ // function.lastBrightness = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.Brightness));
+ //}
Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0