From ea318e20d9a513bfae81a9203cef4bca0fc23c2c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 30 九月 2020 11:01:15 +0800
Subject: [PATCH] 202009301
---
HDL_ON/Entity/Function/Light.cs | 131 ++++++++++++++++++++++++++-----------------
1 files changed, 78 insertions(+), 53 deletions(-)
diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs
index de3fcc2..2dfa921 100644
--- a/HDL_ON/Entity/Function/Light.cs
+++ b/HDL_ON/Entity/Function/Light.cs
@@ -21,7 +21,7 @@
}
[Newtonsoft.Json.JsonIgnore]
- public Trait trait_brightness;
+ Trait trait_brightness;
/// <summary>
/// 浜害鍊�
/// </summary>
@@ -32,21 +32,21 @@
{
if (trait_brightness == null)
{
- trait_brightness = propertList.Find((obj) => obj.attri == "brightness");
+ trait_brightness = function.Find((obj) => obj.name == "brightness");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_brightness == null)
{
trait_brightness = new Trait()
{
- attri = "brightness",
- value = new List<string> { "up", "down" },
+ name = "brightness",
+ value_key = new List<string> { "up", "down" },
max = 100,
min = 0,
};
}
- trait_brightness.curValues = trait_brightness.min;
+ trait_brightness.value = trait_brightness.min;
}
- return Convert.ToInt32(trait_brightness.curValues);
+ return Convert.ToInt32(trait_brightness.value);
}
set
{
@@ -54,26 +54,86 @@
{
if (trait_brightness == null)
{
- trait_brightness = propertList.Find((obj) => obj.attri == "brightness");
+ trait_brightness = function.Find((obj) => obj.name == "brightness");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_brightness == null)
{
trait_brightness = new Trait()
{
- attri = "brightness",
- value = new List<string> { "up", "down" },
+ name = "brightness",
+ value_key = new List<string> { "up", "down" },
max = 100,
min = 0,
};
}
- trait_brightness.curValues = trait_brightness.min;
+ trait_brightness.value = trait_brightness.min;
}
- trait_brightness.curValues = value;
+ trait_brightness.value = value;
MainPage.Log($"brightness 鏁版嵁鍒锋柊{value}.");
}
catch
{
MainPage.Log("brightness 鏁版嵁鍒锋柊澶辫触.");
+ }
+ }
+ }
+
+ [Newtonsoft.Json.JsonIgnore]
+ Trait trait_fadeTime;
+ /// <summary>
+ /// 浜害鍊�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public int fadeTime
+ {
+ get
+ {
+ if (trait_fadeTime == null)
+ {
+ trait_fadeTime = function.Find((obj) => obj.name == "fade_time");
+ //鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
+ if (trait_fadeTime == null)
+ {
+ trait_fadeTime = new Trait()
+ {
+ name = "fade_time",
+ value_key = new List<string> { "up", "down" },
+ max = 10,
+ min = 0,
+ };
+ trait_fadeTime.value = 0;
+ function.Add(trait_fadeTime);
+ }
+ }
+ int result = 0;
+ int.TryParse(trait_fadeTime.value.ToString(), out result);
+ return result;
+ }
+ set
+ {
+ try
+ {
+ if (trait_fadeTime == null)
+ {
+ trait_fadeTime = function.Find((obj) => obj.name == "fade_time");
+ //鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
+ if (trait_fadeTime == null)
+ {
+ trait_fadeTime = new Trait()
+ {
+ name = "fade_time",
+ value_key = new List<string> { "up", "down" },
+ max = 100,
+ min = 0,
+ };
+ trait_fadeTime.value = 0;
+ function.Add(trait_fadeTime);
+ }
+ }
+ trait_fadeTime.value = value;
+ }
+ catch
+ {
}
}
}
@@ -91,27 +151,27 @@
{
if (trait_color == null)
{
- trait_color = propertList.Find((obj) => obj.attri == "color");
+ trait_color = function.Find((obj) => obj.name == "color");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_color == null)
{
trait_color = new Trait()
{
- attri = "color",
- value = new List<string> { "FFFFFF" },
+ name = "color",
+ value_key = new List<string> { "FFFFFF" },
max = 0xFFFFFF,
- min = 0x000000,
+ min = 0x00000F,
};
}
- trait_color.curValues = trait_color.min;
+ trait_color.value = trait_color.min;
}
- return Convert.ToInt32(trait_color.curValues);
+ return Convert.ToInt32(trait_color.value);
}
set
{
try
{
- trait_color.curValues = value;
+ trait_color.value = value;
}
catch
{
@@ -200,41 +260,6 @@
MainPage.Log($"set blue color error : {ex.Message}");
}
}
- }
-
-
- /// <summary>
- /// 鎷兼帴銆佽幏鍙朅鍗忚鎿嶄綔鏁版嵁
- /// </summary>
- public override JObject GetSendJObject(CommandType_A command )
- {
- var sendJob = new JObject();
- if (command == CommandType_A.write)
- {
-
- sendJob = new JObject { { "vendor_code", vendor_code }, { "Command", command.ToString() }, { "Type", "device" } };
- JObject data = null;
- switch (functionType)
- {
- case FunctionType.Relay:
- data = new JObject { { "sid", sid }, { "switch", on_off } };
- break;
- case FunctionType.Dimmer:
- data = new JObject { { "sid", sid }, { "brightness", brightness } };
- break;
- case FunctionType.RGB:
- data = new JObject { { "sid", sid }, { "brightness", brightness }, { "color", color } };
- break;
- }
- sendJob.Add("objects", data);
- }
- else if (command == CommandType_A.read)
- {
- sendJob = new JObject { { "vendor_code", vendor_code }, { "Command", command.ToString() }, { "Type", "device" } };
- var data = new JObject {{ "sid", sid } };
- sendJob.Add("objects", data);
- }
- return sendJob;
}
}
}
--
Gitblit v1.8.0