From ed1c010c40e9324318171edefec5e9dbf46474a4 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 18 十二月 2020 18:01:09 +0800
Subject: [PATCH] 20201218-4
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 6a1b3e2..70311e9 100755
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -19,17 +19,17 @@
return;
if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
{
- if (!bodyView.onDimmerBar)
- {
- bodyView.dimmerBar.Progress = uFunction.brightness;
- }
- //鐘舵�佷竴鏍锋椂,涓嶅啀鍒锋柊瑙嗗浘
- if (uFunction.trait_on_off.curValue.ToString() == "on" && bodyView.btnSwitch.IsSelected == false)
+
+ if (uFunction.trait_on_off.curValue.ToString() == "on")
{
bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
bodyView.btnSwitch.IsSelected = true;
bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.GetRGBcolor());
+ if (!bodyView.onDimmerBar)
+ {
+ bodyView.dimmerBar.Progress = uFunction.brightness;
+ }
}
//鐘舵�佷竴鏍锋椂,涓嶅啀鍒锋柊瑙嗗浘
else if (uFunction.trait_on_off.curValue.ToString() == "off" && bodyView.btnSwitch.IsSelected == true)
--
Gitblit v1.8.0