From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/Entity/Function/Light.cs | 101 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 94 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs
index c6c9738..d430811 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,11 +91,49 @@
}
}
}
+ /// <summary>
+ /// 涓婁竴娆℃墦寮�鐨勪寒搴�
+ /// </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
@@ -115,13 +166,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 +187,8 @@
}
}
}
+
+ #region RGB
/// <summary>
/// 鑾峰彇rgb棰滆壊
/// </summary>
@@ -157,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;
@@ -183,6 +236,7 @@
redColor = color[0];
greenColor = color[1];
blueColor = color[2];
+ trait_color.curValue = redColor + "," + greenColor + "," + blueColor;
}
[Newtonsoft.Json.JsonIgnore]
@@ -210,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
}
}
--
Gitblit v1.8.0