From 6fe1c5ebeb8312edc479a4576f05d80c5051a6c6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 19 七月 2023 19:47:00 +0800
Subject: [PATCH] 炫彩功能优化

---
 HDL_ON/Entity/Function/Function.cs |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 323eb48..8b52231 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -109,7 +109,7 @@
         /// </summary>
         /// <param name="key"></param>
         /// <returns></returns>
-        public string GetAttrState(string key , string defaultValue = "0")
+        public string GetAttrState(string key, string defaultValue = "0")
         {
             //涓�绾ф煡璇eyValue鍊�
             var attrState = attributes.Find((s) => s.key == key.ToString());
@@ -279,7 +279,7 @@
         /// <summary>
         /// 鐗╃悊璁惧(妯″潡)鍨嬪彿
         /// </summary>
-        public string omodel =string.Empty;
+        public string omodel = string.Empty;
         /// <summary>
         /// 璁惧spk
         /// </summary>
@@ -372,6 +372,39 @@
         /// attri
         /// </summary>
         public List<FunctionAttributes> attributes = new List<FunctionAttributes>();
+
+        public List<FunctionAttributes> GetFunctionAttributes()
+        {
+            if (spk == SPK.GroupControl)
+            {
+                var list = new List<FunctionAttributes>();
+                var gc = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
+                if (gc != null)
+                {
+                    foreach (var temp in gc.sids)
+                    {
+                        var light = FunctionList.List.GetLightList().Find((obj) => obj.sid == temp.sid);
+                        if (light != null)
+                        {
+                            foreach (var attr in light.attributes)
+                            {
+                                if (list.Find((obj) => obj.key == attr.key) == null)
+                                {
+                                    list.Add(attr);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                return list;
+            }
+            else
+            {
+                return attributes;
+            }
+        }
+
 
         /// <summary>
         /// 鎴块棿ID鍒楄〃
@@ -766,6 +799,10 @@
         public SceneFunction ConvertSceneFunction()
         {
             var sFunc = new SceneFunction();
+            if(spk == SPK.GroupControl)
+            {
+
+            }
             foreach (var attr in attributes)
             {
                 //绐楀笜鍚屾椂鍙戦�佸紑鍏宠窡鐧惧垎姣斾細鏈夐棶棰橈紝
@@ -778,6 +815,9 @@
                             continue;
                         }
                     }
+                }else if (spk == SPK.GroupControl)
+                {
+                    sFunc.type = "5";
                 }
 
                 string us = "";
@@ -816,11 +856,15 @@
                     case FunctionAttributeKey.CCT:
                     case FunctionAttributeKey.RGB:
                     case FunctionAttributeKey.Angle:
+                    case FunctionAttributeKey.Colorful:
+                    case FunctionAttributeKey.ColorfulBegin:
+                    case FunctionAttributeKey.ColorfulEnd:
+                    case FunctionAttributeKey.ColorfulTime:
                     case "security":
                         //case FunctionAttributeKey.FadeTime:
                         if (attr.curValue.ToString() == "{}")
                         {
-                            if (attr.key == FunctionAttributeKey.OnOff)
+                            if (attr.key == FunctionAttributeKey.OnOff || attr.key == FunctionAttributeKey.Colorful)
                             {
                                 attr.curValue = "off";
                             }
@@ -869,7 +913,6 @@
                                 UintString = us,
                                 key = attr.key, value = attr.curValue.ToString(), max = attr.max, min = attr.min });
                         }
-
                         break;
                 }
             }
@@ -1421,7 +1464,7 @@
         /// <summary>
         /// 缇ゆ帶锛堣嚜瀹氫箟锛�
         /// </summary>
-        public const string GroupControl = "GroupControl";
+        public const string GroupControl = "groupControl";
         /// <summary>
         /// 閫氱敤寮�鍏�
         /// </summary>
@@ -1467,9 +1510,14 @@
         
 
         /// <summary>
-        /// 鐚溂
+        /// 鐚溂(鏃pk)
         /// </summary>
         public const string Peephole = "peephole";
+
+        /// <summary>
+        /// 鐚溂(鏂皊pk 鏆傛椂娌＄敤)
+        /// </summary>
+        //public const string PeepholeEz = "security.peephole.ez";
         /// <summary>
         /// 钀ょ煶瑙嗛闂ㄩ攣
         /// </summary>

--
Gitblit v1.8.0