2023年07月26日13:12:21

wjc

2023-07-26 9508510f0b27da3278fa1161eb2ba3dd1e3e2030

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

@@ -285,7 +285,7 @@
                var btnGradualChangeMinValuesText = new Button()
                {
                    X = Application.GetRealWidth(35),
                    Y = btnGradualChangeText.Bottom,// + Application.GetRealHeight(10),
                    Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),
                    Width = Application.GetRealWidth(22),
                    Height = Application.GetRealHeight(21),
                    Text = "0s",
@@ -323,7 +323,7 @@
                var btnGradualChangeMaxValuesText = new Button()
                {
                    X = barFadeTime.Right,
                    Y = btnGradualChangeText.Bottom,// + Application.GetRealHeight(10),
                    Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),
                    Width = Application.GetRealWidth(35),
                    Height = Application.GetRealHeight(21),
                    Text = "10s",
@@ -360,7 +360,7 @@
                var btnEditColorful = new Button()
                {
                    X = Application.GetRealWidth(35),
                    Y = btnGradualChangeText.Bottom,// + Application.GetRealHeight(10),
                    Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),
                    Width = Application.GetRealWidth(22),
                    Height = Application.GetRealHeight(21),
                    UnSelectedImagePath = "Public/Edit.png",
@@ -376,7 +376,7 @@
                var barColorful = new FrameLayout()
                {
                    X = btnEditColorful.Right + Application.GetRealWidth(15),
                    Y = Application.GetRealHeight(27 + heightMore + magriHeight),
                    Y = Application.GetRealHeight(37 + heightMore + magriHeight),
                    Width = Application.GetRealWidth(180),
                    Height = Application.GetRealHeight(8),
                    BackgroundImagePath = "FunctionIcon/Light/ColorfulBar.png",
@@ -386,7 +386,7 @@
                btnColorfulSwitch = new Button()
                {
                    X = barColorful.Right + Application.GetRealWidth(8),
                    Y = btnGradualChangeText.Bottom,// + Application.GetRealHeight(10),
                    Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),
                    Width = Application.GetRealWidth(38),
                    Height = Application.GetRealHeight(24),
                    UnSelectedImagePath = "Public/Switch.png",
@@ -404,6 +404,16 @@
                            function.SetAttrState(FunctionAttributeKey.Colorful, controlColorfulState);
                            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                            d.Add(FunctionAttributeKey.Colorful, controlColorfulState);
                            if (controlColorfulState == "on")
                            {
                                var color = function.GetAttrState(FunctionAttributeKey.ColorfulBegin).Split(",");
                                var sendColorString = color[0] + "," + color[1] + "," + color[2];
                                d.Add(FunctionAttributeKey.ColorfulBegin, sendColorString);
                                color = function.GetAttrState(FunctionAttributeKey.ColorfulEnd).Split(",");
                                sendColorString = color[0] + "," + color[1] + "," + color[2];
                                d.Add(FunctionAttributeKey.ColorfulEnd, sendColorString);
                                d.Add(FunctionAttributeKey.ColorfulTime, function.GetAttrState(FunctionAttributeKey.ColorfulTime));
                            }
                            Control.Ins.SendWriteCommand(function, d);
                        }catch(Exception ex)
                        {