From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 12 十一月 2020 13:36:01 +0800 Subject: [PATCH] 20201112 --- HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs | 48 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 34 insertions(+), 14 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs index 0bf825b..52b3872 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs @@ -1,11 +1,30 @@ 锘縰sing System; using HDL_ON.Entity; +using Shared; namespace HDL_ON.UI { public partial class RelayPage { - + /// <summary> + /// 鏇存柊鐏厜鐘舵�� + /// </summary> + public static void UpdataState(Light uLight) + { + Application.RunOnMainThread(() => + { + try + { + if (bodyView == null) + return; + bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uLight.trait_on_off.value.ToString() == "on"; + } + catch (Exception ex) + { + MainPage.Log($"RelayPage error {ex.Message}"); + } + }); + } /// <summary> /// 鍔犺浇浜嬩欢鍒楄〃 /// </summary> @@ -28,7 +47,7 @@ { btnCollection.MouseUpEventHandler += (sender, e) => { btnCollection.IsSelected = light.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected; - DB_ResidenceData.residenceData.SaveResidenceData(); + light.SaveFunctionData(); }; } @@ -37,27 +56,28 @@ /// </summary> void LoadSwitchEvent() { - btnSwitchIcon.MouseUpEventHandler += (sender, e) => + btnSwitchIcon.MouseUpEventHandler = (sender, e) => { - btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitchIcon.IsSelected; - + btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected; new System.Threading.Thread(() => { - var light = this.light as Light; - light.on_off = btnSwitch.IsSelected ? 1 : 0; - Control.Send("write", this.light); + light.trait_on_off.value = btnSwitchIcon.IsSelected ? "on" : "off"; + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add("on_off", light.trait_on_off.value.ToString()); + DriverLayer.Control.ins.SendWriteCommand(light, d); }) { IsBackground = true }.Start(); }; - btnSwitch.MouseUpEventHandler += (sender, e) => + btnSwitch.MouseUpEventHandler = (sender, e) => { - btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitch.IsSelected; - + btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitch.IsSelected; new System.Threading.Thread(() => { - var light = this.light as Light; - light.on_off = btnSwitch.IsSelected ? 1 : 0; - Control.Send("write", this.light); + light.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off"; + System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + d.Add("on_off", light.trait_on_off.value.ToString()); + DriverLayer.Control.ins.SendWriteCommand(light, d); + //Control.Send(CommandType_A.write, light); }) { IsBackground = true }.Start(); }; -- Gitblit v1.8.0