20201221-3

wei

2020-12-21 1887ea937010ff8caba39622e8246a2802ca02c5

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

@@ -62,7 +62,6 @@
            actionRefresh = () => {
                btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
                //light.SaveFunctionData(true);
            };
        }

@@ -217,11 +216,13 @@
                    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(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());
                    d.Add(FunctionAttributeKey.FadeTime, light.fadeTime.ToString());
                    if (btnSwitch.IsSelected)
                    {
                        if(light.lastBrightness == 0)
                        {
                            light.lastBrightness = 100;
                            dimmerBar.Progress = 100;
                        }
                        d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());
                    }
@@ -241,7 +242,10 @@
        {
            btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
            {
                btnWhiteRound.Visible = false;
                if(light.trait_on_off.curValue.ToString() == "off")
                {
                    return;
                }
                light.SetRGBcolor(new byte[] { 255, 255, 255 });
                btnCurColor.BackgroundColor = 0xFFFFFFFF;
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();