From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 11 八月 2020 14:13:55 +0800 Subject: [PATCH] 20200811 --- HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs | 132 +++++++++++++++++++++++++------------------ 1 files changed, 76 insertions(+), 56 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs index d9e0e78..496c25f 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs @@ -81,7 +81,9 @@ btnCurtainOpen.IsSelected = false; curtain.on_off = "off"; curtain.openLevel = 0; - Control.Send(CommandType_A.write, curtain); + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add("on_off", curtain.on_off); + Control.SendWriteCommand(curtain, d); }; btnCurtainStop.MouseDownEventHandler = (sender, e) => { @@ -94,7 +96,9 @@ btnCurtainClose.IsSelected = false; btnCurtainStop.IsSelected = false; curtain.on_off = "stop"; - Control.Send(CommandType_A.write, curtain); + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add("on_off", curtain.on_off); + Control.SendWriteCommand(curtain,d); }; btnCurtainOpen.MouseUpEventHandler = (sender, e) => { @@ -103,71 +107,83 @@ btnCurtainStop.IsSelected = false; curtain.on_off = "on"; curtain.openLevel = 100; - Control.Send(CommandType_A.write, curtain); + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add("on_off", curtain.on_off); + Control.SendWriteCommand(curtain, d); }; DateTime delayTime = DateTime.MinValue; btnMinusSignIcon.MouseLongEventHandler = (sender, e) => { - if (curtain.openLevel > 1) - { - curtain.openLevel--; - controlBar.Progress = curtainSeekBar.Progress = curtain.openLevel; - delayTime = DateTime.Now; - new System.Threading.Thread(() => { - while (delayTime != DateTime.MaxValue) - { - System.Threading.Thread.Sleep(100); - if ((DateTime.Now - delayTime).TotalSeconds > 1) - { - if (curtain.openLevel < 1) - { - break; - } - curtain.openLevel--; - Application.RunOnMainThread(() => { - controlBar.Progress = curtain.openLevel; - }); - } - } - }) - { IsBackground = true }.Start(); - } + //if (curtain.openLevel > 1) + //{ + // curtain.openLevel--; + // controlBar.Progress = curtainSeekBar.Progress = curtain.openLevel; + // delayTime = DateTime.Now; + // new System.Threading.Thread(() => { + // while (delayTime != DateTime.MaxValue) + // { + // System.Threading.Thread.Sleep(100); + // if ((DateTime.Now - delayTime).TotalSeconds > 1) + // { + // if (curtain.openLevel < 1) + // { + // break; + // } + // curtain.openLevel--; + // Application.RunOnMainThread(() => { + // controlBar.Progress = curtain.openLevel; + // }); + // } + // } + // }) + // { IsBackground = true }.Start(); + //} }; btnMinusSignIcon.MouseUpEventHandler = (sender, e) => { delayTime = DateTime.MinValue; - Control.Send(CommandType_A.write, curtain); + curtain.openLevel--; + controlBar.Progress = curtain.openLevel; + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add("openLevel", curtain.openLevel.ToString()); + Control.SendWriteCommand(curtain, d); + //Control.Send(CommandType_A.write, curtain); }; btnPlusSgnIcon.MouseLongEventHandler = (sender, e) => { - if (curtain.openLevel > 1) - { - curtain.openLevel++; - controlBar.Progress = curtainSeekBar.Progress = curtain.openLevel; - delayTime = DateTime.Now; - new System.Threading.Thread(() => { - while (delayTime != DateTime.MaxValue) - { - System.Threading.Thread.Sleep(100); - if ((DateTime.Now - delayTime).TotalSeconds > 1) - { - if (curtain.openLevel > 99) - { - break; - } - curtain.openLevel++; - Application.RunOnMainThread(() => { - controlBar.Progress = curtain.openLevel; - }); - } - } - }) - { IsBackground = true }.Start(); - } + //if (curtain.openLevel > 1) + //{ + // curtain.openLevel++; + // controlBar.Progress = curtainSeekBar.Progress = curtain.openLevel; + // delayTime = DateTime.Now; + // new System.Threading.Thread(() => { + // while (delayTime != DateTime.MaxValue) + // { + // System.Threading.Thread.Sleep(100); + // if ((DateTime.Now - delayTime).TotalSeconds > 1) + // { + // if (curtain.openLevel > 99) + // { + // break; + // } + // curtain.openLevel++; + // Application.RunOnMainThread(() => { + // controlBar.Progress = curtain.openLevel; + // }); + // } + // } + // }) + // { IsBackground = true }.Start(); + //} }; - btnPlusSgnIcon.MouseUpEventHandler = (sender, e) => { + btnPlusSgnIcon.MouseUpEventHandler = (sender, e) => + { delayTime = DateTime.MinValue; - Control.Send(CommandType_A.write, curtain); + curtain.openLevel++; + controlBar.Progress = curtain.openLevel; + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add("openLevel", curtain.openLevel.ToString()); + Control.SendWriteCommand(curtain, d); }; curtainSeekBar.OnProgressChangedEvent = (sender, e) => @@ -179,8 +195,10 @@ { delayTime = DateTime.Now; curtain.openLevel = e; - Control.Send(CommandType_A.write, curtain); curtain.refreshTime = DateTime.Now; + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add("openLevel", curtain.openLevel.ToString()); + Control.SendWriteCommand(curtain, d); } }) { IsBackground = true }.Start(); @@ -196,8 +214,10 @@ { delayTime = DateTime.Now; curtain.openLevel = e; - Control.Send(CommandType_A.write, curtain); curtain.refreshTime = DateTime.Now; + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add("openLevel", curtain.openLevel.ToString()); + Control.SendWriteCommand(curtain, d); } }) { IsBackground = true }.Start(); -- Gitblit v1.8.0