From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/Entity/Function/Function.cs | 126 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 123 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index b173aa1..0096799 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -109,13 +109,13 @@
/// </summary>
/// <param name="key"></param>
/// <returns></returns>
- public string GetAttrState(string key)
+ public string GetAttrState(string key , string defaultValue = "0")
{
//涓�绾ф煡璇eyValue鍊�
var attrState = attributes.Find((s) => s.key == key.ToString());
if (attrState == null)
{
- return "0";
+ return defaultValue;
}
if (string.IsNullOrEmpty(attrState.state))
{
@@ -243,7 +243,30 @@
/// <summary>
/// 澶囨敞
/// </summary>
- public string name;
+ public string name = "";
+ /// <summary>
+ /// 璁惧缁戝畾鐨刪omeId
+ /// </summary>
+ private string _homeId = "";
+ public string homeId
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(_homeId))
+ {
+ return DB_ResidenceData.Instance.CurrentRegion.id;
+ }
+ else
+ {
+ return _homeId;
+ }
+ }
+ set
+ {
+ _homeId = value;
+ }
+ }
+
/// <summary>
/// 璁惧ID
/// 浜戠璐熻矗鐢熸垚
@@ -403,7 +426,17 @@
/// </summary>
public string modifyTime = "";
+ /// <summary>
+ /// 鎵╁睍淇℃伅
+ /// </summary>
+ public ExtSet extSet = new ExtSet();
+
#endregion
+
+
+ //public void
+
+
/// <summary>
/// 寤舵椂
/// </summary>
@@ -413,6 +446,31 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
public string lastState = "";
+ /// <summary>
+ /// 鑾峰彇鐘舵�佹樉绀烘枃鏈�
+ /// </summary>
+ /// <returns></returns>
+ public string GetLastStateText()
+ {
+ var text = "";
+ switch (spk)
+ {
+ case SPK.HvacCac:
+ switch (GetAttrState(FunctionAttributeKey.Mode))
+ {
+ case "cool":
+ text = Language.StringByID(StringId.Cool);
+ break;
+ case "heat":
+ text = Language.StringByID(StringId.Heat);
+ break;
+ }
+
+ break;
+
+ }
+ return text;
+ }
FunctionAttributes _trait_on_off;
[Newtonsoft.Json.JsonIgnore]
@@ -1029,6 +1087,27 @@
/// </summary>
public const string dew_point_temp = "dew_point_temp";
/// <summary>
+ /// 琛ㄩ潰娓╁害
+ /// </summary>
+ public const string surface_temp = "surface_temp";
+ /// <summary>
+ /// 瀹ゅ唴婀垮害琛ュ伩鍊�
+ /// </summary>
+ public const string room_humidity_cc = "room_humidity_cc";
+ /// <summary>
+ /// 瀹ゅ唴娓╁害琛ュ伩鍊�
+ /// </summary>
+ public const string room_temp_cc = "room_temp_cc";
+ /// <summary>
+ /// 姣涚粏闃�闂�
+ /// </summary>
+ public const string cac_valve = "cac_valve";
+ /// <summary>
+ /// 鍦版殩闃�闂�
+ /// </summary>
+ public const string fh_valve = "fh_valve";
+
+ /// <summary>
/// value
/// </summary>
public const string Value = "value";
@@ -1133,6 +1212,7 @@
/// 鎵撳紑绛夌骇(椋庢墖)
/// </summary>
public const string OpenLevel = "openLevel";
+ public const string fan_speed_percent = "fan_speed_percent";
/// <summary>
/// 绾㈠鎸夐敭
/// </summary>
@@ -1233,6 +1313,22 @@
public static class SPK
{
/// <summary>
+ /// 閫氱敤寮�鍏�
+ /// </summary>
+ public const string OtherCommon = "other.common";
+
+ /// <summary>
+ /// 绌鸿皟绉戞妧绯荤粺锛堢豢寤猴級
+ /// 鎬绘帶
+ /// </summary>
+ public const string AcstParent = "acst.parent";
+ /// <summary>
+ /// 绌鸿皟绉戞妧绯荤粺锛堢豢寤猴級
+ /// 瀛愭帶
+ /// </summary>
+ public const string AcstSub = "acst.sub";
+
+ /// <summary>
/// 闂ㄩ攣
/// </summary>
public const string DoorLock = "security.door";
@@ -1246,6 +1342,7 @@
list.Add(DoorLock);
return list;
}
+
#region 鐏厜
@@ -1415,6 +1512,10 @@
#region 鑳芥簮
/// <summary>
+ /// 閫嗗彉鍣�
+ /// </summary>
+ public const string Inverter = "energy.inverter";
+ /// <summary>
/// 鑳芥簮妯″潡
/// </summary>
public const string EnergyStandard = "energy.standard";
@@ -1520,6 +1621,7 @@
var spkList = new List<string>();
//spkList.Add(SensorLight);
spkList.Add(SensorPir);
+ spkList.Add(SensorHelp);
spkList.Add(SensorDoorWindow);
spkList.Add(SensorSmoke);
spkList.Add(SensorWater);
@@ -1779,6 +1881,13 @@
}
#endregion
+ #region 鍙瀵硅
+ /// <summary>
+ /// HDL鍙瀵硅
+ /// </summary>
+ public const string doorgate="door.gate";
+ #endregion
+
#region 绗笁鏂箂pk鍒楄〃
/// <summary>
/// 鑾峰彇鎵�鏈夌涓夋柟鍝佺墝鍔熻兘鐨剆pk
@@ -1952,4 +2061,15 @@
/// </summary>
public string desc = string.Empty;
}
+
+ /// <summary>
+ /// 鎵╁睍淇℃伅璁剧疆
+ /// </summary>
+ public class ExtSet
+ {
+ /// <summary>
+ /// 鏄惁寮�鍚疄楠屽妯″紡
+ /// </summary>
+ public bool labModel = false;
+ }
}
--
Gitblit v1.8.0