From 5bfb959c47017825c8cf7dc8570c55b04dab694c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:42:11 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into wxr6

---
 HDL_ON/Entity/Function/Function.cs |   92 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 177d948..f7f94b2 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -173,7 +173,7 @@
         #endregion
 
 
-        #region base info
+        #region base info    
         public string sid = "0301011234567801012301230123";
         /// <summary>
         /// 澶囨敞
@@ -768,7 +768,7 @@
         /// <summary>
         /// 瀹ゅ唴娓╁害
         /// </summary>
-        public const string IndoorTemp = "room_temp";
+        public const string RoomTemp = "room_temp";
         /// <summary>
         /// value
         /// </summary>
@@ -838,7 +838,7 @@
         /// </summary>
         public const string AnionTimeLeft = "anion_time_surplus";
         /// <summary>
-        /// 鎵撳紑鐧昏(椋庢墖)
+        /// 鎵撳紑绛夌骇(椋庢墖)
         /// </summary>
         public const string OpenLevel = "openLevel";
         /// <summary>
@@ -846,6 +846,30 @@
         /// </summary>
         public const string Key = "key";
 
+        /// <summary>
+        /// 鑺傝兘
+        /// </summary>
+        public const string Energy = "energy";
+        /// <summary>
+        /// 婀垮害
+        /// </summary>
+        public const string Humidity = "humidity";
+        /// <summary>
+        /// 瀹ゅ唴娓╁害
+        /// </summary>
+        public const string IndoorTemp = "indoor_temp";
+        /// <summary>
+        /// 瀹ゅ唴婀垮害
+        /// </summary>
+        public const string IndoorHumidity = "indoor_humidity";
+        /// <summary>
+        /// 杩囨护缃戝墿浣欓噺
+        /// </summary>
+        public const string FilterRemain = "filter_remain";
+        /// <summary>
+        /// 杩囨护缃戞槸鍚﹁秴鏃惰鍛�
+        /// </summary>
+        public const string FilterTimeout = "filter_timeout";
 
         #region tuya
         /// <summary>
@@ -895,7 +919,13 @@
         {
             get
             {
-                return Convert.ToByte(loopId, 16);
+                try
+                {
+                    return Convert.ToByte(loopId, 16);
+                }catch
+                {
+                    return 0;
+                }
             }
         }
 
@@ -1022,6 +1052,10 @@
         /// 锛堟柊椋庯級
         /// </summary>
         public const string AirFreshStandard = "airFresh.standard";
+        /// <summary>
+        /// 鏂伴 鈥斺�旈噾鑼傚畾鍒�
+        /// </summary>
+        public const string AirFreshJinmao = "airFresh.jinmao";
 
         /// <summary>
         /// 鏂伴spk鍒楄〃
@@ -1031,6 +1065,24 @@
         {
             var spkList = new List<string>();
             spkList.Add(AirFreshStandard);
+            spkList.Add(AirFreshJinmao);
+            return spkList;
+        }
+        #endregion
+
+        #region 鑳芥簮
+        /// <summary>
+        /// 鑳芥簮妯″潡
+        /// </summary>
+        public const string EnergyStandard = "energy.standard";
+        /// <summary>
+        /// 鑳芥簮spk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> EnergySpkList()
+        {
+            var spkList = new List<string>();
+            spkList.Add(EnergyStandard);
             return spkList;
         }
         #endregion
@@ -1181,6 +1233,31 @@
         /// 绾㈠閬ユ帶鍣�
         /// </summary>
         public const string IrLearn = "ir.learn";
+        /// <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";
+
         #region 娑傞甫
         /// <summary>
         /// 瀹剁數銆佹秱楦︾┖姘斿噣鍖栧櫒
@@ -1224,6 +1301,13 @@
 
         #endregion
 
+        #region 鑳芥簮
+        /// <summary>
+        /// 鑳芥簮-鐢佃兘
+        /// </summary>
+        public const string ElectricEnergy = "energy.electric";
+        #endregion 
+
         #region 璁惧绫�
         /// <summary>
         /// 绾㈠瀹�

--
Gitblit v1.8.0