From c416268c4bb3ca958d8166542812a7e67517d858 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 18 十二月 2020 15:43:45 +0800
Subject: [PATCH] 2020-12-18-2
---
HDL_ON/Entity/Function/Light.cs | 79 ++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs
index 0a95c65..48453e6 100644
--- a/HDL_ON/Entity/Function/Light.cs
+++ b/HDL_ON/Entity/Function/Light.cs
@@ -21,7 +21,7 @@
}
[Newtonsoft.Json.JsonIgnore]
- Trait trait_brightness;
+ FunctionAttributes trait_brightness;
/// <summary>
/// 浜害鍊�
/// </summary>
@@ -32,21 +32,23 @@
{
if (trait_brightness == null)
{
- trait_brightness = function.Find((obj) => obj.name == "brightness");
+ trait_brightness = attributes.Find((obj) => obj.key == "brightness");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_brightness == null)
{
- trait_brightness = new Trait()
+ trait_brightness = new FunctionAttributes()
{
- name = "brightness",
- value_key = new List<string> { "up", "down" },
+ key = "brightness",
+ value = new List<string> { "up", "down" },
max = 100,
min = 0,
+ curValue = 0,
};
}
- trait_brightness.value = trait_brightness.min;
+ if (trait_brightness.curValue.ToString() == "{}")
+ trait_brightness.curValue = 0;
}
- return Convert.ToInt32(trait_brightness.value);
+ return Convert.ToInt32(trait_brightness.curValue);
}
set
{
@@ -54,22 +56,21 @@
{
if (trait_brightness == null)
{
- trait_brightness = function.Find((obj) => obj.name == "brightness");
+ trait_brightness = attributes.Find((obj) => obj.key == "brightness");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_brightness == null)
{
- trait_brightness = new Trait()
+ trait_brightness = new FunctionAttributes()
{
- name = "brightness",
- value_key = new List<string> { "up", "down" },
+ key = "brightness",
+ value = new List<string> { "up", "down" },
max = 100,
min = 0,
+ curValue = 0
};
}
- trait_brightness.value = trait_brightness.min;
}
- trait_brightness.value = value;
- MainPage.Log($"brightness 鏁版嵁鍒锋柊{value}.");
+ trait_brightness.curValue = value;
}
catch
{
@@ -79,7 +80,7 @@
}
[Newtonsoft.Json.JsonIgnore]
- Trait trait_fadeTime;
+ FunctionAttributes trait_fadeTime;
/// <summary>
/// 浜害鍊�
/// </summary>
@@ -90,22 +91,23 @@
{
if (trait_fadeTime == null)
{
- trait_fadeTime = function.Find((obj) => obj.name == "fade_time");
+ trait_fadeTime = attributes.Find((obj) => obj.key == "fade_time");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_fadeTime == null)
{
- trait_fadeTime = new Trait()
+ trait_fadeTime = new FunctionAttributes()
{
- name = "fade_time",
- value_key = new List<string> { "up", "down" },
+ key = "fade_time",
+ value = new List<string> { "up", "down" },
max = 10,
min = 0,
+ curValue = 0
};
- trait_fadeTime.value = 0;
- function.Add(trait_fadeTime);
}
}
- return Convert.ToInt32(trait_fadeTime.value);
+ int result = 0;
+ int.TryParse(trait_fadeTime.curValue.ToString(), out result);
+ return result;
}
set
{
@@ -113,22 +115,21 @@
{
if (trait_fadeTime == null)
{
- trait_fadeTime = function.Find((obj) => obj.name == "fade_time");
+ trait_fadeTime = attributes.Find((obj) => obj.key == "fade_time");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_fadeTime == null)
{
- trait_fadeTime = new Trait()
+ trait_fadeTime = new FunctionAttributes()
{
- name = "fade_time",
- value_key = new List<string> { "up", "down" },
+ key = "fade_time",
+ value = new List<string> { "up", "down" },
max = 100,
min = 0,
+ curValue = 0
};
- trait_fadeTime.value = 0;
- function.Add(trait_fadeTime);
}
}
- trait_fadeTime.value = value;
+ trait_fadeTime.curValue = value;
}
catch
{
@@ -137,7 +138,7 @@
}
[Newtonsoft.Json.JsonIgnore]
- public Trait trait_color;
+ public FunctionAttributes trait_color;
/// <summary>
/// RGB棰滆壊
/// 255255255
@@ -149,27 +150,29 @@
{
if (trait_color == null)
{
- trait_color = function.Find((obj) => obj.name == "color");
+ trait_color = attributes.Find((obj) => obj.key == "color");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_color == null)
{
- trait_color = new Trait()
+ trait_color = new FunctionAttributes()
{
- name = "color",
- value_key = new List<string> { "FFFFFF" },
+ key = "color",
+ value = new List<string> { "FFFFFF" },
max = 0xFFFFFF,
- min = 0x000000,
+ min = 0x00000F,
+ curValue = 0x00000F
};
}
- trait_color.value = trait_color.min;
+ if (trait_color.curValue.ToString() == "{}")
+ trait_color.curValue = 0x00000F;
}
- return Convert.ToInt32(trait_color.value);
+ return Convert.ToInt32(trait_color.curValue);
}
set
{
try
{
- trait_color.value = value;
+ trait_color.curValue = value;
}
catch
{
--
Gitblit v1.8.0