From bb76b9da3c856292499e2913280fa2ee43337161 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 03 八月 2022 11:48:57 +0800
Subject: [PATCH] 场景图片oss地址
---
HDL_ON/Entity/Function/Function.cs | 93 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 92 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index b173aa1..ba20bf1 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -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>
@@ -1952,4 +2032,15 @@
/// </summary>
public string desc = string.Empty;
}
+
+ /// <summary>
+ /// 鎵╁睍淇℃伅璁剧疆
+ /// </summary>
+ public class ExtSet
+ {
+ /// <summary>
+ /// 鏄惁寮�鍚疄楠屽妯″紡
+ /// </summary>
+ public bool labModel = false;
+ }
}
--
Gitblit v1.8.0