Merge branch 'dev-tzy' into NewFilePath

wxr

2021-01-28 48c07e0a371f67b97abc7c2e61d7f23d060324fc

 HDL_ON/Entity/Function/Light.cs

old mode 100755
new mode 100644
@@ -96,10 +96,44 @@
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public int lastBrightness = 100;

        int hadFadeTime = 99;
        /// <summary>
        /// 是否拥有渐变时间
        /// </summary>
        public bool HadFadeTime
        {
            get
            {
                if (hadFadeTime == 99)
                {
                    var t = attributes.Find((obj) => obj.key == FunctionAttributeKey.FadeTime);
                    if (t == null)
                    {
                        hadFadeTime = 0;
                        return false;
                    }
                    else
                    {
                        hadFadeTime = 1;
                        return true;
                    }
                }
                if (hadFadeTime == 1)
                {
                    return true;
                }
                else
                {
                    return false;
                }
            }
        }

        [Newtonsoft.Json.JsonIgnore]
        FunctionAttributes trait_fadeTime;
        /// <summary>
        /// 亮度值
        /// 渐变时间
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public int fadeTime
@@ -153,6 +187,8 @@
                }
            }
        }

        #region RGB
        /// <summary>
        /// 获取rgb颜色
        /// </summary>
@@ -174,10 +210,10 @@
                }
                if (trait_color.curValue.ToString() == "{}")
                    trait_color.curValue = "255,255,255";
                int.TryParse(trait_color.curValue.ToString().Split(",")[0], out redColor);
                int.TryParse(trait_color.curValue.ToString().Split(",")[1], out greenColor);
                int.TryParse(trait_color.curValue.ToString().Split(",")[2], out blueColor);
            }
            int.TryParse(trait_color.curValue.ToString().Split(",")[0], out redColor);
            int.TryParse(trait_color.curValue.ToString().Split(",")[1], out greenColor);
            int.TryParse(trait_color.curValue.ToString().Split(",")[2], out blueColor);

            int recolor = redColor * 256 * 256 + greenColor * 256 + blueColor;

@@ -200,6 +236,7 @@
            redColor = color[0];
            greenColor = color[1];
            blueColor = color[2];
            trait_color.curValue = redColor + "," + greenColor + "," + blueColor;
        }

        [Newtonsoft.Json.JsonIgnore]
@@ -227,5 +264,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
    }
}