From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 80 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 02eb3ce..9196e67 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using Shared;
@@ -18,25 +19,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 +62,7 @@
{
btnCollection.MouseUpEventHandler += (sender, e) => {
btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ curtain.SaveFunctionData();
};
}
@@ -71,34 +72,49 @@
void LoadEvent_ControlEvent()
{
btnCurtainClose.MouseUpEventHandler = (sender, e) => {
- btnCurtainClose.IsSelected = true;
- btnCurtainStop.IsSelected = false;
- btnCurtainOpen.IsSelected = false;
- curtain.on_off = "off";
- Control.Send(CommandType_A.write,curtain);
+ 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.trait_on_off.value.ToString());
+ Control.ins.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";
- Control.Send(CommandType_A.write, curtain);
+ 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.trait_on_off.value.ToString());
+ Control.ins.SendWriteCommand(curtain, d);
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- btnCurtainOpen.IsSelected = true;
- btnCurtainClose.IsSelected = false;
- btnCurtainStop.IsSelected = false;
- curtain.on_off = "on";
- Control.Send(CommandType_A.write, curtain);
+ 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.trait_on_off.value.ToString());
+ Control.ins.SendWriteCommand(curtain, d);
};
}
--
Gitblit v1.8.0