From 9508510f0b27da3278fa1161eb2ba3dd1e3e2030 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 26 七月 2023 13:14:00 +0800
Subject: [PATCH] 2023年07月26日13:12:21
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index c724edb..5e700b2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -67,6 +67,9 @@
barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
{
function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
+ var d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.FadeTime, e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
function.SaveFunctionFile();
};
}
@@ -179,18 +182,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