From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 09:01:53 +0800
Subject: [PATCH] 更新
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs | 296 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 195 insertions(+), 101 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index 3b326f5..7638d01 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -9,41 +9,98 @@
/// <summary>
/// 鏇存柊绐楀笜
/// </summary>
- /// <param name="uCurtain"></param>
- public static void UpdataState(Curtain uCurtain)
+ /// <param name="updateTemp"></param>
+ public static void UpdataState(Function updateTemp)
{
- Application.RunOnMainThread(() => {
+ Application.RunOnMainThread((Action)(() => {
if (bodyView == null)
return;
- if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.sid)
+ if (bodyView.onControl)
+ return;
+ if (updateTemp.spk == bodyView.function.spk && updateTemp.sid == bodyView.function.sid)
{
- if (uCurtain.trait_on_off.curValue.ToString() == "stop")
+ //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
{
- bodyView.btnCurtainOpen.IsSelected = true;
- bodyView.btnCurtainClose.IsSelected = false;
- bodyView.btnCurtainStop.IsSelected = false;
+ if (!bodyView.onCurtainAnimation)
+ {
+ bodyView.CurtainAnimation(Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Percent)));
+ }
}
- 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;
- }
- if ((DateTime.Now - uCurtain.refreshTime).TotalMilliseconds > 300)
- {
- bodyView.controlBar.Progress = bodyView.curtainSeekBar.Progress = Convert.ToInt32(uCurtain.percent);
- }
-
-
+ catch { }
}
- });
+ }));
}
+
+ /// <summary>
+ /// 姝ｅ湪鎵ц绐楀笜鍔ㄧ敾
+ /// </summary>
+ bool onCurtainAnimation = false;
+ /// <summary>
+ /// 绐楀笜鍔ㄧ敾
+ /// </summary>
+ /// <param name="progress"></param>
+ void CurtainAnimation(int progress)
+ {
+ onCurtainAnimation = true;
+ //杩愯鏂瑰悜 鎵撳紑锛堝姞杩涘害锛夛細鍏抽棴锛堝噺杩涘害锛�
+ bool runningDirection = progress > curtainSeekBar.Progress;
+ int curBarProgress = curtainSeekBar.Progress;
+ btnProgress.Text = progress + "%";
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ while (progress != curBarProgress && onCurtainAnimation)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (runningDirection)
+ {
+ if (curtainSeekBar.Progress + 5 > progress)
+ {
+ curtainSeekBar.Progress = progress;
+ }
+ else
+ {
+ curtainSeekBar.Progress = curtainSeekBar.Progress + 5;
+ }
+ }
+ else
+ {
+ if (curtainSeekBar.Progress - 5 < progress)
+ {
+ curtainSeekBar.Progress = progress;
+ }
+ else
+ {
+ curtainSeekBar.Progress = curtainSeekBar.Progress - 5;
+ }
+ }
+ curBarProgress = curtainSeekBar.Progress;
+ });
+ System.Threading.Thread.Sleep(100);
+ }
+ }
+ catch { }
+ finally
+ {
+ new System.Threading.Thread(() => {
+ System.Threading.Thread.Sleep(3000);
+ onCurtainAnimation = false;
+ })
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Lowest }.Start();
+ }
+ }).Start();
+ }
+
/// <summary>
/// 鍔犺浇浜嬩欢鍒楄〃
@@ -56,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>
@@ -68,8 +125,8 @@
{
btnCollection.MouseUpEventHandler += (sender, e) =>
{
- btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- curtain.SaveFunctionData(true);
+ btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ function.CollectFunction();
};
}
@@ -80,15 +137,60 @@
{
btnCurtainClose.MouseUpEventHandler = (sender, e) =>
{
- btnCurtainClose.IsSelected = true;
- btnCurtainStop.IsSelected = false;
- btnCurtainOpen.IsSelected = false;
- 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("on_off", 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);
+ CurtainAnimation(0);
};
+
+ btnCurtainStop.MouseUpEventHandler = (sender, e) =>
+ {
+ onCurtainAnimation = false;
+ 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, 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();
+ 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, function.trait_on_off.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(function, d);
+ CurtainAnimation(100);
+ };
+
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
{
@@ -96,73 +198,65 @@
btnCurtainClose.IsSelected = false;
btnCurtainOpen.IsSelected = false;
};
- btnCurtainStop.MouseUpEventHandler = (sender, e) =>
+ btnCurtainOpen.MouseDownEventHandler = (sender, e) =>
{
btnCurtainOpen.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainStop.IsSelected = false;
- curtain.trait_on_off.curValue = "stop";
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.curValue.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
};
-
- btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
+ btnCurtainClose.MouseDownEventHandler = (sender, e) =>
{
- btnCurtainOpen.IsSelected = true;
- btnCurtainClose.IsSelected = false;
+ btnCurtainClose.IsSelected = true;
+ btnCurtainOpen.IsSelected = false;
btnCurtainStop.IsSelected = false;
- curtain.trait_on_off.curValue = "on";
- curtain.percent = 100;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.curValue.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
};
- btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
- {
- curtain.percent--;
- controlBar.Progress = curtain.percent;
- 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);
- };
-
- btnPlusSgnIcon.MouseUpEventHandler = (sender, e) =>
- {
- curtain.percent++;
- controlBar.Progress = curtain.percent;
- 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);
- };
-
- //curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
+ //btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
//{
+ // function.percent--;
+ // controlBar.Progress = function.percent;
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // d.Add(FunctionAttributeKey.Percent, function.percent.ToString());
+ // DriverLayer.Control.Ins.SendWriteCommand(function, d);
+ //};
+
+ //btnPlusSgnIcon.MouseUpEventHandler = (sender, e) =>
+ //{
+ // function.percent++;
+ // controlBar.Progress = function.percent;
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // d.Add(FunctionAttributeKey.Percent, function.percent.ToString());
+ // DriverLayer.Control.Ins.SendWriteCommand(function, d);
+ //};
+
+ 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) =>
{
- controlBar.Progress = curtainSeekBar.Progress;
+ 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("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();
};
@@ -172,31 +266,31 @@
// 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();
//};
- controlBar.OnStopTrackingTouchEvent = (sender, e) =>
- {
- curtainSeekBar.Progress = controlBar.Progress;
- new System.Threading.Thread(() =>
- {
- curtain.percent = e;
- curtain.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);
- })
- { IsBackground = true }.Start();
- };
+ //controlBar.OnStopTrackingTouchEvent = (sender, e) =>
+ //{
+ // curtainSeekBar.Progress = controlBar.Progress;
+ // new System.Threading.Thread(() =>
+ // {
+ // function.percent = e;
+ // function.refreshTime = DateTime.Now;
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // d.Add("percent", function.percent.ToString());
+ // DriverLayer.Control.Ins.SendWriteCommand(function, d);
+ // })
+ // { IsBackground = true }.Start();
+ //};
}
}
--
Gitblit v1.8.0