From 4a83749337096aae6dd5ec4f44f16653fbc7268a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 10 三月 2021 16:19:52 +0800
Subject: [PATCH] 2021-03-10 1.合并
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 170 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 93 insertions(+), 77 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index 44777a1..511c748 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -9,44 +9,31 @@
/// <summary>
/// 鏇存柊绐楀笜
/// </summary>
- /// <param name="uCurtain"></param>
- public static void UpdataState(Curtain uCurtain)
+ /// <param name="updateTemp"></param>
+ public static void UpdataState(Function updateTemp)
{
- Application.RunOnMainThread((Action)(() => {
+ Application.RunOnMainThread(() => {
if (bodyView == null)
return;
if (bodyView.onControl)
return;
- if (uCurtain.spk == bodyView.curtain.spk && uCurtain.sid == bodyView.curtain.sid)
+ if (updateTemp.spk == bodyView.function.spk && updateTemp.sid == bodyView.function.sid)
{
- if (uCurtain.trait_on_off.curValue.ToString() == "stop")
- {
- bodyView.btnCurtainOpen.IsSelected = false;
- bodyView.btnCurtainClose.IsSelected = false;
- bodyView.btnCurtainStop.IsSelected = true;
- }
- else if (uCurtain.trait_on_off.curValue.ToString() == "on")
- {
- bodyView.btnCurtainOpen.IsSelected = true;
- bodyView.btnCurtainClose.IsSelected = false;
- bodyView.btnCurtainStop.IsSelected = false;
- }
- else if (uCurtain.trait_on_off.curValue.ToString() == "off")
- {
- bodyView.btnCurtainOpen.IsSelected = false;
- bodyView.btnCurtainClose.IsSelected = true;
- bodyView.btnCurtainStop.IsSelected = false;
- }
+ var percentString = updateTemp.GetAttrState(FunctionAttributeKey.Percent);
+ int percent = 0;
+ int.TryParse(percentString, out percent);
+ bodyView.btnCurtainOpen.IsSelected = percent > 0;
+ bodyView.btnCurtainClose.IsSelected = percent == 0;
try
{
if (!bodyView.onCurtainAnimation)
{
- bodyView.CurtainAnimation(Convert.ToInt32(uCurtain.trait_percent.curValue.ToString()));
+ bodyView.CurtainAnimation(Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Percent)));
}
}
catch { }
}
- }));
+ });
}
/// <summary>
@@ -122,9 +109,9 @@
//鍥為��鍒锋柊淇℃伅浜嬩欢
actionRefresh = () =>
{
- btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
- btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
- //curtain.SaveFunctionData(true);
+ btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
+ btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
+ //function.SaveFunctionData(true);
};
}
/// <summary>
@@ -134,8 +121,8 @@
{
btnCollection.MouseUpEventHandler += (sender, e) =>
{
- btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- curtain.CollectFunction();
+ btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ function.CollectFunction();
};
}
@@ -146,72 +133,101 @@
{
btnCurtainClose.MouseUpEventHandler = (sender, e) =>
{
- btnCurtainOpen.IsSelected = false;
- btnCurtainClose.IsSelected = true;
- btnCurtainStop.IsSelected = false;
- curtain.trait_on_off.curValue = "off";
- curtain.percent = 100;
+ //new System.Threading.Thread(() => {
+ // System.Threading.Thread.Sleep(2000);
+ // Application.RunOnMainThread(() => {
+ // btnCurtainClose.IsSelected = false;
+ // });
+ //})
+ //{ IsBackground = true }.Start();
+ function.trait_on_off.curValue = "off";
+ function.SetAttrState(FunctionAttributeKey.Percent, 0);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
- CurtainAnimation(curtain.percent);
+ d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(function, d);
+ CurtainAnimation(0);
};
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
- btnCurtainStop.IsSelected = true;
- btnCurtainClose.IsSelected = false;
- btnCurtainOpen.IsSelected = false;
- curtain.trait_on_off.curValue = "stop";
+ new System.Threading.Thread(() => {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() => {
+ btnCurtainStop.IsSelected = false;
+ });
+ })
+ { IsBackground = true }.Start();
+ function.trait_on_off.curValue = "stop";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(function, d);
onCurtainAnimation = false;
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- btnCurtainClose.IsSelected = false;
- btnCurtainStop.IsSelected = false;
- btnCurtainOpen.IsSelected = true;
- curtain.trait_on_off.curValue = "on";
- curtain.percent = 0;
+ //new System.Threading.Thread(() => {
+ // System.Threading.Thread.Sleep(2000);
+ // Application.RunOnMainThread(() => {
+ // btnCurtainOpen.IsSelected = false;
+ // });
+ //})
+ //{ IsBackground = true }.Start();
+ function.trait_on_off.curValue = "on";
+ function.SetAttrState(FunctionAttributeKey.Percent, 100);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
- CurtainAnimation(curtain.percent);
+ d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(function, d);
+ CurtainAnimation(100);
};
btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
{
- curtain.percent--;
- controlBar.Progress = curtain.percent;
+ controlBar.Progress -= 1;
+ function.SetAttrState(FunctionAttributeKey.Percent, controlBar.Progress);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.Percent, curtain.percent.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ d.Add(FunctionAttributeKey.Percent, controlBar.Progress.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(function, d);
};
btnPlusSgnIcon.MouseUpEventHandler = (sender, e) =>
{
- curtain.percent++;
- controlBar.Progress = curtain.percent;
+ controlBar.Progress += 1;
+ function.SetAttrState(FunctionAttributeKey.Percent, controlBar.Progress);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.Percent, curtain.percent.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ d.Add(FunctionAttributeKey.Percent, controlBar.Progress.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(function, d);
};
+
+
+ btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+ {
+ btnCurtainStop.IsSelected = true;
+ };
+ btnCurtainOpen.MouseDownEventHandler = (sender, e) =>
+ {
+ btnCurtainOpen.IsSelected = true;
+ btnCurtainClose.IsSelected = false;
+ };
+ btnCurtainClose.MouseDownEventHandler = (sender, e) =>
+ {
+ btnCurtainClose.IsSelected = true;
+ btnCurtainOpen.IsSelected = false;
+ };
+
//curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
//{
// controlBar.Progress = curtainSeekBar.Progress;
// new System.Threading.Thread(() =>
// {
- // if (controlBar.Progress == 0 || controlBar.Progress == 100 || (DateTime.Now - curtain.refreshTime).TotalMilliseconds > 300)
+ // if (controlBar.Progress == 0 || controlBar.Progress == 100 || (DateTime.Now - function.refreshTime).TotalMilliseconds > 300)
// {
- // curtain.percent = e;
- // curtain.refreshTime = DateTime.Now;
+ // function.percent = e;
+ // function.refreshTime = DateTime.Now;
// System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- // d.Add("percent", curtain.percent.ToString());
- // Control.SendWriteCommand(curtain, d);
+ // d.Add("percent", function.percent.ToString());
+ // Control.SendWriteCommand(function, d);
// }
// })
// { IsBackground = true }.Start();
@@ -221,11 +237,11 @@
controlBar.Progress = curtainSeekBar.Progress;
new System.Threading.Thread(() =>
{
- curtain.percent = e;
- curtain.refreshTime = DateTime.Now;
+ function.SetAttrState(FunctionAttributeKey.Percent, e);
+ function.refreshTime = DateTime.Now;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.Percent, curtain.percent.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ d.Add(FunctionAttributeKey.Percent, e.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
};
@@ -235,13 +251,13 @@
// curtainSeekBar.Progress = controlBar.Progress;
// new System.Threading.Thread(() =>
// {
- // if (controlBar.Progress == 0 || controlBar.Progress == 100 || (DateTime.Now - curtain.refreshTime).TotalMilliseconds > 300)
+ // if (controlBar.Progress == 0 || controlBar.Progress == 100 || (DateTime.Now - function.refreshTime).TotalMilliseconds > 300)
// {
- // curtain.percent = e;
- // curtain.refreshTime = DateTime.Now;
+ // function.percent = e;
+ // function.refreshTime = DateTime.Now;
// System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- // d.Add("percent", curtain.percent.ToString());
- // Control.SendWriteCommand(curtain, d);
+ // d.Add("percent", function.percent.ToString());
+ // Control.SendWriteCommand(function, d);
// }
// })
// { IsBackground = true }.Start();
@@ -252,11 +268,11 @@
curtainSeekBar.Progress = controlBar.Progress;
new System.Threading.Thread(() =>
{
- curtain.percent = e;
- curtain.refreshTime = DateTime.Now;
+ function.SetAttrState(FunctionAttributeKey.Percent, e);
+ function.refreshTime = DateTime.Now;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("percent", curtain.percent.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ d.Add("percent", e.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0