From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 6663157..809de71 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,7 +52,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
- curtain.SaveFunctionData();
+ //curtain.SaveFunctionData(true);
};
UpdataState(curtain);
}
@@ -62,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.CollectFunction();
};
}
--
Gitblit v1.8.0