From e13a9980ce617db1394a76944186c5d5bd595d5d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 02 六月 2021 14:37:12 +0800
Subject: [PATCH] 5月需求bug修复

---
 HDL_ON/Entity/Function/Function.cs |   53 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 17bec36..db891e9 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -126,7 +126,6 @@
         /// <returns>淇敼缁撴灉</returns>
         public bool SetAttrState(string key, object value)
         {
-            //var attrState = status.Find((s) => s.key == key.ToString());
             var attr = attributes.Find((s) => s.key == key);
             if (attr == null)
             {
@@ -173,7 +172,7 @@
         #endregion
 
 
-        #region base info
+        #region base info    
         public string sid = "0301011234567801012301230123";
         /// <summary>
         /// 澶囨敞
@@ -877,6 +876,14 @@
         /// </summary>
         public const string TuyaWaterTime = "countdown_1";
         #endregion
+        /// <summary>
+        /// 鍔熺巼
+        /// </summary>
+        public const string Power = "power";
+        /// <summary>
+        /// 鎬荤數閲�
+        /// </summary>
+        public const string TotalElectricity = "total_electricity";
 
 
     }
@@ -1075,6 +1082,11 @@
         /// 鑳芥簮妯″潡
         /// </summary>
         public const string EnergyStandard = "energy.standard";
+
+        /// <summary>
+        /// 鑳芥簮-鐢佃兘
+        /// </summary>
+        public const string ElectricEnergy = "energy.electric";
         /// <summary>
         /// 鑳芥簮spk鍒楄〃
         /// </summary>
@@ -1082,7 +1094,7 @@
         public static List<string> EnergySpkList()
         {
             var spkList = new List<string>();
-            spkList.Add(EnergyStandard);
+            spkList.Add(ElectricEnergy);
             return spkList;
         }
         #endregion
@@ -1147,6 +1159,11 @@
         /// 锛堝共鎺ョ偣锛�
         /// </summary>
         public const string SensorDryContact = "sensor.dryContact";
+        /// <summary>
+        /// 姣背娉紶鎰熷櫒
+        /// </summary>
+        public const string SenesorMegahealth = "sensor.megahealth";
+
 
         /// <summary>
         /// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
@@ -1165,6 +1182,7 @@
             spkList.Add(SensorDuiShe);
             spkList.Add(SensoruUtrasonic);
             spkList.Add(SensorDryContact);
+            spkList.Add(SenesorMegahealth);
             return spkList;
         }
         #endregion
@@ -1222,6 +1240,18 @@
         /// </summary>
         public const string TvIr = "ir.tv";
         /// <summary>
+        /// 瀹剁數銆侀鎵�
+        /// </summary>
+        public const string ElectricFan = "electrical.fan";
+        /// <summary>
+        /// 鍑夐湼
+        /// </summary>
+        public const string ClothesHanger = "electrical.racks";
+        /// <summary>
+        /// 绾㈠閬ユ帶鍣�
+        /// </summary>
+        public const string IrLearn = "ir.learn";
+        /// <summary>
         /// 绾㈠鎶曞奖浠�
         /// </summary>
         public const string PjtIr = "ir.pjt";
@@ -1240,23 +1270,11 @@
         /// <summary>
         /// 绾㈠鐑按鍣�
         /// </summary>
-        public const string HeaterIr = " ir.water_heater";  
+        public const string HeaterIr = " ir.water_heater";
         /// <summary>
         /// 绾㈠椋庢墖
         /// </summary>
         public const string FanIr = "ir.fan";
-        /// <summary>
-        /// 瀹剁數銆侀鎵�
-        /// </summary>
-        public const string ElectricFan = "electrical.fan";
-        /// <summary>
-        /// 鍑夐湼
-        /// </summary>
-        public const string ClothesHanger = "electrical.racks";
-        /// <summary>
-        /// 绾㈠閬ユ帶鍣�
-        /// </summary>
-        public const string IrLearn = "ir.learn";
 
         #region 娑傞甫
         /// <summary>
@@ -1291,6 +1309,8 @@
             spkList.Add(ElectricFan);
             spkList.Add(ClothesHanger);
             spkList.Add(IrLearn);
+            spkList.Add(PjtIr);
+            spkList.Add(StbIr);
             spkList.Add(ElectricTuyaAirCleaner);
             spkList.Add(ElectricTuyaFan);
             spkList.Add(ElectricTuyaWeepRobot);
@@ -1301,6 +1321,7 @@
 
         #endregion
 
+
         #region 璁惧绫�
         /// <summary>
         /// 绾㈠瀹�

--
Gitblit v1.8.0