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 | 100 ++++++++++++++++++++++++++++----------------------
1 files changed, 56 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index b8a2894..2a77f7e 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -173,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;
@@ -881,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);
@@ -1487,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>
/// 鐘舵��,浼犳劅鍣�
@@ -1769,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>
@@ -2241,7 +2253,7 @@
/// <summary>
/// 娴蜂俊鐢佃
/// </summary>
- public const string ElectricalTvHisense = "electrical.tv.hisense";
+ //public const string ElectricalTvHisense = "electrical.tv.hisense";
/// <summary>
/// 瀹剁數銆佹彃搴�
/// </summary>
@@ -2294,7 +2306,7 @@
/// <summary>
/// 绾㈠鐑按鍣�
/// </summary>
- public const string HeaterIr = " ir.water_heater";
+ public const string HeaterIr = "ir.water_heater";
/// <summary>
/// 绾㈠椋庢墖
/// </summary>
@@ -2360,7 +2372,7 @@
spkList.Add(ElectricTuyaWaterValve);
spkList.Add(ElectricTuyaWaterValve2);
spkList.Add(AirSwitch);
- spkList.Add(ElectricalTvHisense);
+ //spkList.Add(ElectricalTvHisense);
return spkList;
}
--
Gitblit v1.8.0