From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
index 4f3d6d0..d64f304 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.value.ToString() == "on";
+ bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.trait_on_off.curValue.ToString() == "on";
}
catch (Exception ex)
{
@@ -63,10 +63,10 @@
new System.Threading.Thread(() =>
{
- socketFunction.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ socketFunction.trait_on_off.curValue = 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.value.ToString());
+ d.Add("on_off", socketFunction.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(socketFunction, d);
})
{ IsBackground = true }.Start();
@@ -77,10 +77,10 @@
new System.Threading.Thread(() =>
{
- socketFunction.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ socketFunction.trait_on_off.curValue = 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.value.ToString());
+ d.Add("on_off", socketFunction.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(socketFunction, d);
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0