From bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 14:06:36 +0800
Subject: [PATCH] 20201217-1
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
index 53b3619..ac77056 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.on_off == "on";
+ bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uLight.trait_on_off.curValue.ToString() == "on";
}
catch (Exception ex)
{
@@ -37,6 +37,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
+ //light.SaveFunctionData(true);
};
}
@@ -46,8 +47,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = light.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.IsSelected = light.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ light.SaveFunctionData(true);
};
}
@@ -56,28 +57,27 @@
/// </summary>
void LoadSwitchEvent()
{
- btnSwitchIcon.MouseUpEventHandler += (sender, e) =>
+ btnSwitchIcon.MouseUpEventHandler = (sender, e) =>
{
btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected;
new System.Threading.Thread(() =>
{
- light.on_off = 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.on_off.ToString());
- Control.SendWriteCommand(light, d);
- //Control.Send(CommandType_A.write, light);
+ d.Add("on_off", light.trait_on_off.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
};
- btnSwitch.MouseUpEventHandler += (sender, e) =>
+ btnSwitch.MouseUpEventHandler = (sender, e) =>
{
btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- light.on_off = 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.on_off.ToString());
- Control.SendWriteCommand(light, d);
+ d.Add("on_off", light.trait_on_off.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(light, d);
//Control.Send(CommandType_A.write, light);
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0