From 1026814d931de92f0da5f15a58870565a94100e0 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:37:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/NewFilePath' into WJC
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 5dfd41c..709243b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -12,15 +12,16 @@
/// </summary>
public static void UpdataStates(Light uFunction)
{
- Application.RunOnMainThread(() =>
+ Application.RunOnMainThread((Action)(() =>
{
try
{
if (bodyView == null)
return;
- if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
+ if (uFunction.spk == bodyView.light.spk && uFunction.sid == bodyView.light.sid)
{
-
+ bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
+ bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
if (uFunction.trait_on_off.curValue.ToString() == "on")
{
bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
@@ -28,8 +29,6 @@
{
bodyView.dimmerBar.Progress = uFunction.brightness;
}
- bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
- bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
}
else
{
@@ -42,7 +41,7 @@
{
MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");
}
- });
+ }));
}
void LoadEventList()
@@ -66,7 +65,7 @@
barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
{
light.fadeTime = e;
- light.SaveFunctionData(true);
+ light.UpdataFuncitonInfo();
};
}
@@ -97,10 +96,12 @@
d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
Control.Ins.SendWriteCommand(light, d);
light.fadeTime = barFadeTime.Progress;
+ btnBrightnessText.Text = dimmerBar.Progress + "%";
};
//20201223 鍒犻櫎婊戝姩鍙戦�佸懡浠わ紝闃叉鎺т欢璺冲姩
dimmerBar.OnProgressChangedEvent = (sender, e) =>
{
+ dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
//light.fadeTime = 0;
//if (!btnSwitch.IsSelected)
//{
@@ -131,7 +132,7 @@
// }
//}
btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
- btnBrightnessText.Text = light.brightness + "%";
+ btnBrightnessText.Text = dimmerBar.Progress + "%";
};
}
--
Gitblit v1.8.0