From e08a444a9d7acea0cf39f50d22d29179f6a59292 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 09:37:11 +0800
Subject: [PATCH] 2020-12-1
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
index 83e3bad..1d96749 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();
};
}
@@ -65,11 +66,11 @@
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());
- Control.ins.SendWriteCommand(fan, d);
+ d.Add("on_off", fan.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(fan, d);
})
{ IsBackground = true }.Start();
};
@@ -79,11 +80,11 @@
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());
- Control.ins.SendWriteCommand(fan, d);
+ d.Add("on_off", fan.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(fan, d);
})
{ IsBackground = true }.Start();
};
@@ -92,11 +93,11 @@
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());
- Control.ins.SendWriteCommand(fan, d);
+ d.Add("on_off", fan.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(fan, d);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0