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/Light/RelayPageBLL.cs |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
index dd666ed..53b3619 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
@@ -58,25 +58,27 @@
         {
             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);
+                    //Control.Send(CommandType_A.write, light);
                 })
                 { IsBackground = true }.Start();
             };
             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