From efcffde735fa65ae34bae0bcc86313b74ed0e36c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 20 五月 2024 13:47:38 +0800
Subject: [PATCH] 优化离线数据

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

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 2ef2075..7bcc154 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -108,6 +108,7 @@
         /// 鑾峰彇灞炴�у綋鍓嶇姸鎬�
         /// </summary>
         /// <param name="key"></param>
+        /// <param name="defaultValue">榛樿鍊�</param>
         /// <returns></returns>
         public string GetAttrState(string key, string defaultValue = "0")
         {
@@ -120,7 +121,7 @@
             if (string.IsNullOrEmpty(attrState.state))
             {
                 //浜岀骇鏌ヨkeyValue鍊�
-                return GetOriginalState(key);
+                return GetOriginalState(key, defaultValue);
             }
             return attrState.state;
         }
@@ -130,13 +131,14 @@
         /// 榛樿鍊硷細0
         /// </summary>
         /// <param name="key">璇泙瀹氫箟鐨勫睘鎬у��</param>
+        /// <param name="defaultValue">榛樿鍊�</param>
         /// <returns></returns>
-        public string GetOriginalState(string key)
+        public string GetOriginalState(string key, string defaultValue)
         {
             var originalState = status.Find((s) => s.key == key.ToString());
             if (originalState == null || string.IsNullOrEmpty(originalState.value))
             {
-                return "0";
+                return defaultValue;
             }
             return originalState.value;
         }
@@ -171,6 +173,13 @@
                 string iconPath = spk.Replace(".", "");
                 switch (spk)
                 {
+                    case SPK.SensorDryContact2:
+                    case SPK.OtherCommon:
+                        iconPath = "sensordryContact";
+                        break;
+                    //case SPK.SensorLight:
+                    //    iconPath = "lightswitch";
+                    //    break;
                     case SPK.AirSwitchP3:
                         iconPath = "electricalbreaker";
                         break;
@@ -449,7 +458,7 @@
         public bool online {
             get
             {
-                if (spk == SPK.AirSwitchP3)
+                if (spk == SPK.AirSwitchP3|| spk == SPK.ElectricalTvHisense)
                 {
                     return _online;
                 }
@@ -1058,6 +1067,11 @@
         /// 鏇存柊鏃堕棿
         /// </summary>
         public DateTime refreshTime = DateTime.MinValue;
+        /// <summary>
+        /// 鏈�鍚庢洿鏂扮姸鎬佺殑鏃堕棿
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public DateTime updateTime = DateTime.MinValue;
 
         /// <summary>
         /// 鑾峰彇鏈湴鎺у埗鏁版嵁
@@ -1480,7 +1494,12 @@
         public const string Temperature = "temperature";
         public const string Hcho = "hcho";
         public const string Humidity = "humidity";
+        /// <summary>
+        /// 鐓у害
+        /// </summary>
+        public const string Illuminance = "illuminance";
         public const string Pm25 = "pm25";
+        public const string Pm10 = "pm10";
         public const string Tvoc = "tvoc";
         /// <summary>
         /// 鐘舵��,浼犳劅鍣�
@@ -2192,6 +2211,7 @@
             spkList.Add(SensorEnvironment2);
             spkList.Add(SensorEnvironment3);
             spkList.Add(SensorHcho);
+            spkList.Add(SensorLight);
             return spkList;
         }
         /// <summary>
@@ -2208,6 +2228,7 @@
             spkList.Add(SensorTVOC);
             spkList.Add(SensorHumidity);
             spkList.Add(SensorHcho);
+            spkList.Add(SensorLight);
             return spkList;
         }
 
@@ -2221,6 +2242,7 @@
             spkList.Add(SensorEnvironment); spkList.Add(SensorEnvironmentHailin);
             spkList.Add(SensorEnvironment2);
             spkList.Add(SensorEnvironment3);
+         
             return spkList;
         }
 
@@ -2284,7 +2306,7 @@
         /// <summary>
         /// 绾㈠鐑按鍣�
         /// </summary>
-        public const string HeaterIr = " ir.water_heater";
+        public const string HeaterIr = "ir.water_heater";
         /// <summary>
         /// 绾㈠椋庢墖
         /// </summary>

--
Gitblit v1.8.0