From 95a7e380db583108d9716c56fe6d298ca08f8f23 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 九月 2021 10:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jpush_tst' into wxr7
---
HDL_ON/Entity/Function/Light.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs
index bb19c2f..44ee714 100644
--- a/HDL_ON/Entity/Function/Light.cs
+++ b/HDL_ON/Entity/Function/Light.cs
@@ -11,10 +11,13 @@
/// 鑾峰彇rgb棰滆壊
/// </summary>
/// <returns></returns>
- public int GetRGBcolor(Function function )
+ public int GetRGBcolor(Function function ,string rgbString ="")
{
var color = function.GetAttrState(FunctionAttributeKey.RGB).Split(",");
-
+ if(!string.IsNullOrEmpty(rgbString))
+ {
+ color = rgbString.Split(",");
+ }
if(color.Length!= 3)
{
color = new string[] {"100", "100", "100" };
--
Gitblit v1.8.0