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/Electrical/SocketPageBLL.cs |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
index 65a710e..cb3380d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
@@ -1,4 +1,5 @@
 锘縰sing System;
+using HDL_ON.DriverLayer;
 using HDL_ON.Entity;
 using Shared;
 
@@ -17,7 +18,7 @@
                 {
                     if (bodyView == null)
                         return;
-                    bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.on_off == "on";
+                    bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.trait_on_off.value.ToString() == "on";
                 }
                 catch (Exception ex)
                 {
@@ -47,7 +48,7 @@
         {
             btnCollection.MouseUpEventHandler += (sender, e) => {
                 btnCollection.IsSelected = socketFunction.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
-                DB_ResidenceData.residenceData.SaveResidenceData();
+                socketFunction.SaveFunctionData();
             };
         }
 
@@ -62,11 +63,11 @@
 
                 new System.Threading.Thread(() =>
                 {
-                    socketFunction.on_off = btnSwitch.IsSelected ? "on" : "off";
+                    socketFunction.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
                     //Control.Send(CommandType_A.write, this.socketFunction);
                     System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
-                    d.Add("on_off", socketFunction.on_off.ToString());
-                    Control.SendWriteCommand(socketFunction, d);
+                    d.Add("on_off", socketFunction.trait_on_off.value.ToString());
+                    Control.ins.SendWriteCommand(socketFunction, d);
                 })
                 { IsBackground = true }.Start();
             };
@@ -76,11 +77,11 @@
 
                 new System.Threading.Thread(() =>
                 {
-                    socketFunction.on_off = btnSwitch.IsSelected ? "on" : "off";
+                    socketFunction.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
                     //Control.Send(CommandType_A.write, this.socketFunction);
                     System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
-                    d.Add("on_off", socketFunction.on_off.ToString());
-                    Control.SendWriteCommand(socketFunction, d);
+                    d.Add("on_off", socketFunction.trait_on_off.value.ToString());
+                    Control.ins.SendWriteCommand(socketFunction, d);
                 })
                 { IsBackground = true }.Start();
             };

--
Gitblit v1.8.0