1111

wxr

2020-12-19 792ca2a402feb952ef890d653f2e049c1230baf1

 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs

old mode 100755
new mode 100644
@@ -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