From df3906c03db154e8622b7caeaa3bf93b67c6d40a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 10:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into CJL-Linphone
---
HDL_ON/Entity/Function/Light.cs | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs
index 65d6f5a..021d510 100644
--- a/HDL_ON/Entity/Function/Light.cs
+++ b/HDL_ON/Entity/Function/Light.cs
@@ -11,13 +11,16 @@
/// 鑾峰彇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[] {"100", "100", "100" };
+ color = new string[] {"255", "255", "255" };
}
int redColor = 0;
int greenColor = 0;
@@ -32,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];
@@ -68,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