From f35f1397c980efdc2542dff7aaa23b1a7dbb65e7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 10:53:34 +0800
Subject: [PATCH] 2020-12-16-1
---
HDL_ON/Entity/Function/Light.cs | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs
index 2092e93..48453e6 100644
--- a/HDL_ON/Entity/Function/Light.cs
+++ b/HDL_ON/Entity/Function/Light.cs
@@ -32,7 +32,7 @@
{
if (trait_brightness == null)
{
- trait_brightness = function.Find((obj) => obj.key == "brightness");
+ trait_brightness = attributes.Find((obj) => obj.key == "brightness");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_brightness == null)
{
@@ -42,9 +42,11 @@
value = new List<string> { "up", "down" },
max = 100,
min = 0,
+ curValue = 0,
};
}
- trait_brightness.curValue = trait_brightness.min;
+ if (trait_brightness.curValue.ToString() == "{}")
+ trait_brightness.curValue = 0;
}
return Convert.ToInt32(trait_brightness.curValue);
}
@@ -54,7 +56,7 @@
{
if (trait_brightness == null)
{
- trait_brightness = function.Find((obj) => obj.key == "brightness");
+ trait_brightness = attributes.Find((obj) => obj.key == "brightness");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_brightness == null)
{
@@ -64,12 +66,11 @@
value = new List<string> { "up", "down" },
max = 100,
min = 0,
+ curValue = 0
};
}
- trait_brightness.curValue = trait_brightness.min;
}
trait_brightness.curValue = value;
- MainPage.Log($"brightness 鏁版嵁鍒锋柊{value}.");
}
catch
{
@@ -90,7 +91,7 @@
{
if (trait_fadeTime == null)
{
- trait_fadeTime = function.Find((obj) => obj.key == "fade_time");
+ trait_fadeTime = attributes.Find((obj) => obj.key == "fade_time");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_fadeTime == null)
{
@@ -100,9 +101,8 @@
value = new List<string> { "up", "down" },
max = 10,
min = 0,
+ curValue = 0
};
- trait_fadeTime.curValue = 0;
- function.Add(trait_fadeTime);
}
}
int result = 0;
@@ -115,7 +115,7 @@
{
if (trait_fadeTime == null)
{
- trait_fadeTime = function.Find((obj) => obj.key == "fade_time");
+ trait_fadeTime = attributes.Find((obj) => obj.key == "fade_time");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_fadeTime == null)
{
@@ -125,9 +125,8 @@
value = new List<string> { "up", "down" },
max = 100,
min = 0,
+ curValue = 0
};
- trait_fadeTime.curValue = 0;
- function.Add(trait_fadeTime);
}
}
trait_fadeTime.curValue = value;
@@ -151,7 +150,7 @@
{
if (trait_color == null)
{
- trait_color = function.Find((obj) => obj.key == "color");
+ trait_color = attributes.Find((obj) => obj.key == "color");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_color == null)
{
@@ -161,9 +160,11 @@
value = new List<string> { "FFFFFF" },
max = 0xFFFFFF,
min = 0x00000F,
+ curValue = 0x00000F
};
}
- trait_color.curValue = trait_color.min;
+ if (trait_color.curValue.ToString() == "{}")
+ trait_color.curValue = 0x00000F;
}
return Convert.ToInt32(trait_color.curValue);
}
--
Gitblit v1.8.0