From 3cebdfad56d78ba04a214fccd1b942a010aeba77 Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期五, 26 三月 2021 09:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL_ON/Entity/Function/Function.cs | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 177d948..5b69485 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -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,7 @@
{
var spkList = new List<string>();
spkList.Add(AirFreshStandard);
+ spkList.Add(AirFreshJinmao);
return spkList;
}
#endregion
@@ -1181,6 +1216,7 @@
/// 绾㈠閬ユ帶鍣�
/// </summary>
public const string IrLearn = "ir.learn";
+
#region 娑傞甫
/// <summary>
/// 瀹剁數銆佹秱楦︾┖姘斿噣鍖栧櫒
--
Gitblit v1.8.0