From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01
---
HDL_ON/Entity/Function/Light.cs | 57 +++++++++++++++++++--------------------------------------
1 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs
index b50e5fb..86e7065 100644
--- a/HDL_ON/Entity/Function/Light.cs
+++ b/HDL_ON/Entity/Function/Light.cs
@@ -32,21 +32,21 @@
{
if (trait_brightness == null)
{
- trait_brightness = function.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,21 +54,21 @@
{
if (trait_brightness == null)
{
- trait_brightness = function.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
@@ -91,27 +91,27 @@
{
if (trait_color == null)
{
- trait_color = function.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,
};
}
- 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
{
@@ -211,25 +211,6 @@
var sendJob = new JObject();
if (command == CommandType_A.write)
{
-
-#if DEBUG
- switch(sid)
- {
- case "00010114051D0A300C92C902020200010001":
- sid = "00010114041710193123D402020200010001";
- break;
- case "00010114051D0A300C92C902020200020001":
- sid = "00010114041710193123D402020200020001";
- break;
- case "00010114051D0A300C92C902020200030001":
- sid = "00010114041710193123D402020200030001";
- break;
- case "00010114051D0A300C92C902020200040001":
- sid = "00010114041710193123D402020200040001";
- break;
- }
-#endif
-
sendJob = new JObject { { "vendor_code", vendor_code }, { "command", command.ToString() }, { "type", "device" } };
JObject data = new JObject { { "sid", sid } };
sendJob.Add("objects", data);
@@ -241,7 +222,7 @@
{
name = "on_off",
data_type = "Bool",
- value = on_off
+ value = trait_on_off.value.ToString()
});
break;
case FunctionType.Dimmer:
@@ -249,7 +230,7 @@
{
name = "on_off",
data_type = "Bool",
- value = on_off
+ value = trait_on_off.value.ToString()
});
controlData.Add(new ControlData()
{
@@ -263,7 +244,7 @@
{
name = "on_off",
data_type = "Bool",
- value = on_off
+ value = trait_on_off.value.ToString()
});
controlData.Add(new ControlData()
{
--
Gitblit v1.8.0