From 84fa7c9665d9bed9aef79237be9c5eb57c49f13d Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 05 三月 2021 10:54:37 +0800
Subject: [PATCH] Merge branch 'CJL' into ez-test
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
index 1d96749..f6bf791 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
@@ -40,7 +40,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = fan.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = fan.GetRoomListName();
- fan.SaveFunctionData();
+ //fan.SaveFunctionData(true);
};
}
@@ -50,8 +50,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = fan.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- fan.SaveFunctionData();
+ btnCollection.IsSelected = fan.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ fan.CollectFunction();
};
}
@@ -70,6 +70,7 @@
//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.curValue.ToString());
+ d.Add("fan_speed_percent", fan.openLevel.ToString());
Control.Ins.SendWriteCommand(fan, d);
})
{ IsBackground = true }.Start();
@@ -84,6 +85,7 @@
//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.curValue.ToString());
+ d.Add("fan_speed_percent", fan.openLevel.ToString());
Control.Ins.SendWriteCommand(fan, d);
})
{ IsBackground = true }.Start();
@@ -97,6 +99,7 @@
//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.curValue.ToString());
+ d.Add("fan_speed_percent", fan.openLevel.ToString());
Control.Ins.SendWriteCommand(fan, d);
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0