From 849d8656a8ec66bf3472ddabdc541f98cd0f3e09 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 17 十二月 2020 19:47:42 +0800
Subject: [PATCH] 2020-12-17 1.信息中心增加换行显示。2.收到报警推送类型的通知才弹窗。
---
HDL_ON/Entity/Function/Light.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs
index c6c9738..e611406 100644
--- a/HDL_ON/Entity/Function/Light.cs
+++ b/HDL_ON/Entity/Function/Light.cs
@@ -78,7 +78,11 @@
}
}
}
-
+ /// <summary>
+ /// 涓婁竴娆℃墦寮�鐨勪寒搴�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public int lastBrightness = 100;
[Newtonsoft.Json.JsonIgnore]
FunctionAttributes trait_fadeTime;
/// <summary>
@@ -115,13 +119,13 @@
{
if (trait_fadeTime == null)
{
- trait_fadeTime = attributes.Find((obj) => obj.key == "fade_time");
+ trait_fadeTime = attributes.Find((obj) => obj.key == FunctionAttributeKey.FadeTime);
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_fadeTime == null)
{
trait_fadeTime = new FunctionAttributes()
{
- key = "fade_time",
+ key = FunctionAttributeKey.FadeTime,
value = new List<string> { "up", "down" },
max = 100,
min = 0,
--
Gitblit v1.8.0