From 002a3f2e9d2f9579c01f88af12bd8a320003569f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 31 三月 2020 08:57:19 +0800
Subject: [PATCH] 20200331
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index da9b79a..67eedbc 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -19,8 +19,8 @@
if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
{
bodyView.dimmerBar.Progress = uFunction.brightness;
- bodyView.dimmerBar.WaveColor = uFunction.on_off == 1 ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
- bodyView.btnSwitch.IsSelected = uFunction.on_off == 1;
+ bodyView.dimmerBar.WaveColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
+ bodyView.btnSwitch.IsSelected = uFunction.on_off == "on";
}
}
catch (Exception ex)
@@ -66,11 +66,11 @@
}
btnSwitch.IsSelected = e > 0 ? true : false;
light.brightness = e;
- light.on_off = e > 0 ? 1 : 0;
+ light.on_off = e > 0 ? "on" : "off";
if (e == 0 || e == 100)
{
- Control.Send("write", this.light);
+ Control.Send(CommandType_A.write, this.light);
}
else
{
@@ -79,7 +79,7 @@
dimmerTime = DateTime.Now;
new System.Threading.Thread(() =>
{
- Control.Send("write", light);
+ Control.Send(CommandType_A.write, light);
})
{ IsBackground = true }.Start();
}
@@ -102,8 +102,8 @@
dimmerBar.WaveColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
new System.Threading.Thread(() =>
{
- light.on_off = btnSwitch.IsSelected ? 1 : 0;
- Control.Send("write", this.light);
+ light.on_off = btnSwitch.IsSelected ? "on" : "off";
+ Control.Send(CommandType_A.write, this.light);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0