From ba348b1447a352d746bddf996e6651412f763bf8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 六月 2021 09:36:03 +0800
Subject: [PATCH] 2021-6-23-1

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

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 644e047..c0b0bea 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;
@@ -777,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";
@@ -1159,6 +1163,10 @@
         /// 锛堝共鎺ョ偣锛�
         /// </summary>
         public const string SensorDryContact = "sensor.dryContact";
+        /// <summary>
+        /// 姣背娉紶鎰熷櫒
+        /// </summary>
+        public const string SenesorMegahealth = "sensor.megahealth";
 
         /// <summary>
         /// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
@@ -1177,6 +1185,7 @@
             spkList.Add(SensorDuiShe);
             spkList.Add(SensoruUtrasonic);
             spkList.Add(SensorDryContact);
+            spkList.Add(SenesorMegahealth);
             return spkList;
         }
         #endregion
@@ -1234,29 +1243,9 @@
         /// </summary>
         public const string TvIr = "ir.tv";
         /// <summary>
-        /// 绾㈠鎶曞奖浠�
+        /// 绾㈠銆佸皬绫崇數瑙�
         /// </summary>
-        public const string PjtIr = "ir.pjt";
-        /// <summary>
-        /// 绾㈠鏈洪《鐩�
-        /// </summary>
-        public const string StbIr = "ir.stb";
-        /// <summary>
-        /// 绾㈠褰辩鏈�
-        /// </summary>
-        public const string DvDIr = "ir.dvd";
-        /// <summary>
-        /// 绾㈠绌烘皵鍑�鍖栧櫒
-        /// </summary>
-        public const string PurifierIr = "ir.air_purifier";
-        /// <summary>
-        /// 绾㈠鐑按鍣�
-        /// </summary>
-        public const string HeaterIr = " ir.water_heater";  
-        /// <summary>
-        /// 绾㈠椋庢墖
-        /// </summary>
-        public const string FanIr = "ir.fan";
+        public const string TvXmIr = "ir.tvxm";
         /// <summary>
         /// 瀹剁數銆侀鎵�
         /// </summary>
@@ -1324,6 +1313,7 @@
             spkList.Add(ElectricSocket);
             spkList.Add(ElectricTV);
             spkList.Add(TvIr);
+            spkList.Add(TvXmIr);
             spkList.Add(ElectricFan);
             spkList.Add(ClothesHanger);
             spkList.Add(IrLearn);

--
Gitblit v1.8.0