From cd4189a3f0e3896a37f2307d842af6c8ee4dc0ec Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 14 六月 2023 13:20:53 +0800
Subject: [PATCH] 调整日志库
---
HDL_ON/Entity/Function/Function.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index a562b51..267a286 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -780,6 +780,31 @@
}
}
+ string us = "";
+ switch (attr.key)
+ {
+ case FunctionAttributeKey.SetTemp:
+ case FunctionAttributeKey.RoomTemp:
+ us = "掳C";
+ var tempType = attributes.Find((obj) => obj.key == FunctionAttributeKey.TempType);
+ if (tempType != null)
+ {
+ us = tempType.curValue.ToString();
+ }
+ break;
+ case FunctionAttributeKey.Percent:
+ case FunctionAttributeKey.Brightness:
+ us = "%";
+ break;
+ case FunctionAttributeKey.CCT:
+ us = "K";
+ break;
+ case FunctionAttributeKey.Angle:
+ us = "掳";
+ break;
+ }
+
+
switch (attr.key)
{
case FunctionAttributeKey.OnOff:
@@ -834,11 +859,15 @@
{
vv = 26;
}
- sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString(), max = attr.max, min = attr.min });
+ sFunc.status.Add(new SceneFunctionStatus() {
+ UintString = us,
+ key = attr.key, value = Convert.ToInt32(vv).ToString(), max = attr.max, min = attr.min }) ;
}
else
{
- sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString(), max = attr.max, min = attr.min });
+ sFunc.status.Add(new SceneFunctionStatus() {
+ UintString = us,
+ key = attr.key, value = attr.curValue.ToString(), max = attr.max, min = attr.min });
}
break;
@@ -1416,6 +1445,7 @@
return list;
}
+
/// <summary>
/// 鐚溂
/// </summary>
@@ -1425,6 +1455,10 @@
/// </summary>
public const string VideoDoorLock="security.door.ezviz";
/// <summary>
+ /// 钀ょ煶鎽勫儚澶�
+ /// </summary>
+ public const string Ev_Ipcam = "security.ipcam.ez";
+ /// <summary>
/// 钀ょ煶瑙嗛闂ㄩ攣spk鍒楄〃
/// </summary>
/// <returns></returns>
@@ -1432,6 +1466,17 @@
{
var list = new List<string>();
list.Add(VideoDoorLock);
+ return list;
+ }
+
+ /// <summary>
+ /// 钀ょ煶鎽勫儚澶磗pk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> GetEvIpcamSPKList()
+ {
+ var list = new List<string>();
+ list.Add(Ev_Ipcam);
return list;
}
@@ -1665,6 +1710,10 @@
/// </summary>
public const string SensorPir = "sensor.pir";
/// <summary>
+ /// 浜轰綋瀛樺湪浼犳劅鍣�
+ /// </summary>
+ public const string SensorPirHold = "sensor.pir_hold";
+ /// <summary>
/// 锛堥棬绐椾紶鎰熷櫒锛�
/// </summary>
public const string SensorDoorWindow = "sensor.doorwindow";
@@ -1719,6 +1768,7 @@
var spkList = new List<string>();
//spkList.Add(SensorLight);
spkList.Add(SensorPir);
+ spkList.Add(SensorPirHold);
spkList.Add(SensorHelp);
spkList.Add(SensorDoorWindow);
spkList.Add(SensorSmoke);
--
Gitblit v1.8.0