From aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 21:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
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
old mode 100755
new mode 100644
index 70311e9..b2fd650
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -213,6 +213,7 @@
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
dimmerBar.ProgressBarColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
+ bodyView.colorPicker.ColorImagePath = btnSwitch.IsSelected ? "FunctionIcon/Light/ColorWheel.png" : "FunctionIcon /Light/ColorWheelGray.png";
new System.Threading.Thread(() =>
{
light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
@@ -220,6 +221,10 @@
d.Add(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());
if (btnSwitch.IsSelected)
{
+ if(light.lastBrightness == 0)
+ {
+ light.lastBrightness = 100;
+ }
d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());
}
else
--
Gitblit v1.8.0