From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 255 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 230 insertions(+), 25 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index c8f1c0f..4bb6b5d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -1,10 +1,116 @@
锘縰sing System;
using HDL_ON.Entity;
+using Shared;
namespace HDL_ON.UI
{
public partial class RollingShutterPage
{
+ /// <summary>
+ /// 鏇存柊绐楀笜
+ /// </summary>
+ /// <param name="uCurtain"></param>
+ public static void UpdataState(Curtain uCurtain)
+ {
+ Application.RunOnMainThread(() => {
+ if (bodyView == null)
+ return;
+ if (bodyView.onControl)
+ return;
+ if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.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;
+ }
+ try
+ {
+ 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>
/// 鍔犺浇浜嬩欢鍒楄〃
/// </summary>
@@ -14,9 +120,11 @@
LoadCollectionEvent();
//鍥為��鍒锋柊淇℃伅浜嬩欢
- actionRefresh = () => {
- btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
- btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
+ actionRefresh = () =>
+ {
+ btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
+ btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
+ //curtain.SaveFunctionData(true);
};
}
/// <summary>
@@ -24,36 +132,133 @@
/// </summary>
void LoadCollectionEvent()
{
- btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = function.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.MouseUpEventHandler += (sender, e) =>
+ {
+ btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ curtain.CollectFunction();
};
}
/// <summary>
- /// 鍔犺浇绐楀笜寮�鍏冲仠鎸夐挳鎺у埗浜嬩欢
+ /// 鍔犺浇绐楀笜鎺у埗浜嬩欢
/// </summary>
void LoadEvent_ControlEvent()
{
- btnCurtainClose.MouseDownEventHandler += (sender, e) => {
- btnCurtainClose.IsSelected = true;
- };
- btnCurtainClose.MouseUpEventHandler += (sender, e) => {
- btnCurtainClose.IsSelected = false;
- };
-
- btnCurtainStop.MouseDownEventHandler += (sender, e) => {
- btnCurtainStop.IsSelected = true;
- };
- btnCurtainStop.MouseUpEventHandler += (sender, e) => {
- btnCurtainStop.IsSelected = false;
- };
-
- btnCurtainOpen.MouseDownEventHandler += (sender, e) => {
- btnCurtainOpen.IsSelected = true;
- };
- btnCurtainOpen.MouseUpEventHandler += (sender, e) => {
+ btnCurtainClose.MouseUpEventHandler = (sender, e) =>
+ {
btnCurtainOpen.IsSelected = false;
+ btnCurtainClose.IsSelected = true;
+ btnCurtainStop.IsSelected = false;
+ curtain.trait_on_off.curValue = "off";
+ curtain.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);
+ };
+
+ btnCurtainStop.MouseUpEventHandler = (sender, e) =>
+ {
+ btnCurtainStop.IsSelected = true;
+ btnCurtainClose.IsSelected = false;
+ btnCurtainOpen.IsSelected = false;
+ curtain.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);
+ onCurtainAnimation = false;
+ };
+
+ btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
+ {
+ btnCurtainClose.IsSelected = false;
+ btnCurtainStop.IsSelected = false;
+ btnCurtainOpen.IsSelected = true;
+ curtain.trait_on_off.curValue = "on";
+ curtain.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);
+ };
+
+ 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(FunctionAttributeKey.Percent, curtain.percent.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ };
+
+ //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)
+ // {
+ // 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());
+ // Control.SendWriteCommand(curtain, d);
+ // }
+ // })
+ // { IsBackground = true }.Start();
+ //};
+ curtainSeekBar.OnStopTrackingTouchEvent = (sender, e) =>
+ {
+ 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(FunctionAttributeKey.Percent, curtain.percent.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ })
+ { IsBackground = true }.Start();
+ };
+
+ //controlBar.OnProgressChangedEvent = (sender, e) =>
+ //{
+ // curtainSeekBar.Progress = controlBar.Progress;
+ // new System.Threading.Thread(() =>
+ // {
+ // if (controlBar.Progress == 0 || controlBar.Progress == 100 || (DateTime.Now - curtain.refreshTime).TotalMilliseconds > 300)
+ // {
+ // 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());
+ // Control.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