From 94d6591af7870ba0f1f7797310c07581d6fcd0b4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 04 十一月 2022 16:27:14 +0800
Subject: [PATCH] 2022年11月04日16:26:44

---
 HDL_ON/Entity/Function/Function.cs |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 9aa3e47..961046d 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -109,13 +109,13 @@
         /// </summary>
         /// <param name="key"></param>
         /// <returns></returns>
-        public string GetAttrState(string key)
+        public string GetAttrState(string key , string defaultValue = "0")
         {
             //涓�绾ф煡璇eyValue鍊�
             var attrState = attributes.Find((s) => s.key == key.ToString());
             if (attrState == null)
             {
-                return "0";
+                return defaultValue;
             }
             if (string.IsNullOrEmpty(attrState.state))
             {
@@ -400,16 +400,20 @@
         /// 鏄惁鏀惰棌
         /// </summary>
         public bool collect = false;
+
+        private bool _online = false;
         /// <summary>
         /// 鏄惁鍦ㄧ嚎
         /// </summary>
-        public bool online {
+        public bool online
+        {
             get
             {
                 return true;
             }
-            set {
-
+            set
+            {
+                _online = value;
             }
         }
 
@@ -1009,6 +1013,7 @@
         /// 棰滆壊
         /// </summary>
         public const string RGB = "rgb";
+        public const string RGBW = "rgbw";
         /// <summary>
         /// 娓愬彉鏃堕棿
         /// </summary>
@@ -1316,6 +1321,20 @@
         /// 閫氱敤寮�鍏�
         /// </summary>
         public const string OtherCommon = "other.common";
+        /// <summary>
+        /// 鏈烘鎵�
+        /// </summary>
+        public const string MechanicalArm = "electrical.mechanical_arm";
+        /// <summary>
+        /// 绌鸿皟绉戞妧绯荤粺锛堢豢寤猴級
+        /// 鎬绘帶
+        /// </summary>
+        public const string AcstParent = "acst.parent";
+        /// <summary>
+        /// 绌鸿皟绉戞妧绯荤粺锛堢豢寤猴級
+        /// 瀛愭帶
+        /// </summary>
+        public const string AcstSub = "acst.sub";
 
         /// <summary>
         /// 闂ㄩ攣
@@ -1331,6 +1350,7 @@
             list.Add(DoorLock);
             return list;
         }
+
 
 
         #region 鐏厜
@@ -1499,6 +1519,10 @@
         #endregion
 
         #region 鑳芥簮
+        /// <summary>
+        /// 閫嗗彉鍣�
+        /// </summary>
+        public const string Inverter = "energy.inverter";
         /// <summary>
         /// 鑳芥簮妯″潡
         /// </summary>
@@ -1865,6 +1889,13 @@
         }
         #endregion
 
+        #region 鍙瀵硅
+        /// <summary>
+        /// HDL鍙瀵硅
+        /// </summary>
+        public const string doorgate="door.gate";
+        #endregion
+
         #region 绗笁鏂箂pk鍒楄〃
         /// <summary>
         /// 鑾峰彇鎵�鏈夌涓夋柟鍝佺墝鍔熻兘鐨剆pk

--
Gitblit v1.8.0