From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
index 0b50d02..6e5c460 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
@@ -17,7 +17,7 @@
{
if (bodyView == null)
return;
- bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uLight.trait_on_off.value.ToString() == "on";
+ bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uLight.trait_on_off.curValue.ToString() == "on";
}
catch (Exception ex)
{
@@ -62,9 +62,9 @@
btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected;
new System.Threading.Thread(() =>
{
- light.trait_on_off.value = btnSwitchIcon.IsSelected ? "on" : "off";
+ light.trait_on_off.curValue = btnSwitchIcon.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", light.trait_on_off.value.ToString());
+ d.Add("on_off", light.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
@@ -74,9 +74,9 @@
btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- light.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", light.trait_on_off.value.ToString());
+ d.Add("on_off", light.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(light, d);
//Control.Send(CommandType_A.write, light);
})
--
Gitblit v1.8.0