From 358044c907e0e492b26377b21ca5091d19b503c8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 十一月 2021 09:58:59 +0800
Subject: [PATCH] 合并wjc
---
HDL_ON/Entity/Function/Light.cs | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs
index 63d3f63..021d510 100644
--- a/HDL_ON/Entity/Function/Light.cs
+++ b/HDL_ON/Entity/Function/Light.cs
@@ -11,10 +11,17 @@
/// 鑾峰彇rgb棰滆壊
/// </summary>
/// <returns></returns>
- public int GetRGBcolor(Function function )
+ public int GetRGBcolor(string rgbString)
{
- var color = function.GetAttrState(FunctionAttributeKey.RGB).Split(",");
-
+ //var color = function.GetAttrState(FunctionAttributeKey.RGB).Split(",");
+ //if(!string.IsNullOrEmpty(rgbString))
+ //{
+ var color = rgbString.Split(",");
+ //}
+ if(color.Length!= 3)
+ {
+ color = new string[] {"255", "255", "255" };
+ }
int redColor = 0;
int greenColor = 0;
int blueColor = 0;
@@ -28,10 +35,34 @@
return recolor;
}
/// <summary>
+ /// 鑾峰彇rgb棰滆壊鏁扮粍
+ /// </summary>
+ /// <param name="function"></param>
+ /// <returns></returns>
+ public byte[] GetRGBbytes(Function function)
+ {
+ var color = function.GetAttrState(FunctionAttributeKey.RGB).Split(",");
+
+ if (color.Length != 3)
+ {
+ color = new string[] { "100", "100", "100" };
+ }
+ byte redColor = 0;
+ byte greenColor = 0;
+ byte blueColor = 0;
+
+ byte.TryParse(color[0], out redColor);
+ byte.TryParse(color[1], out greenColor);
+ byte.TryParse(color[2], out blueColor);
+
+ return new byte[] { redColor, greenColor, blueColor };
+ }
+
+ /// <summary>
/// 鑾峰彇rgb 鎺у埗瀛楃涓�
/// </summary>
/// <returns></returns>
- public string GetRGBcolorString(Function function )
+ public string GetRGBcolorString(Function function)
{
var color = function.GetAttrState(FunctionAttributeKey.RGB).Split(",");
return color[0] + "," + color[1] + "," + color[2];
@@ -64,6 +95,16 @@
function.SetAttrState(FunctionAttributeKey.RGB, color[0] + "," + color[1] + "," + color[2]);
}
+ /// <summary>
+ /// 璁剧疆鑹叉俯
+ /// </summary>
+ /// <param name="cct"></param>
+ /// <param name="function"></param>
+ public void SetCCT(byte[] cct,Function function)
+ {
+ function.SetAttrState(FunctionAttributeKey.CCT, cct[0] * 256 + cct[1]);
+ }
+
#endregion
}
--
Gitblit v1.8.0