From d53f7315de145266e6465d9f95d11d1712b9a91b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 18 十二月 2020 20:55:28 +0800
Subject: [PATCH] 20201218-6
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 6a1b3e2..b2fd650
--- 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)
@@ -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