From 452e8cef1c740d18ee398be6971d9952e41dbd4a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 四月 2023 16:11:50 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs | 93 +++++++++++++++++++++++-----------------------
1 files changed, 47 insertions(+), 46 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index 47800c8..d8f0ce3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -27,8 +27,11 @@
{
bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness));
}
- bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%";
- bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
+ if (updataTemp.GetAttrState(FunctionAttributeKey.Brightness) != "0")
+ {
+ bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%";
+ bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
+ }
}
else
{
@@ -134,6 +137,7 @@
};
}
+ bool curDimmerStatus = false;
/// <summary>
/// 鐏厜璋冨厜浜嬩欢
/// </summary>
@@ -150,8 +154,9 @@
Direction = AMPopTipDirection.None,
}.Show(MainPage.BaseView);
return;
- }
- onDimmerBar = false;
+ }
+ //onDimmerBar = false;
+ curDimmerStatus = false;
function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
@@ -166,49 +171,45 @@
dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
};
- if (function.online)
+ //if (function.online)
{
dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
{
- onDimmerBar = true;
+ curDimmerStatus = onDimmerBar = true;
};
dimmerBar.OnProgressChangedEvent = (sender, e) =>
{
- dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
- //function.fadeTime = 0;
- //if (!btnSwitch.IsSelected)
- //{
- // dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
- //}
- //btnSwitch.IsSelected = e > 0 ? true : false;
- //function.brightness = e;
- //function.trait_on_off.curValue = e > 0 ? "on" : "off";
+ //dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
+ if (!btnSwitch.IsSelected)
+ {
+ dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
+ }
+ btnSwitch.IsSelected = e > 0 ? true : false;
+ function.trait_on_off.curValue = e > 0 ? "on" : "off";
- //if (e == 0 || e == 100)
- //{
- // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- // d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString());
- // Control.Ins.SendWriteCommand(function, d);
- //}
- //else
- //{
- // if (200 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
- // {
- // function.refreshTime = DateTime.Now;
- // new System.Threading.Thread(() =>
- // {
- // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- // d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString());
- // Control.Ins.SendWriteCommand(function, d);
- // })
- // { IsBackground = true }.Start();
- // }
- //}
+ if (e == 0 || e == 100)
+ {
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Brightness, e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ }
+ else
+ {
+ if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
+ {
+ function.refreshTime = DateTime.Now;
+ new System.Threading.Thread(() =>
+ {
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Brightness, e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ })
+ { IsBackground = true }.Start();
+ }
+ }
- //btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16 - 16) / 100) + Application.GetRealWidth(40);
- //btnBrightnessText.Text = function.brightness + "%";
- btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
+ btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
btnBrightnessText.Text = dimmerBar.Progress + "%";
};
@@ -247,14 +248,14 @@
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
- if (btnSwitch.IsSelected)
- {
- d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
- }
- else
- {
- function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));
- }
+ //if (btnSwitch.IsSelected)
+ //{
+ // d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
+ //}
+ //else
+ //{
+ // function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));
+ //}
Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0