From 312f9ece8d4a46d8989187730fc7f5c7fc36cfb5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 12 七月 2024 15:20:52 +0800
Subject: [PATCH] Update SplashActivity.cs
---
HDL_ON/Entity/Function/Function.cs | 116 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 47 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 2ef2075..2a77f7e 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;
@@ -879,24 +888,24 @@
});
}
- else if (spk == SPK.ElectricalTvHisense)
- {
- list.Add(new FunctionAttributes
- {
- key = FunctionAttributeKey.OnOff,
- curValue = string.Empty,
- });
- list.Add(new FunctionAttributes
- {
- key = FunctionAttributeKey.SetVolume,
- curValue = string.Empty,
- });
- list.Add(new FunctionAttributes
- {
- key = FunctionAttributeKey.Signal,
- curValue = string.Empty,
- });
- }
+ //else if (spk == SPK.ElectricalTvHisense)
+ //{
+ // list.Add(new FunctionAttributes
+ // {
+ // key = FunctionAttributeKey.OnOff,
+ // curValue = string.Empty,
+ // });
+ // list.Add(new FunctionAttributes
+ // {
+ // key = FunctionAttributeKey.SetVolume,
+ // curValue = string.Empty,
+ // });
+ // list.Add(new FunctionAttributes
+ // {
+ // key = FunctionAttributeKey.Signal,
+ // curValue = string.Empty,
+ // });
+ //}
else
{
list.AddRange(attributes);
@@ -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>
/// 鐘舵��,浼犳劅鍣�
@@ -1762,51 +1781,51 @@
/// <summary>
/// 钀ょ煶瑙嗛闂ㄩ攣
/// </summary>
- public const string VideoDoorLock="security.door.ezviz";
+ //public const string VideoDoorLock="security.door.ezviz";
/// <summary>
/// 钀ょ煶鎽勫儚澶�
/// </summary>
- public const string Ev_Ipcam = "security.ipcam.ez";
+ //public const string Ev_Ipcam = "security.ipcam.ez";
/// <summary>
/// 褰遍煶涓帶
/// </summary>
- public const string AvZkAiks = "av.zk.aiks";
+ //public const string AvZkAiks = "av.zk.aiks";
/// <summary>
/// 钀ょ煶瑙嗛闂ㄩ攣spk鍒楄〃
/// </summary>
/// <returns></returns>
- public static List<string> GetVideoDoorLockSPKList()
- {
- var list = new List<string>();
- list.Add(VideoDoorLock);
- return list;
- }
+ //public static List<string> GetVideoDoorLockSPKList()
+ //{
+ // var list = new List<string>();
+ // list.Add(VideoDoorLock);
+ // return list;
+ //}
/// <summary>
/// 褰遍煶涓帶spk鍒楄〃
/// </summary>
/// <returns></returns>
- public static List<string> GetVideoControlsSPKList()
- {
- var list = new List<string>
- {
- AvZkAiks
- };
- return list;
- }
+ //public static List<string> GetVideoControlsSPKList()
+ //{
+ // var list = new List<string>
+ // {
+ // AvZkAiks
+ // };
+ // return list;
+ //}
/// <summary>
/// 钀ょ煶鎽勫儚澶磗pk鍒楄〃
/// </summary>
/// <returns></returns>
- public static List<string> GetEvIpcamSPKList()
- {
- var list = new List<string>();
- list.Add(Ev_Ipcam);
- return list;
- }
+ //public static List<string> GetEvIpcamSPKList()
+ //{
+ // var list = new List<string>();
+ // list.Add(Ev_Ipcam);
+ // return list;
+ //}
#region 鐏厜
/// <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;
}
@@ -2231,7 +2253,7 @@
/// <summary>
/// 娴蜂俊鐢佃
/// </summary>
- public const string ElectricalTvHisense = "electrical.tv.hisense";
+ //public const string ElectricalTvHisense = "electrical.tv.hisense";
/// <summary>
/// 瀹剁數銆佹彃搴�
/// </summary>
@@ -2284,7 +2306,7 @@
/// <summary>
/// 绾㈠鐑按鍣�
/// </summary>
- public const string HeaterIr = " ir.water_heater";
+ public const string HeaterIr = "ir.water_heater";
/// <summary>
/// 绾㈠椋庢墖
/// </summary>
@@ -2350,7 +2372,7 @@
spkList.Add(ElectricTuyaWaterValve);
spkList.Add(ElectricTuyaWaterValve2);
spkList.Add(AirSwitch);
- spkList.Add(ElectricalTvHisense);
+ //spkList.Add(ElectricalTvHisense);
return spkList;
}
--
Gitblit v1.8.0