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

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 HDL_ON/Entity/Function/Light.cs

@@ -21,7 +21,7 @@
        }

        [Newtonsoft.Json.JsonIgnore]
        Trait trait_brightness;
        FunctionAttributes trait_brightness;
        /// <summary>
        /// 亮度值
        /// </summary>
@@ -32,21 +32,21 @@
            {
                if (trait_brightness == null)
                {
                    trait_brightness = function.Find((obj) => obj.name == "brightness");
                    trait_brightness = function.Find((obj) => obj.key == "brightness");
                    //找不到属性需要声明一个，防止报错闪退
                    if (trait_brightness == null)
                    {
                        trait_brightness = new Trait()
                        trait_brightness = new FunctionAttributes()
                        {
                            name = "brightness",
                            value_key = new List<string> { "up", "down" },
                            key = "brightness",
                            value = new List<string> { "up", "down" },
                            max = 100,
                            min = 0,
                        };
                    }
                    trait_brightness.value = trait_brightness.min;
                    trait_brightness.curValue = trait_brightness.min;
                }
                return Convert.ToInt32(trait_brightness.value);
                return Convert.ToInt32(trait_brightness.curValue);
            }
            set
            {
@@ -54,21 +54,21 @@
                {
                    if (trait_brightness == null)
                    {
                        trait_brightness = function.Find((obj) => obj.name == "brightness");
                        trait_brightness = function.Find((obj) => obj.key == "brightness");
                        //找不到属性需要声明一个，防止报错闪退
                        if (trait_brightness == null)
                        {
                            trait_brightness = new Trait()
                            trait_brightness = new FunctionAttributes()
                            {
                                name = "brightness",
                                value_key = new List<string> { "up", "down" },
                                key = "brightness",
                                value = new List<string> { "up", "down" },
                                max = 100,
                                min = 0,
                            };
                        }
                        trait_brightness.value = trait_brightness.min;
                        trait_brightness.curValue = trait_brightness.min;
                    }
                    trait_brightness.value = value;
                    trait_brightness.curValue = value;
                    MainPage.Log($"brightness 数据刷新{value}.");
                }
                catch
@@ -79,7 +79,7 @@
        }

        [Newtonsoft.Json.JsonIgnore]
        Trait trait_fadeTime;
        FunctionAttributes trait_fadeTime;
        /// <summary>
        /// 亮度值
        /// </summary>
@@ -90,23 +90,23 @@
            {
                if (trait_fadeTime == null)
                {
                    trait_fadeTime = function.Find((obj) => obj.name == "fade_time");
                    trait_fadeTime = function.Find((obj) => obj.key == "fade_time");
                    //找不到属性需要声明一个，防止报错闪退
                    if (trait_fadeTime == null)
                    {
                        trait_fadeTime = new Trait()
                        trait_fadeTime = new FunctionAttributes()
                        {
                            name = "fade_time",
                            value_key = new List<string> { "up", "down" },
                            key = "fade_time",
                            value = new List<string> { "up", "down" },
                            max = 10,
                            min = 0,
                        };
                        trait_fadeTime.value = 0;
                        trait_fadeTime.curValue = 0;
                        function.Add(trait_fadeTime);
                    }
                }
                int result = 0;
                int.TryParse(trait_fadeTime.value.ToString(), out result);
                int.TryParse(trait_fadeTime.curValue.ToString(), out result);
                return result;
            }
            set
@@ -115,22 +115,22 @@
                {
                    if (trait_fadeTime == null)
                    {
                        trait_fadeTime = function.Find((obj) => obj.name == "fade_time");
                        trait_fadeTime = function.Find((obj) => obj.key == "fade_time");
                        //找不到属性需要声明一个，防止报错闪退
                        if (trait_fadeTime == null)
                        {
                            trait_fadeTime = new Trait()
                            trait_fadeTime = new FunctionAttributes()
                            {
                                name = "fade_time",
                                value_key = new List<string> { "up", "down" },
                                key = "fade_time",
                                value = new List<string> { "up", "down" },
                                max = 100,
                                min = 0,
                            };
                            trait_fadeTime.value = 0;
                            trait_fadeTime.curValue = 0;
                            function.Add(trait_fadeTime);
                        }
                    }
                    trait_fadeTime.value = value;
                    trait_fadeTime.curValue = value;
                }
                catch
                {
@@ -139,7 +139,7 @@
        }

        [Newtonsoft.Json.JsonIgnore]
        public Trait trait_color;
        public FunctionAttributes trait_color;
        /// <summary>
        /// RGB颜色
        /// 255255255
@@ -151,27 +151,27 @@
            {
                if (trait_color == null)
                {
                    trait_color = function.Find((obj) => obj.name == "color");
                    trait_color = function.Find((obj) => obj.key == "color");
                    //找不到属性需要声明一个，防止报错闪退
                    if (trait_color == null)
                    {
                        trait_color = new Trait()
                        trait_color = new FunctionAttributes()
                        {
                            name = "color",
                            value_key = new List<string> { "FFFFFF" },
                            key = "color",
                            value = new List<string> { "FFFFFF" },
                            max = 0xFFFFFF,
                            min = 0x00000F,
                        };
                    }
                    trait_color.value = trait_color.min;
                    trait_color.curValue = trait_color.min;
                }
                return Convert.ToInt32(trait_color.value);
                return Convert.ToInt32(trait_color.curValue);
            }
            set
            {
                try
                {
                    trait_color.value = value;
                    trait_color.curValue = value;
                }
                catch
                {