From a7d20263f28aa009ef8e064a7f9700d7cd642492 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 10 六月 2020 10:06:47 +0800
Subject: [PATCH] 2020-06-10-1
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index da9b79a..bf72473 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)
@@ -58,28 +58,35 @@
/// </summary>
void LoadEvent_DimmerBar()
{
- DateTime dimmerTime = DateTime.MinValue;
+ dimmerBar.OnStartTrackingTouchEvent = (sender, e) => {
+ onDimmerBar = true;
+ };
+ dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
+ onDimmerBar = false;
+ light.brightness = dimmerBar.Progress;
+ Control.Send(CommandType_A.write, light);
+ };
dimmerBar.OnProgressChangedEvent = (sender, e) => {
if (!btnSwitch.IsSelected)
{
- dimmerBar.WaveColor = CSS.CSS_Color.AuxiliaryColor1;
+ //dimmerBar.WaveColor = CSS.CSS_Color.AuxiliaryColor1;
}
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
{
- if (dimmerTime.AddMilliseconds(500) < DateTime.Now)
+ if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)
{
- dimmerTime = DateTime.Now;
+ light.refreshTime = DateTime.Now;
new System.Threading.Thread(() =>
{
- Control.Send("write", light);
+ Control.Send(CommandType_A.write, light);
})
{ IsBackground = true }.Start();
}
@@ -99,11 +106,11 @@
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
- dimmerBar.WaveColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
+ //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