20201222-1

wei

2020-12-22 d07d62be7111d78b2aaa44c9cdee23a7d22b4dda

 HDL_ON/Entity/Function/Light.cs

@@ -48,7 +48,20 @@
                    if (trait_brightness.curValue.ToString() == "{}")
                        trait_brightness.curValue = 0;
                }
                return Convert.ToInt32(trait_brightness.curValue);
                try

                {

                    string textValue = trait_brightness.curValue.ToString();

                    if (textValue == string.Empty)

                    {

                        trait_brightness.curValue = 0;

                    }

                    return Convert.ToInt32(trait_brightness.curValue);

                }
                catch

                {

                    trait_brightness.curValue = 0;

                    return 0;

                }
            }
            set
            {
@@ -78,7 +91,11 @@
                }
            }
        }

        /// <summary>
        /// 上一次打开的亮度
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public int lastBrightness = 100;
        [Newtonsoft.Json.JsonIgnore]
        FunctionAttributes trait_fadeTime;
        /// <summary>
@@ -115,13 +132,13 @@
                {
                    if (trait_fadeTime == null)
                    {
                        trait_fadeTime = attributes.Find((obj) => obj.key == "fade_time");
                        trait_fadeTime = attributes.Find((obj) => obj.key == FunctionAttributeKey.FadeTime);
                        //找不到属性需要声明一个，防止报错闪退
                        if (trait_fadeTime == null)
                        {
                            trait_fadeTime = new FunctionAttributes()
                            {
                                key = "fade_time",
                                key = FunctionAttributeKey.FadeTime,
                                value = new List<string> { "up", "down" },
                                max = 100,
                                min = 0,
@@ -136,6 +153,8 @@
                }
            }
        }

        #region RGB
        /// <summary>
        /// 获取rgb颜色
        /// </summary>
@@ -210,5 +229,38 @@
                return blueColor;
            }
        }
        #endregion

        #region CCT
        FunctionAttributes attr_CCT;
        /// <summary>
        /// 色温
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public FunctionAttributes Attr_CCT
        {
            get
            {
                if(attr_CCT == null)
                {
                    attr_CCT = attributes.Find((obj) => obj.key == FunctionAttributeKey.CCT);
                    if(attr_CCT== null)
                    {
                        attr_CCT = new FunctionAttributes()
                        {
                            key = FunctionAttributeKey.CCT,
                            value = new List<string> (),
                            max = 6500,
                            min = 2700,
                            curValue = 2700
                        };
                    }
                }
                var result = 2700;
                int.TryParse(attr_CCT.curValue.ToString(), out result);
                return attr_CCT;
            }
        }
        #endregion
    }
}