From 334daf8dc48d6798524162228ae9cbe221773010 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 13:55:15 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 757b621..a97feb3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -157,8 +157,13 @@
light.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, light.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.FadeTime, light.fadeTime.ToString());
if (btnSwitch.IsSelected)
{
+ if(light.lastBrightness == 0)
+ {
+ light.lastBrightness = 100;
+ }
d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());
}
else
--
Gitblit v1.8.0