From a251442d9fc088b3d8cf74d20b959f0f6103b095 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 14 九月 2020 17:42:10 +0800
Subject: [PATCH] 20200914
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 6500699..5ba2ea3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -19,7 +19,10 @@
return;
if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
{
- bodyView.dimmerBar.Progress = uFunction.brightness;
+ if (!bodyView.onDimmerBar)
+ {
+ bodyView.dimmerBar.Progress = uFunction.brightness;
+ }
if (uFunction.trait_on_off.value.ToString() == "on")
{
@@ -29,8 +32,10 @@
{
bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
}
- //bodyView.dimmerBar.WaveColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.value.ToString() == "on";
+
+ bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
+ bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
}
}
catch (Exception ex)
@@ -45,10 +50,22 @@
LoadSwitchEvent();
LoadCollectionEvent();
LoadEvent_DimmerBar();
+ LoadEvet_ChangeFadeTime();
//鍥為��鍒锋柊淇℃伅浜嬩欢
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
+ };
+ }
+ /// <summary>
+ /// 淇敼鐏厜娓愬彉鏃堕棿
+ /// </summary>
+ void LoadEvet_ChangeFadeTime()
+ {
+ barFadeTime.OnProgressChangedEvent = (sender, e) =>
+ {
+ light.fadeTime = e;
+ light.SaveFunctionData();
};
}
@@ -80,6 +97,7 @@
Control.SendWriteCommand(light, d);
};
dimmerBar.OnProgressChangedEvent = (sender, e) => {
+ light.fadeTime = 0;
if (!btnSwitch.IsSelected)
{
dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
@@ -102,18 +120,16 @@
light.refreshTime = DateTime.Now;
new System.Threading.Thread(() =>
{
- //Control.Send(CommandType_A.write, light);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("brightness", light.brightness.ToString());
Control.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
}
- else
- {
- MainPage.Log("skip control!!");
- }
}
+
+ btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
+ btnBrightnessText.Text = light.brightness + "%";
};
}
@@ -124,6 +140,7 @@
{
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
+ light.fadeTime = barFadeTime.Progress;
btnSwitch.IsSelected = !btnSwitch.IsSelected;
if (btnSwitch.IsSelected)
{
--
Gitblit v1.8.0