From 92906312dfc5f55b6ef364f4d9da0d5768c00782 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath

---
 HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 318e5aa..a97feb3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -160,6 +160,10 @@
                     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