From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 01 九月 2020 15:22:09 +0800 Subject: [PATCH] 2020-09-01 --- HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 147 ++++++++++++++++++++++++++++-------------------- 1 files changed, 85 insertions(+), 62 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs index 6e2169f..501e41a 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs @@ -17,19 +17,19 @@ return; if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.sid) { - if (uCurtain.on_off == "stop") + if (uCurtain.trait_on_off.value.ToString() == "stop") { bodyView.btnCurtainOpen.IsSelected = true; bodyView.btnCurtainClose.IsSelected = false; bodyView.btnCurtainStop.IsSelected = false; } - else if (uCurtain.on_off == "on") + else if (uCurtain.trait_on_off.value.ToString() == "on") { bodyView.btnCurtainOpen.IsSelected = true; bodyView.btnCurtainClose.IsSelected = false; bodyView.btnCurtainStop.IsSelected = false; } - else if (uCurtain.on_off == "off") + else if (uCurtain.trait_on_off.value.ToString() == "off") { bodyView.btnCurtainOpen.IsSelected = false; bodyView.btnCurtainClose.IsSelected = true; @@ -66,7 +66,7 @@ { btnCollection.MouseUpEventHandler += (sender, e) => { btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected; - DB_ResidenceData.residenceData.SaveResidenceData(); + curtain.SaveFunctionData(); }; } @@ -79,9 +79,12 @@ btnCurtainClose.IsSelected = true; btnCurtainStop.IsSelected = false; btnCurtainOpen.IsSelected = false; - curtain.on_off = "off"; + curtain.trait_on_off.value = "off"; curtain.openLevel = 0; - Control.Send(CommandType_A.write, curtain); + //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.trait_on_off.value.ToString()); + Control.SendWriteCommand(curtain, d); }; btnCurtainStop.MouseDownEventHandler = (sender, e) => { @@ -93,81 +96,95 @@ btnCurtainOpen.IsSelected = true; btnCurtainClose.IsSelected = false; btnCurtainStop.IsSelected = false; - curtain.on_off = "stop"; - Control.Send(CommandType_A.write, curtain); + curtain.trait_on_off.value = "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.trait_on_off.value.ToString()); + Control.SendWriteCommand(curtain, d); }; btnCurtainOpen.MouseUpEventHandler = (sender, e) => { btnCurtainOpen.IsSelected = true; btnCurtainClose.IsSelected = false; btnCurtainStop.IsSelected = false; - curtain.on_off = "on"; + curtain.trait_on_off.value = "on"; curtain.openLevel = 100; - Control.Send(CommandType_A.write, curtain); + //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.trait_on_off.value.ToString()); + 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); + //Control.Send(CommandType_A.write, curtain); + 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); }; 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) => { delayTime = DateTime.MinValue; - Control.Send(CommandType_A.write, curtain); + //Control.Send(CommandType_A.write, curtain); + 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,7 +196,10 @@ { delayTime = DateTime.Now; curtain.openLevel = e; - Control.Send(CommandType_A.write, curtain); + //Control.Send(CommandType_A.write, curtain); + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add("openLevel", curtain.openLevel.ToString()); + Control.SendWriteCommand(curtain, d); curtain.refreshTime = DateTime.Now; } }) @@ -196,7 +216,10 @@ { delayTime = DateTime.Now; curtain.openLevel = e; - Control.Send(CommandType_A.write, curtain); + //Control.Send(CommandType_A.write, curtain); + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add("openLevel", curtain.openLevel.ToString()); + Control.SendWriteCommand(curtain, d); curtain.refreshTime = DateTime.Now; } }) -- Gitblit v1.8.0