From 1b56157e8edc3f502810820d99b607e3629c7171 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 七月 2023 09:42:00 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/Entity/Function/Function.cs | 67 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 171de78..0960b7e 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:
@@ -791,11 +816,15 @@
case FunctionAttributeKey.CCT:
case FunctionAttributeKey.RGB:
case FunctionAttributeKey.Angle:
+ case FunctionAttributeKey.Colorful:
+ case FunctionAttributeKey.ColorfulBegin:
+ case FunctionAttributeKey.ColorfulEnd:
+ case FunctionAttributeKey.ColorfulTime:
case "security":
//case FunctionAttributeKey.FadeTime:
if (attr.curValue.ToString() == "{}")
{
- if (attr.key == FunctionAttributeKey.OnOff)
+ if (attr.key == FunctionAttributeKey.OnOff || attr.key == FunctionAttributeKey.Colorful)
{
attr.curValue = "off";
}
@@ -834,13 +863,16 @@
{
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;
}
}
@@ -1065,6 +1097,22 @@
/// 浜害
/// </summary>
public const string Brightness = "brightness";
+ /// <summary>
+ /// 鐐僵寮�鍏�
+ /// </summary>
+ public const string Colorful = "colorful";
+ /// <summary>
+ /// 鐐僵寮�鍚鑹�
+ /// </summary>
+ public const string ColorfulBegin = "colorful_begin";
+ /// <summary>
+ /// 鐐僵缁撴潫棰滆壊
+ /// </summary>
+ public const string ColorfulEnd = "colorful_end";
+ /// <summary>
+ /// 鐐僵杩愯鏃堕棿
+ /// </summary>
+ public const string ColorfulTime = "colorful_time";
/// <summary>
/// 棰滆壊
/// </summary>
@@ -1382,6 +1430,10 @@
/// </summary>
public const string OtherCommon = "other.common";
/// <summary>
+ /// 搴忓垪
+ /// </summary>
+ public const string CommonSeries = "other.series";
+ /// <summary>
/// 澶у崕鎽勫儚澶�
/// </summary>
public const string IpCam_Imou = "security.ipcam.imou";
@@ -1418,9 +1470,14 @@
/// <summary>
- /// 鐚溂
+ /// 鐚溂(鏃pk)
/// </summary>
public const string Peephole = "peephole";
+
+ /// <summary>
+ /// 鐚溂(鏂皊pk 鏆傛椂娌＄敤)
+ /// </summary>
+ //public const string PeepholeEz = "security.peephole.ez";
/// <summary>
/// 钀ょ煶瑙嗛闂ㄩ攣
/// </summary>
--
Gitblit v1.8.0