From cb6e11c5067ecaba4d8f9907989154167c1e8943 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:15:05 +0800
Subject: [PATCH] Merge branch 'wxr4' into dev-tzy

---
 HDL_ON/Entity/Function/Function.cs |   67 ++++++++++++++++++++++++++++-----
 1 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index f7f94b2..dee04dc 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+using System;
 using System.Collections.Generic;
 using HDL_ON.Common;
 using HDL_ON.DAL.Server;
@@ -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)
             {
@@ -778,6 +777,10 @@
         /// </summary>
         public const string Status = "status";
         /// <summary>
+        /// 姣背娉紶鎰熷櫒锛屽姩浣滅姸鎬�
+        /// </summary>
+        public const string ActionStatus = "action_state";
+        /// <summary>
         /// 鐢甸噺鐘舵��
         /// </summary>
         public const string BatteryState = "battery_state";
@@ -877,6 +880,14 @@
         /// </summary>
         public const string TuyaWaterTime = "countdown_1";
         #endregion
+        /// <summary>
+        /// 鍔熺巼
+        /// </summary>
+        public const string Power = "power";
+        /// <summary>
+        /// 鎬荤數閲�
+        /// </summary>
+        public const string TotalElectricity = "total_electricity";
 
 
     }
@@ -934,6 +945,8 @@
 
     public static class SPK
     {
+       
+
 
         #region 鐏厜
         /// <summary>
@@ -1075,6 +1088,11 @@
         /// 鑳芥簮妯″潡
         /// </summary>
         public const string EnergyStandard = "energy.standard";
+
+        /// <summary>
+        /// 鑳芥簮-鐢佃兘
+        /// </summary>
+        public const string ElectricEnergy = "energy.electric";
         /// <summary>
         /// 鑳芥簮spk鍒楄〃
         /// </summary>
@@ -1082,7 +1100,7 @@
         public static List<string> EnergySpkList()
         {
             var spkList = new List<string>();
-            spkList.Add(EnergyStandard);
+            spkList.Add(ElectricEnergy);
             return spkList;
         }
         #endregion
@@ -1147,6 +1165,10 @@
         /// 锛堝共鎺ョ偣锛�
         /// </summary>
         public const string SensorDryContact = "sensor.dryContact";
+        /// <summary>
+        /// 姣背娉紶鎰熷櫒
+        /// </summary>
+        public const string SenesorMegahealth = "sensor.megahealth";
 
         /// <summary>
         /// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
@@ -1165,6 +1187,7 @@
             spkList.Add(SensorDuiShe);
             spkList.Add(SensoruUtrasonic);
             spkList.Add(SensorDryContact);
+            spkList.Add(SenesorMegahealth);
             return spkList;
         }
         #endregion
@@ -1221,6 +1244,10 @@
         /// 绾㈠銆佺數瑙�
         /// </summary>
         public const string TvIr = "ir.tv";
+        /// <summary>
+        /// 绾㈠銆佸皬绫崇數瑙�
+        /// </summary>
+        public const string TvXmIr = "ir.tvxm";
         /// <summary>
         /// 瀹剁數銆侀鎵�
         /// </summary>
@@ -1288,9 +1315,12 @@
             spkList.Add(ElectricSocket);
             spkList.Add(ElectricTV);
             spkList.Add(TvIr);
+            spkList.Add(TvXmIr);
             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,12 +1331,6 @@
 
         #endregion
 
-        #region 鑳芥簮
-        /// <summary>
-        /// 鑳芥簮-鐢佃兘
-        /// </summary>
-        public const string ElectricEnergy = "energy.electric";
-        #endregion 
 
         #region 璁惧绫�
         /// <summary>
@@ -1326,7 +1350,21 @@
         }
         #endregion
 
-
+        #region 绗笁鏂箂pk鍒楄〃
+        /// <summary>
+        /// 鑾峰彇鎵�鏈夌涓夋柟鍝佺墝鍔熻兘鐨剆pk
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> GetAll3tySPK()
+        {
+            var spkList = new List<string>();
+            spkList.Add(ElectricTuyaAirCleaner);
+            spkList.Add(ElectricTuyaFan);
+            spkList.Add(ElectricTuyaWaterValve);
+            spkList.Add(ElectricTuyaWeepRobot);
+            spkList.Add(SenesorMegahealth);
+            return spkList;
+        }
         /// <summary>
         /// 鑾峰彇绗笁鏂硅澶噑pk
         /// </summary>
@@ -1337,16 +1375,19 @@
 
             switch (brandType)
             {
-                case BrandType.All3tyBrand:
                 case BrandType.Tuya:
                     list.Add(ElectricTuyaAirCleaner);
                     list.Add(ElectricTuyaFan);
                     list.Add(ElectricTuyaWaterValve);
                     list.Add(ElectricTuyaWeepRobot);
                     break;
+                case BrandType.All3tyBrand:
+                    list.Add(SenesorMegahealth);//鍏嗚
+                    break;
             }
             return list;
         }
+        #endregion
 
 
         /// <summary>
@@ -1357,6 +1398,10 @@
             All = 0,
             Hdl = 1,
             Tuya = 2,
+            /// <summary>
+            /// 鍏嗚
+            /// </summary>
+            Megahealth = 3,
 
 
             All3tyBrand = 999,

--
Gitblit v1.8.0