From 6e580804d74d7a6fb118b6ba381e88aa81f267c7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 15 三月 2021 15:30:23 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into dev-tzy
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 77 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 709243b..8b08cbb 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -10,31 +10,31 @@
/// <summary>
/// 鏇存柊鍔熻兘鐘舵��
/// </summary>
- public static void UpdataStates(Light uFunction)
+ public static void UpdataStates(Function updataTemp)
{
- Application.RunOnMainThread((Action)(() =>
+ Application.RunOnMainThread((() =>
{
try
{
if (bodyView == null)
return;
- if (uFunction.spk == bodyView.light.spk && uFunction.sid == bodyView.light.sid)
+ if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.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.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%";
+ bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32( updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
+ if (updataTemp.trait_on_off.curValue.ToString() == "on")
{
bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
if (!bodyView.onDimmerBar)
{
- bodyView.dimmerBar.Progress = uFunction.brightness;
+ bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness));
}
}
else
{
bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
}
- bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.curValue.ToString() == "on";
+ bodyView.btnSwitch.IsSelected = updataTemp.trait_on_off.curValue.ToString() == "on";
}
}
catch (Exception ex)
@@ -52,9 +52,9 @@
LoadEvet_ChangeFadeTime();
//鍥為��鍒锋柊淇℃伅浜嬩欢
actionRefresh = () => {
- btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
- btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
- //light.SaveFunctionData(true);
+ btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
+ btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
+ //function.SaveFunctionData(true);
};
}
/// <summary>
@@ -64,8 +64,8 @@
{
barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
{
- light.fadeTime = e;
- light.UpdataFuncitonInfo();
+ function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
+ function.UpdataFuncitonInfo();
};
}
@@ -75,8 +75,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = light.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- light.CollectFunction();
+ btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ function.CollectFunction();
};
}
@@ -90,43 +90,42 @@
};
dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
onDimmerBar = false;
- light.brightness = dimmerBar.Progress;
- //Control.Send(CommandType_A.write, light);
+ function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
- Control.Ins.SendWriteCommand(light, d);
- light.fadeTime = barFadeTime.Progress;
+ d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ function.SetAttrState(FunctionAttributeKey.FadeTime, barFadeTime.Progress);
btnBrightnessText.Text = dimmerBar.Progress + "%";
};
//20201223 鍒犻櫎婊戝姩鍙戦�佸懡浠わ紝闃叉鎺т欢璺冲姩
dimmerBar.OnProgressChangedEvent = (sender, e) =>
{
dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
- //light.fadeTime = 0;
+ //function.fadeTime = 0;
//if (!btnSwitch.IsSelected)
//{
// dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
//}
//btnSwitch.IsSelected = e > 0 ? true : false;
- //light.brightness = e;
- //light.trait_on_off.curValue = e > 0 ? "on" : "off";
+ //function.brightness = e;
+ //function.trait_on_off.curValue = e > 0 ? "on" : "off";
//if (e == 0 || e == 100)
//{
- // //Control.Send(CommandType_A.write, this.light);
+ // //Control.Send(CommandType_A.write, this.function);
// System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- // d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
- // Control.Ins.SendWriteCommand(light, d);
+ // d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString());
+ // Control.Ins.SendWriteCommand(function, d);
//}
//else
//{
- // if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)
+ // if (200 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
// {
- // light.refreshTime = DateTime.Now;
+ // 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, light.brightness.ToString());
- // Control.Ins.SendWriteCommand(light, d);
+ // d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString());
+ // Control.Ins.SendWriteCommand(function, d);
// })
// { IsBackground = true }.Start();
// }
@@ -143,7 +142,7 @@
{
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
- light.fadeTime = barFadeTime.Progress;
+ function.SetAttrState(FunctionAttributeKey.FadeTime, barFadeTime.Progress);
btnSwitch.IsSelected = !btnSwitch.IsSelected;
if (btnSwitch.IsSelected)
{
@@ -155,23 +154,23 @@
}
new System.Threading.Thread(() =>
{
- light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
+ 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, light.trait_on_off.curValue.ToString());
- d.Add(FunctionAttributeKey.FadeTime, light.fadeTime.ToString());
+ d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.FadeTime, function.GetAttrState(FunctionAttributeKey.FadeTime));
if (btnSwitch.IsSelected)
{
- if(light.lastBrightness == 0)
+ if(function.lastBrightness == 0)
{
- light.lastBrightness = 100;
+ function.lastBrightness = 100;
}
- d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());
+ d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
}
else
{
- light.lastBrightness = light.brightness;
+ function.lastBrightness = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.Brightness));
}
- Control.Ins.SendWriteCommand(light, d);
+ Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0