From 17c8d94258154ab2e9f6d2cf821202c873b9f118 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 16 十二月 2020 15:39:15 +0800
Subject: [PATCH] 22222
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
index cb3380d..b8af979 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)
{
@@ -38,6 +38,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = socketFunction.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = socketFunction.GetRoomListName();
+ socketFunction.SaveFunctionData(true);
};
}
@@ -47,8 +48,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = socketFunction.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- socketFunction.SaveFunctionData();
+ btnCollection.IsSelected = socketFunction.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ socketFunction.SaveFunctionData(true);
};
}
@@ -63,11 +64,11 @@
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());
- Control.ins.SendWriteCommand(socketFunction, d);
+ d.Add("on_off", socketFunction.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(socketFunction, d);
})
{ IsBackground = true }.Start();
};
@@ -77,11 +78,11 @@
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());
- Control.ins.SendWriteCommand(socketFunction, d);
+ d.Add("on_off", socketFunction.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(socketFunction, d);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0