From c047239d340038cea872bae276e713ef866c0a34 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 02 三月 2021 13:22:21 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
index f702427..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(true);
+ //fan.SaveFunctionData(true);
};
}
@@ -51,7 +51,7 @@
{
btnCollection.MouseUpEventHandler += (sender, e) => {
btnCollection.IsSelected = fan.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- fan.SaveFunctionData(true);
+ 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