From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 129 ++++++++++++++++++++++--------------------
1 files changed, 67 insertions(+), 62 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 3758142..a0daf23 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -10,39 +10,38 @@
/// <summary>
/// 鏇存柊鍔熻兘鐘舵��
/// </summary>
- public static void UpdataStates(Light uFunction)
+ public static void UpdataStates(Function updataTemp)
{
- Application.RunOnMainThread(() =>
+ Application.RunOnMainThread((() =>
{
try
{
if (bodyView == null)
return;
- if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
+ if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid)
{
-
- 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));
}
- bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
- bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
}
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)
{
MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");
}
- });
+ }));
}
void LoadEventList()
@@ -53,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>
@@ -63,10 +62,10 @@
/// </summary>
void LoadEvet_ChangeFadeTime()
{
- barFadeTime.OnProgressChangedEvent = (sender, e) =>
+ barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
{
- light.fadeTime = e;
- light.SaveFunctionData(true);
+ function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
+ function.UpdataFuncitonInfo();
};
}
@@ -76,8 +75,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = light.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- light.SaveFunctionData(true);
+ btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ function.CollectFunction();
};
}
@@ -91,47 +90,48 @@
};
dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
onDimmerBar = false;
- light.brightness = dimmerBar.Progress;
- //Control.Send(CommandType_A.write, light);
+ function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
+ function.SetAttrState(FunctionAttributeKey.FadeTime, barFadeTime.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);
+ btnBrightnessText.Text = dimmerBar.Progress + "%";
};
- dimmerBar.OnProgressChangedEvent = (sender, e) => {
- light.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";
-
- if (e == 0 || e == 100)
- {
- //Control.Send(CommandType_A.write, this.light);
- 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);
- }
- else
- {
- if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)
- {
- light.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);
- })
- { IsBackground = true }.Start();
- }
- }
-
+ //20201223 鍒犻櫎婊戝姩鍙戦�佸懡浠わ紝闃叉鎺т欢璺冲姩
+ 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";
+ //if (e == 0 || e == 100)
+ //{
+ // //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, 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();
+ // }
+ //}
btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
- btnBrightnessText.Text = light.brightness + "%";
+ btnBrightnessText.Text = dimmerBar.Progress + "%";
};
}
@@ -142,7 +142,7 @@
{
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
- light.fadeTime = barFadeTime.Progress;
+ function.SetAttrState(FunctionAttributeKey.FadeTime, barFadeTime.Progress);
btnSwitch.IsSelected = !btnSwitch.IsSelected;
if (btnSwitch.IsSelected)
{
@@ -154,18 +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.OnOff, function.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.FadeTime, function.GetAttrState(FunctionAttributeKey.FadeTime));
if (btnSwitch.IsSelected)
{
- d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());
+ if(function.lastBrightness == 0)
+ {
+ function.lastBrightness = 100;
+ }
+ 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