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/RGBPageBLL.cs | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 96b9127..639ad66 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -21,8 +21,8 @@
if (!bodyView.onDimmerBar)
{
bodyView.dimmerBar.Progress = uFunction.brightness;
- bodyView.dimmerBar.ProgressBarColor = uFunction.on_off == "on" ? 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 == "on";
bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.redColor * 256 * 256 + bodyView.light.greenColor * 256 + bodyView.light.blueColor);
}
@@ -63,7 +63,6 @@
light.blueColor = e2[2];
colorChangeTime = DateTime.Now;
btnCurColor.BackgroundColor = (uint)(0xFF000000 + light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor);
- MainPage.Log($"color change {light.brightness}");
Control.Send(CommandType_A.write, this.light);
}
};
@@ -91,12 +90,13 @@
/// </summary>
void LoadEvent_DimmerBar()
{
- DateTime dimmerTime = DateTime.MinValue;
- dimmerBar.MouseDownEventHandler = (sender, e)=>{
+ dimmerBar.OnStartTrackingTouchEvent = (sender, e)=>{
onDimmerBar = true;
};
- dimmerBar.MouseUpEventHandler = (sender, e) => {
+ dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
onDimmerBar = false;
+ light.brightness = dimmerBar.Progress;
+ Control.Send(CommandType_A.write, light);
};
dimmerBar.OnProgressChangedEvent = (sender, e) => {
if (!btnSwitch.IsSelected)
@@ -113,9 +113,9 @@
}
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(CommandType_A.write, light);
@@ -141,7 +141,6 @@
dimmerBar.ProgressBarColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
new System.Threading.Thread(() =>
{
- var light = this.light as Light;
light.on_off = btnSwitch.IsSelected ? "on" : "off";
Control.Send(CommandType_A.write, this.light);
})
@@ -155,7 +154,7 @@
{
btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
{
- light.color = "255255255";
+ light.color = 0xFFFFFF;
btnCurColor.BackgroundColor = 0xFFFFFFFF;
Control.Send(CommandType_A.write, this.light);
};
--
Gitblit v1.8.0