From a46cd0adb5af29e8a9cf47c219475acaedfcf839 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 十二月 2020 17:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC'
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
index d2ac449..bbbbb48 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
@@ -18,8 +18,8 @@
{
if (bodyView == null)
return;
- bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.trait_on_off.value.ToString() == "on";
- bodyView.barGradualChange.ProgressBarColor = uFan.trait_on_off.value.ToString() == "on" ? CSS.CSS_Color.MainColor : CSS.CSS_Color.PromptingColor2;
+ bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.trait_on_off.curValue.ToString() == "on";
+ bodyView.barGradualChange.ProgressBarColor = uFan.trait_on_off.curValue.ToString() == "on" ? CSS.CSS_Color.MainColor : CSS.CSS_Color.PromptingColor2;
bodyView.barGradualChange.Progress = uFan.openLevel;
}
catch (Exception ex)
@@ -40,6 +40,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = fan.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = fan.GetRoomListName();
+ fan.SaveFunctionData();
};
}
@@ -49,7 +50,7 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = fan.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ btnCollection.IsSelected = fan.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
fan.SaveFunctionData();
};
}
@@ -65,10 +66,10 @@
new System.Threading.Thread(() =>
{
- fan.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ fan.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, this.fan);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", fan.trait_on_off.value.ToString());
+ d.Add("on_off", fan.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(fan, d);
})
{ IsBackground = true }.Start();
@@ -79,10 +80,10 @@
new System.Threading.Thread(() =>
{
- fan.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ fan.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, this.fan);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", fan.trait_on_off.value.ToString());
+ d.Add("on_off", fan.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(fan, d);
})
{ IsBackground = true }.Start();
@@ -92,10 +93,10 @@
fan.openLevel = e;
new System.Threading.Thread(() =>
{
- fan.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ fan.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, this.fan);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", fan.trait_on_off.value.ToString());
+ d.Add("on_off", fan.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(fan, d);
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0