From ed3bfb7462d44747230437717e8673a5192f833f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 20:34:51 +0800
Subject: [PATCH] 2020-11-30-2

---
 HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
index 2684f88..cb3380d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
@@ -18,7 +18,7 @@
                 {
                     if (bodyView == null)
                         return;
-                    bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.trait_on_off.curValue.ToString() == "on";
+                    bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.trait_on_off.value.ToString() == "on";
                 }
                 catch (Exception ex)
                 {
@@ -38,7 +38,6 @@
             actionRefresh = () => {
                 btnFunctionName.Text = btnFunctionName_Out.Text = socketFunction.name;
                 btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = socketFunction.GetRoomListName();
-                socketFunction.SaveFunctionData();
             };
         }
 
@@ -64,11 +63,11 @@
 
                 new System.Threading.Thread(() =>
                 {
-                    socketFunction.trait_on_off.curValue = 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.trait_on_off.curValue.ToString());
-                    Control.Ins.SendWriteCommand(socketFunction, d);
+                    d.Add("on_off", socketFunction.trait_on_off.value.ToString());
+                    Control.ins.SendWriteCommand(socketFunction, d);
                 })
                 { IsBackground = true }.Start();
             };
@@ -78,11 +77,11 @@
 
                 new System.Threading.Thread(() =>
                 {
-                    socketFunction.trait_on_off.curValue = 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.trait_on_off.curValue.ToString());
-                    Control.Ins.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