From aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 21:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
old mode 100644
new mode 100755
index dfc0557..7785217
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
@@ -40,6 +40,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = fan.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = fan.GetRoomListName();
+ //fan.SaveFunctionData(true);
};
}
@@ -49,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.SaveFunctionData(true);
};
}
--
Gitblit v1.8.0