From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 15 三月 2021 14:55:49 +0800 Subject: [PATCH] 合并前上传一个版本 --- HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 61 +++++++++++++++++------------- 1 files changed, 35 insertions(+), 26 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs index 2eabbf6..1579e5b 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs @@ -21,23 +21,22 @@ { if (uCurtain.trait_on_off.curValue.ToString() == "stop") { - bodyView.btnCurtainOpen.IsSelected = true; - bodyView.btnCurtainClose.IsSelected = false; - bodyView.btnCurtainStop.IsSelected = false; - //bodyView.btnCurtainBgIcon.IsSelected = true; + //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; + //bodyView.btnCurtainOpen.IsSelected = true; + //bodyView.btnCurtainClose.IsSelected = false; + //bodyView.btnCurtainStop.IsSelected = false; bodyView.btnCurtainBgIcon.IsSelected = true; } else if (uCurtain.trait_on_off.curValue.ToString() == "off") { - bodyView.btnCurtainOpen.IsSelected = false; - bodyView.btnCurtainClose.IsSelected = true; - bodyView.btnCurtainStop.IsSelected = false; + //bodyView.btnCurtainOpen.IsSelected = false; + //bodyView.btnCurtainClose.IsSelected = true; + //bodyView.btnCurtainStop.IsSelected = false; bodyView.btnCurtainBgIcon.IsSelected = false; } } @@ -73,11 +72,14 @@ void LoadEvent_ControlEvent() { btnCurtainClose.MouseUpEventHandler = (sender, e) => { - btnCurtainClose.IsSelected = false; - //btnCurtainStop.IsSelected = false; - //btnCurtainOpen.IsSelected = false; + new System.Threading.Thread(() => { + System.Threading.Thread.Sleep(2000); + Application.RunOnMainThread(() => { + btnCurtainClose.IsSelected = false; + }); + }) { IsBackground = true }.Start(); + btnCurtainBgIcon.IsSelected = false; curtain.trait_on_off.curValue = "off"; - //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.curValue.ToString()); Control.Ins.SendWriteCommand(curtain, d); @@ -86,33 +88,40 @@ btnCurtainStop.MouseDownEventHandler = (sender, e) => { btnCurtainStop.IsSelected = true; - //btnCurtainClose.IsSelected = false; - //btnCurtainOpen.IsSelected = false; }; - btnCurtainOpen.MouseDownEventHandler = (sender, e) => { + btnCurtainOpen.MouseDownEventHandler = (sender, e) => + { btnCurtainOpen.IsSelected = true; }; - btnCurtainClose.MouseDownEventHandler = (sender, e) => { + btnCurtainClose.MouseDownEventHandler = (sender, e) => + { btnCurtainClose.IsSelected = true; }; btnCurtainStop.MouseUpEventHandler = (sender, e) => { - //btnCurtainOpen.IsSelected = false; - //btnCurtainClose.IsSelected = false; - btnCurtainStop.IsSelected = false; + new System.Threading.Thread(() => { + System.Threading.Thread.Sleep(2000); + Application.RunOnMainThread(() => { + btnCurtainStop.IsSelected = false; + }); + }) + { IsBackground = true }.Start(); curtain.trait_on_off.curValue = "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.curValue.ToString()); Control.Ins.SendWriteCommand(curtain, d); }; btnCurtainOpen.MouseUpEventHandler = (sender, e) => { - btnCurtainOpen.IsSelected = false; - //btnCurtainClose.IsSelected = false; - //btnCurtainStop.IsSelected = false; + new System.Threading.Thread(() => { + System.Threading.Thread.Sleep(2000); + Application.RunOnMainThread(() => { + btnCurtainOpen.IsSelected = false; + }); + }) + { IsBackground = true }.Start(); + btnCurtainBgIcon.IsSelected = true; curtain.trait_on_off.curValue = "on"; - //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.curValue.ToString()); Control.Ins.SendWriteCommand(curtain, d); -- Gitblit v1.8.0