1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

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

@@ -23,8 +23,8 @@
                        {
                            bodyView.dimmerBar.Progress = uFunction.brightness;
                        }
                        bodyView.dimmerBar.ProgressBarColor = uFunction.trait_on_off.value.ToString() == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                        bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.value.ToString() == "on";
                        bodyView.dimmerBar.ProgressBarColor = uFunction.trait_on_off.curValue.ToString() == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                        bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.curValue.ToString() == "on";
                        bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.redColor * 256 * 256 + bodyView.light.greenColor * 256 + bodyView.light.blueColor);
                    }
                }
@@ -115,7 +115,7 @@
                }
                btnSwitch.IsSelected = e > 0 ? true : false;
                light.brightness = e;
                light.trait_on_off.value = e > 0 ? "on" : "off";
                light.trait_on_off.curValue = e > 0 ? "on" : "off";

                if (e == 0 || e == 100)
                {
@@ -168,9 +168,9 @@
                dimmerBar.ProgressBarColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                new System.Threading.Thread(() =>
                {
                    light.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
                    light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add("on_off", light.trait_on_off.value.ToString());
                    d.Add("on_off", light.trait_on_off.curValue.ToString());
                    Control.Ins.SendWriteCommand(light, d);
                })
                { IsBackground = true }.Start();