From 9ab5bd54fadd8fc9c542b48c99a117a4e182669b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 14 十月 2021 16:37:56 +0800
Subject: [PATCH] 智能空开能源界面数据更新
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs | 157 ++++++++++++++++++++++++++++------------------------
1 files changed, 84 insertions(+), 73 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index 702c4d7..af394c5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -9,29 +9,29 @@
/// <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)(() => {
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)
{
- var percentString = uCurtain.GetAttrState(FunctionAttributeKey.Percent);
- if (percentString != null)
- {
- int percent = 0;
- int.TryParse(percentString, out percent);
- bodyView.btnCurtainOpen.IsSelected = percent > 0;
- bodyView.btnCurtainClose.IsSelected = percent == 0;
- }
+ //var percentString = updateTemp.GetAttrState(FunctionAttributeKey.Percent);
+ //if (percentString != null)
+ //{
+ // 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 { }
@@ -53,6 +53,7 @@
//杩愯鏂瑰悜 鎵撳紑锛堝姞杩涘害锛夛細鍏抽棴锛堝噺杩涘害锛�
bool runningDirection = progress > curtainSeekBar.Progress;
int curBarProgress = curtainSeekBar.Progress;
+ btnProgress.Text = progress + "%";
new System.Threading.Thread(() =>
{
try
@@ -112,9 +113,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>
@@ -124,8 +125,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();
};
}
@@ -136,19 +137,21 @@
{
btnCurtainClose.MouseUpEventHandler = (sender, e) =>
{
- //new System.Threading.Thread(() => {
- // System.Threading.Thread.Sleep(2000);
- // Application.RunOnMainThread(() => {
- // btnCurtainClose.IsSelected = false;
- // });
- //})
- //{ IsBackground = true }.Start();
- curtain.trait_on_off.curValue = "off";
- curtain.percent = 0;
+ 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) =>
@@ -163,89 +166,97 @@
});
})
{ IsBackground = true }.Start();
- curtain.trait_on_off.curValue = "stop";
+ 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);
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- //new System.Threading.Thread(() => {
- // System.Threading.Thread.Sleep(2000);
- // Application.RunOnMainThread(() => {
- // btnCurtainOpen.IsSelected = false;
- // });
- //})
- //{ IsBackground = true }.Start();
- curtain.trait_on_off.curValue = "on";
- curtain.percent = 100;
+ 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);
};
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
{
btnCurtainStop.IsSelected = true;
+ btnCurtainClose.IsSelected = false;
+ btnCurtainOpen.IsSelected = false;
};
btnCurtainOpen.MouseDownEventHandler = (sender, e) =>
{
btnCurtainOpen.IsSelected = true;
btnCurtainClose.IsSelected = false;
+ btnCurtainStop.IsSelected = false;
};
btnCurtainClose.MouseDownEventHandler = (sender, e) =>
{
btnCurtainClose.IsSelected = true;
btnCurtainOpen.IsSelected = false;
+ btnCurtainStop.IsSelected = false;
};
//btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
//{
- // curtain.percent--;
- // controlBar.Progress = curtain.percent;
+ // function.percent--;
+ // controlBar.Progress = function.percent;
// 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, function.percent.ToString());
+ // DriverLayer.Control.Ins.SendWriteCommand(function, d);
//};
//btnPlusSgnIcon.MouseUpEventHandler = (sender, e) =>
//{
- // curtain.percent++;
- // controlBar.Progress = curtain.percent;
+ // function.percent++;
+ // controlBar.Progress = function.percent;
// 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, function.percent.ToString());
+ // DriverLayer.Control.Ins.SendWriteCommand(function, d);
//};
- //curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
- //{
+ curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
+ {
+ btnProgress.Text = curtainSeekBar.Progress + "%";
// 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();
- //};
+ };
curtainSeekBar.OnStopTrackingTouchEvent = (sender, e) =>
{
+ btnProgress.Text = curtainSeekBar.Progress + "%";
//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();
};
@@ -255,13 +266,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();
@@ -272,11 +283,11 @@
// curtainSeekBar.Progress = controlBar.Progress;
// new System.Threading.Thread(() =>
// {
- // 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());
- // DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ // d.Add("percent", function.percent.ToString());
+ // DriverLayer.Control.Ins.SendWriteCommand(function, d);
// })
// { IsBackground = true }.Start();
//};
--
Gitblit v1.8.0