From d07d62be7111d78b2aaa44c9cdee23a7d22b4dda Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期二, 22 十二月 2020 10:38:15 +0800 Subject: [PATCH] 20201222-1 --- HDL_ON/Entity/Function/Light.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 56 insertions(+), 4 deletions(-) diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs index c6c9738..f9843cb 100644 --- a/HDL_ON/Entity/Function/Light.cs +++ b/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); //鎵句笉鍒板睘鎬ч渶瑕佸0鏄庝竴涓紝闃叉鎶ラ敊闂�� 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 } } -- Gitblit v1.8.0