From b9c9c77fe50a9098f62a338c44c8598690177b90 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 10:58:23 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 31b64f2..9a0acd5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
@@ -21,23 +21,23 @@
{
if (uCurtain.trait_on_off.curValue.ToString() == "stop")
{
- //bodyView.btnCurtainOpen.IsSelected = true;
- //bodyView.btnCurtainClose.IsSelected = false;
- //bodyView.btnCurtainStop.IsSelected = false;
+ bodyView.btnCurtainOpen.IsSelected = true;
+ bodyView.btnCurtainClose.IsSelected = false;
+ bodyView.btnCurtainStop.IsSelected = false;
//bodyView.btnCurtainBgIcon.IsSelected = true;
}
else if (uCurtain.trait_on_off.curValue.ToString() == "on")
{
- //bodyView.btnCurtainOpen.IsSelected = true;
- //bodyView.btnCurtainClose.IsSelected = false;
- //bodyView.btnCurtainStop.IsSelected = false;
+ bodyView.btnCurtainOpen.IsSelected = true;
+ bodyView.btnCurtainClose.IsSelected = false;
+ bodyView.btnCurtainStop.IsSelected = false;
bodyView.btnCurtainBgIcon.IsSelected = true;
}
else if (uCurtain.trait_on_off.curValue.ToString() == "off")
{
- //bodyView.btnCurtainOpen.IsSelected = false;
- //bodyView.btnCurtainClose.IsSelected = true;
- //bodyView.btnCurtainStop.IsSelected = false;
+ bodyView.btnCurtainOpen.IsSelected = false;
+ bodyView.btnCurtainClose.IsSelected = true;
+ bodyView.btnCurtainStop.IsSelected = false;
bodyView.btnCurtainBgIcon.IsSelected = false;
}
}
@@ -52,6 +52,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
+ //curtain.SaveFunctionData(true);
};
UpdataState(curtain);
}
@@ -61,8 +62,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- curtain.SaveFunctionData();
+ btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ curtain.SaveFunctionData(true);
};
}
--
Gitblit v1.8.0