From 4f2dbd1f6a1ec2d9c3c39b4a37b0b7c9ddece4aa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 23 九月 2021 15:24:01 +0800
Subject: [PATCH] 主页刷新优化
---
HDL_ON/Entity/Function/Function.cs | 122 +++++++++++++++++++++++++++++++++++++---
1 files changed, 113 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 91adfe7..d24bbdf 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -281,6 +281,21 @@
return _trait_on_off;
}
}
+ /// <summary>
+ /// 鍔熻兘鐨勫睘鎬х姸鎬佸垪琛�
+ /// </summary>
+ public List<AttributesStatus> status = new List<AttributesStatus>();
+ /// <summary>
+ /// 閫氳繃鐘舵�佸垪琛ㄧ粍瑁呭睘鎬ч噷闈㈢殑鐘舵��
+ /// </summary>
+ public void AssembleStatus()
+ {
+ foreach (var sta in status)
+ {
+ SetAttrState(sta.key, sta.value);
+ }
+ }
+
/// <summary>
/// 浣跨敤娆℃暟
@@ -507,7 +522,25 @@
{
attr.curValue = "off";
}
- else
+ else if (attr.key == FunctionAttributeKey.Mode )
+ {
+ if (DB_ResidenceData.Instance.GatewayType == 0)
+ {
+ attr.curValue = "0";
+ }
+ else
+ {
+ if (SPK.AcSpkList().Contains(spk))
+ {
+ attr.curValue = "cool";
+ }
+ else if (SPK.FhSpkList().Contains(spk))
+ {
+ attr.curValue = "day";
+ }
+ }
+ }
+ else
{
attr.curValue = "0";
}
@@ -516,6 +549,10 @@
{
double vv = 16;
Double.TryParse(attr.curValue.ToString(), out vv);
+ if (vv == 0)
+ {
+ vv = 26;
+ }
sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString() });
}
else
@@ -638,7 +675,7 @@
public List<AttributesStatus> status = new List<AttributesStatus>();
}
/// <summary>
- /// a鍗忚鎺у埗鍔ㄤ綔鏁版嵁
+ /// 鍔熻兘灞炴�х姸鎬�
/// </summary>
public class AttributesStatus
{
@@ -658,7 +695,7 @@
/// 鍔熻兘灞炴��
/// 灞炴�у瓧娈佃В鏋愶細attri :灞炴�у唴瀹癸紝value 灞炴�х殑鍊硷紝max 鏈�澶у�� min 鏈�灏忓��
/// </summary>
- [System.Serializable]
+ [Serializable]
public class FunctionAttributes
{
/// <summary>
@@ -690,6 +727,7 @@
/// </summary>
public object curValue = new object();
}
+
/// <summary>
/// 鍔熻兘灞炴�ч敭鍚嶅垪琛�
/// </summary>
@@ -751,6 +789,7 @@
/// 绌鸿皟銆佸湴鐑�//app鑷姞
/// </summary>
public const string TempType = "temperature_type";
+
/// <summary>
/// 鏃堕棿鏍囪
/// 鍦扮儹//app鑷姞
@@ -862,6 +901,10 @@
/// </summary>
public const string Humidity = "humidity";
/// <summary>
+ /// 娓╁害
+ /// </summary>
+ public const string Temperature = "temperature";
+ /// <summary>
/// 瀹ゅ唴娓╁害
/// </summary>
public const string IndoorTemp = "indoor_temp";
@@ -874,7 +917,7 @@
/// </summary>
public const string FilterRemain = "filter_remain";
/// <summary>
- /// 杩囨护缃戞槸鍚﹁秴鏃惰鍛�
+ /// 杩囨护缃戞槸鍚﹁秴鏃惰鍛�
/// </summary>
public const string FilterTimeout = "filter_timeout";
@@ -1164,7 +1207,7 @@
/// <summary>
/// 瓒呭０娉紶鎰熷櫒
/// </summary>
- public const string SensoruUtrasonic = "sensor.ultrasonic";
+ public const string SensorUtrasonic = "sensor.ultrasonic";
/// <summary>
/// 锛堝共鎺ョ偣锛�
/// </summary>
@@ -1173,7 +1216,6 @@
/// 姣背娉紶鎰熷櫒
/// </summary>
public const string SenesorMegahealth = "sensor.megahealth";
-
/// <summary>
/// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
/// </summary>
@@ -1186,11 +1228,11 @@
spkList.Add(SensorDoorWindow);
spkList.Add(SensorSmoke);
spkList.Add(SensorWater);
- //spkList.Add(SensorGas);
+ spkList.Add(SensorGas);
//spkList.Add(SensorShanLan);
//spkList.Add(SensorDuiShe);
//spkList.Add(SensoruUtrasonic);
- //spkList.Add(SensorDryContact);
+ spkList.Add(SensorDryContact);
spkList.Add(SenesorMegahealth);
return spkList;
}
@@ -1217,7 +1259,44 @@
/// 婀垮害浼犳劅鍣�
/// </summary>
public const string SensorHumidity = "sensor.humidity";
+ /// <summary>
+ /// 鐜浼犳劅鍣�
+ /// 鐜妫�娴嬩紶鎰熷櫒
+ /// 鐗规畩绫籹pk
+ /// 璇pk鍔熻兘鏄幆澧冧紶鎰熷櫒鍔熻兘鐨勯泦鎴�
+ /// </summary>
+ public const string SensorEnvironment = "sensor.environment";
+ /// <summary>
+ /// 闈掕悕鐜浼犳劅鍣�
+ /// </summary>
+ public const string SensorEnvironment2 = "sensor.environment2";
+ /// <summary>
+ /// 闈掕悕鐜浼犳劅鍣�
+ /// </summary>
+ public const string SensorEnvironment3 = "sensor.environment3";
+ /// <summary>
+ /// 鐢查啗
+ /// </summary>
+ public const string SensorHcho = "sensor.hcho";
+ /// <summary>
+ /// 鐜浼犳劅鍣ㄨ澶噑pk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> EnvironDeviceSpkList()
+ {
+ var spkList = new List<string>();
+ spkList.Add(SensorTemperature);
+ spkList.Add(SensorPm25);
+ spkList.Add(SensorCO2);
+ spkList.Add(SensorTVOC);
+ spkList.Add(SensorHumidity);
+ spkList.Add(SensorEnvironment);
+ spkList.Add(SensorEnvironment2);
+ spkList.Add(SensorEnvironment3);
+ spkList.Add(SensorHcho);
+ return spkList;
+ }
/// <summary>
/// 鐜浼犳劅鍣╯pk鍒楄〃
/// </summary>
@@ -1230,8 +1309,23 @@
spkList.Add(SensorCO2);
spkList.Add(SensorTVOC);
spkList.Add(SensorHumidity);
+ spkList.Add(SensorHcho);
return spkList;
}
+
+ /// <summary>
+ /// 鐜浼犳劅鍣ㄨ澶囧垪琛�
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> EvironmentSensorList()
+ {
+ var spkList = new List<string>();
+ spkList.Add(SensorEnvironment);
+ spkList.Add(SensorEnvironment2);
+ spkList.Add(SensorEnvironment3);
+ return spkList;
+ }
+
#endregion
#endregion
@@ -1288,6 +1382,10 @@
/// 绾㈠椋庢墖
/// </summary>
public const string FanIr = "ir.fan";
+ /// <summary>
+ /// 鏅鸿兘绌哄紑
+ /// </summary>
+ public const string AirSwitch = "electrical.breaker";
#region 娑傞甫
/// <summary>
@@ -1330,12 +1428,12 @@
spkList.Add(ElectricTuyaFan);
spkList.Add(ElectricTuyaWeepRobot);
spkList.Add(ElectricTuyaWaterValve);
+ spkList.Add(AirSwitch);
return spkList;
}
#endregion
-
#region 璁惧绫�
/// <summary>
@@ -1394,6 +1492,12 @@
}
#endregion
+ /// <summary>
+ /// 娌℃湁鐘舵�佹樉绀虹殑鍔熻兘spk鍒楄〃
+ /// </summary>
+ public static List<string> NotStatusSpkList = new List<string> {
+ ElectricTV, FanIr, TvIr, TvXmIr, StbIr, PjtIr, IrLearn
+ };
/// <summary>
/// 绗笁鏂瑰搧鐗屽垪琛�
--
Gitblit v1.8.0