From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813

---
 HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
index dd666ed..b4fecbf 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
@@ -56,27 +56,28 @@
         /// </summary>
         void LoadSwitchEvent()
         {
-            btnSwitchIcon.MouseUpEventHandler += (sender, e) =>
+            btnSwitchIcon.MouseUpEventHandler = (sender, e) =>
             {
-                btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected;
-
+                btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected;
                 new System.Threading.Thread(() =>
                 {
-                    var light = this.light as Light;
-                    light.on_off = btnSwitch.IsSelected ? "on" : "off";
-                    Control.Send(CommandType_A.write, this.light);
+                    light.on_off = btnSwitchIcon.IsSelected ? "on" : "off";
+                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                    d.Add("on_off", light.on_off.ToString());
+                    Control.SendWriteCommand(light, d);
                 })
                 { IsBackground = true }.Start();
             };
-            btnSwitch.MouseUpEventHandler += (sender, e) =>
+            btnSwitch.MouseUpEventHandler = (sender, e) =>
             {
-                btnSwitch.IsSelected = !btnSwitch.IsSelected;
-
+                btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitch.IsSelected;
                 new System.Threading.Thread(() =>
                 {
-                    var light = this.light as Light;
                     light.on_off = btnSwitch.IsSelected ? "on" : "off";
-                    Control.Send(CommandType_A.write, this.light);
+                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                    d.Add("on_off", light.on_off.ToString());
+                    Control.SendWriteCommand(light, d);
+                    //Control.Send(CommandType_A.write, light);
                 })
                 { IsBackground = true }.Start();
             };

--
Gitblit v1.8.0