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

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

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

@@ -25,7 +25,7 @@
                            bodyView.dimmerBar.Progress = uFunction.brightness;
                        }

                        if (uFunction.trait_on_off.value.ToString() == "on")
                        if (uFunction.trait_on_off.curValue.ToString() == "on")
                        {
                            bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                        }
@@ -33,7 +33,7 @@
                        {
                            bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
                        }
                        bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.value.ToString() == "on";
                        bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.curValue.ToString() == "on";

                        bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
                        bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
@@ -107,7 +107,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)
                {
@@ -155,9 +155,9 @@
                }
                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();