From 51cb254cbd616e84b7a466b195eb43ab097c3897 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 29 九月 2020 13:16:45 +0800
Subject: [PATCH] 20200928
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 47645a0..3b6c85e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
@@ -18,25 +18,25 @@
}
if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.sid)
{
- if (uCurtain.on_off == "stop")
+ if (uCurtain.trait_on_off.value.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.value.ToString() == "on")
+ {
+ //bodyView.btnCurtainOpen.IsSelected = true;
+ //bodyView.btnCurtainClose.IsSelected = false;
+ //bodyView.btnCurtainStop.IsSelected = false;
bodyView.btnCurtainBgIcon.IsSelected = true;
}
- else if (uCurtain.on_off == "on")
+ else if (uCurtain.trait_on_off.value.ToString() == "off")
{
- bodyView.btnCurtainOpen.IsSelected = true;
- bodyView.btnCurtainClose.IsSelected = false;
- bodyView.btnCurtainStop.IsSelected = false;
- bodyView.btnCurtainBgIcon.IsSelected = true;
- }
- else if (uCurtain.on_off == "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;
}
}
@@ -61,7 +61,7 @@
{
btnCollection.MouseUpEventHandler += (sender, e) => {
btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ curtain.SaveFunctionData();
};
}
@@ -71,42 +71,48 @@
void LoadEvent_ControlEvent()
{
btnCurtainClose.MouseUpEventHandler = (sender, e) => {
- btnCurtainClose.IsSelected = true;
- btnCurtainStop.IsSelected = false;
- btnCurtainOpen.IsSelected = false;
- curtain.on_off = "off";
+ btnCurtainClose.IsSelected = false;
+ //btnCurtainStop.IsSelected = false;
+ //btnCurtainOpen.IsSelected = false;
+ curtain.trait_on_off.value = "off";
//Control.Send(CommandType_A.write,curtain);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.on_off.ToString());
+ d.Add("on_off", curtain.trait_on_off.value.ToString());
Control.SendWriteCommand(curtain, d);
};
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
{
btnCurtainStop.IsSelected = true;
- btnCurtainClose.IsSelected = false;
- btnCurtainOpen.IsSelected = false;
+ //btnCurtainClose.IsSelected = false;
+ //btnCurtainOpen.IsSelected = false;
+ };
+ btnCurtainOpen.MouseDownEventHandler = (sender, e) => {
+ btnCurtainOpen.IsSelected = true;
+ };
+ btnCurtainClose.MouseDownEventHandler = (sender, e) => {
+ btnCurtainClose.IsSelected = true;
};
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
- btnCurtainOpen.IsSelected = true;
- btnCurtainClose.IsSelected = false;
+ //btnCurtainOpen.IsSelected = false;
+ //btnCurtainClose.IsSelected = false;
btnCurtainStop.IsSelected = false;
- curtain.on_off = "stop";
+ curtain.trait_on_off.value = "stop";
//Control.Send(CommandType_A.write, curtain);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.on_off.ToString());
+ d.Add("on_off", curtain.trait_on_off.value.ToString());
Control.SendWriteCommand(curtain, d);
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- btnCurtainOpen.IsSelected = true;
- btnCurtainClose.IsSelected = false;
- btnCurtainStop.IsSelected = false;
- curtain.on_off = "on";
+ btnCurtainOpen.IsSelected = false;
+ //btnCurtainClose.IsSelected = false;
+ //btnCurtainStop.IsSelected = false;
+ curtain.trait_on_off.value = "on";
//Control.Send(CommandType_A.write, curtain);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.on_off.ToString());
+ d.Add("on_off", curtain.trait_on_off.value.ToString());
Control.SendWriteCommand(curtain, d);
};
--
Gitblit v1.8.0