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/RGBPageBLL.cs | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 708ca09..96b9127 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -18,12 +18,12 @@
return;
if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
{
- if (bodyView.onDimmerBar)
+ if (!bodyView.onDimmerBar)
{
bodyView.dimmerBar.Progress = uFunction.brightness;
- bodyView.dimmerBar.ProgressBarColor = uFunction.on_off == 1 ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
+ bodyView.dimmerBar.ProgressBarColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
}
- bodyView.btnSwitch.IsSelected = uFunction.on_off == 1;
+ bodyView.btnSwitch.IsSelected = uFunction.on_off == "on";
bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.redColor * 256 * 256 + bodyView.light.greenColor * 256 + bodyView.light.blueColor);
}
}
@@ -63,11 +63,8 @@
light.blueColor = e2[2];
colorChangeTime = DateTime.Now;
btnCurColor.BackgroundColor = (uint)(0xFF000000 + light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor);
- Control.Send("write", this.light);
- }
- else
- {
- MainPage.Log("Skip control rgb!");
+ MainPage.Log($"color change {light.brightness}");
+ Control.Send(CommandType_A.write, this.light);
}
};
colorPicker.MouseUpEventHandler = (sender, e) =>
@@ -108,11 +105,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
{
@@ -121,7 +118,7 @@
dimmerTime = DateTime.Now;
new System.Threading.Thread(() =>
{
- Control.Send("write", light);
+ Control.Send(CommandType_A.write, light);
})
{ IsBackground = true }.Start();
}
@@ -145,8 +142,8 @@
new System.Threading.Thread(() =>
{
var light = this.light as Light;
- 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();
};
@@ -160,7 +157,7 @@
{
light.color = "255255255";
btnCurColor.BackgroundColor = 0xFFFFFFFF;
- Control.Send("write", this.light);
+ Control.Send(CommandType_A.write, this.light);
};
}
--
Gitblit v1.8.0