20201216-4

wei

2020-12-16 dcf60777c9346ff058f06298d03173f0c53d1902

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

@@ -25,7 +25,7 @@
                        }
                        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);
                        bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.GetRGBcolor());
                    }
                }
                catch (Exception ex)
@@ -61,14 +61,12 @@
            colorPicker.ColorChaged += (sender2, e2) => {
                if ((DateTime.Now - colorChangeTime).TotalMilliseconds > 200)
                {
                    light.redColor = e2[0];
                    light.greenColor = e2[1];
                    light.blueColor = e2[2];
                    light.SetRGBcolor(e2);
                    colorChangeTime = DateTime.Now;
                    btnCurColor.BackgroundColor = (uint)(0xFF000000 + light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor);
                    btnCurColor.BackgroundColor = (uint)(0xFF000000 + light.GetRGBcolor());
                    //Control.Send(CommandType_A.write, this.light);
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add("color", (light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor).ToString());
                    d.Add(FunctionAttributeKey.RGB, light.GetRGBcolorString());
                    Control.Ins.SendWriteCommand(light, d);
                }
            };
@@ -103,7 +101,7 @@
                onDimmerBar = false;
                light.brightness = dimmerBar.Progress;
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("brightness", light.brightness.ToString());
                d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
                Control.Ins.SendWriteCommand(light, d);
                light.fadeTime = barFadeTime.Progress;
                //Control.Send(CommandType_A.write, light);
@@ -122,7 +120,7 @@
                {
                    //Control.Send(CommandType_A.write, this.light);
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add("brightness", light.brightness.ToString());
                    d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
                    Control.Ins.SendWriteCommand(light, d);
                }
                else
@@ -134,7 +132,7 @@
                        {
                            //Control.Send(CommandType_A.write, light);
                            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                            d.Add("brightness", light.brightness.ToString());
                            d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
                            Control.Ins.SendWriteCommand(light, d);
                        })
                        { IsBackground = true }.Start();
@@ -171,7 +169,7 @@
                {
                    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.curValue.ToString());
                    d.Add(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());
                    Control.Ins.SendWriteCommand(light, d);
                })
                { IsBackground = true }.Start();
@@ -184,13 +182,12 @@
        {
            btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
            {
                light.color = 0xFFFFFF;
                light.SetRGBcolor(new byte[] { 255, 255, 255 });
                btnCurColor.BackgroundColor = 0xFFFFFFFF;
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("color", "FFFFFF");
                d.Add(FunctionAttributeKey.RGB, light.GetRGBcolorString());
                Control.Ins.SendWriteCommand(light, d);
            };
        }

    }
}