From 604341e5ef254ef6d4164423a342efef897a2172 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 22 一月 2021 17:51:48 +0800
Subject: [PATCH] 2021-1-22-1
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs | 179 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 122 insertions(+), 57 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index d843a0c..533498c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -12,16 +12,18 @@
/// <param name="uCurtain"></param>
public static void UpdataState(Curtain uCurtain)
{
- 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 (uCurtain.spk == bodyView.curtain.spk && uCurtain.sid == bodyView.curtain.sid)
{
if (uCurtain.trait_on_off.curValue.ToString() == "stop")
{
- bodyView.btnCurtainOpen.IsSelected = true;
+ bodyView.btnCurtainOpen.IsSelected = false;
bodyView.btnCurtainClose.IsSelected = false;
- bodyView.btnCurtainStop.IsSelected = false;
+ bodyView.btnCurtainStop.IsSelected = true;
}
else if (uCurtain.trait_on_off.curValue.ToString() == "on")
{
@@ -35,15 +37,79 @@
bodyView.btnCurtainClose.IsSelected = true;
bodyView.btnCurtainStop.IsSelected = false;
}
- if ((DateTime.Now - uCurtain.refreshTime).TotalMilliseconds > 300)
+ try
{
- bodyView.controlBar.Progress = bodyView.curtainSeekBar.Progress = Convert.ToInt32(uCurtain.percent);
+ if (!bodyView.onCurtainAnimation)
+ {
+ bodyView.CurtainAnimation(Convert.ToInt32(uCurtain.trait_percent.curValue.ToString()));
+ }
}
-
-
+ 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;
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ while (progress != curBarProgress && onCurtainAnimation)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (runningDirection)
+ {
+ if (curtainSeekBar.Progress + 10 > progress)
+ {
+ curtainSeekBar.Progress = progress;
+ }
+ else
+ {
+ curtainSeekBar.Progress = curtainSeekBar.Progress + 10;
+ }
+ }
+ else
+ {
+ if (curtainSeekBar.Progress - 10 < progress)
+ {
+ curtainSeekBar.Progress = progress;
+ }
+ else
+ {
+ curtainSeekBar.Progress = curtainSeekBar.Progress - 10;
+ }
+ }
+ 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>
/// 鍔犺浇浜嬩欢鍒楄〃
@@ -58,7 +124,7 @@
{
btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
- curtain.SaveFunctionData();
+ //curtain.SaveFunctionData(true);
};
}
/// <summary>
@@ -68,8 +134,8 @@
{
btnCollection.MouseUpEventHandler += (sender, e) =>
{
- btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- curtain.SaveFunctionData();
+ btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ curtain.CollectFunction();
};
}
@@ -81,61 +147,60 @@
btnCurtainClose.MouseUpEventHandler = (sender, e) =>
{
btnCurtainClose.IsSelected = true;
- btnCurtainStop.IsSelected = false;
btnCurtainOpen.IsSelected = false;
+ btnCurtainStop.IsSelected = false;
curtain.trait_on_off.curValue = "off";
- curtain.percent = 0;
+ 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());
+ d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ CurtainAnimation(curtain.percent);
};
- btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+ btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
+
btnCurtainStop.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainOpen.IsSelected = false;
- };
- btnCurtainStop.MouseUpEventHandler = (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());
+ d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ onCurtainAnimation = false;
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- btnCurtainOpen.IsSelected = true;
+
btnCurtainClose.IsSelected = false;
btnCurtainStop.IsSelected = false;
+ btnCurtainOpen.IsSelected = true;
curtain.trait_on_off.curValue = "on";
- curtain.percent = 100;
+ curtain.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());
+ d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ CurtainAnimation(curtain.percent);
};
- 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);
- };
+ //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(FunctionAttributeKey.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);
- };
+ //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(FunctionAttributeKey.Percent, curtain.percent.ToString());
+ // DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ //};
//curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
//{
@@ -155,13 +220,13 @@
//};
curtainSeekBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- controlBar.Progress = curtainSeekBar.Progress;
+ //controlBar.Progress = curtainSeekBar.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());
+ d.Add(FunctionAttributeKey.Percent, curtain.percent.ToString());
DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
})
{ IsBackground = true }.Start();
@@ -184,19 +249,19 @@
// { 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(() =>
+ // {
+ // 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();
+ //};
}
}
--
Gitblit v1.8.0