From 7d041ae6788088b0d67636f0c440755d3e40247c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十二月 2020 17:24:22 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index f6ac829..428a93c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -19,9 +19,9 @@
{
if (uCurtain.trait_on_off.curValue.ToString() == "stop")
{
- bodyView.btnCurtainOpen.IsSelected = true;
+ bodyView.btnCurtainOpen.IsSelected = false;
bodyView.btnCurtainClose.IsSelected = false;
- bodyView.btnCurtainStop.IsSelected = false;
+ bodyView.btnCurtainStop.IsSelected = true;
}
else if (uCurtain.trait_on_off.curValue.ToString() == "on")
{
@@ -90,17 +90,20 @@
DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
};
- btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+ //btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+ //{
+ // btnCurtainStop.IsSelected = true;
+ // btnCurtainClose.IsSelected = false;
+ // btnCurtainOpen.IsSelected = false;
+ //};
+ btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
+ //btnCurtainOpen.IsSelected = true;
+ //btnCurtainClose.IsSelected = false;
+ //btnCurtainStop.IsSelected = false;
btnCurtainStop.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainOpen.IsSelected = false;
- };
- btnCurtainStop.MouseUpEventHandler = (sender, e) =>
- {
- btnCurtainOpen.IsSelected = true;
- btnCurtainClose.IsSelected = false;
- btnCurtainStop.IsSelected = false;
curtain.trait_on_off.curValue = "stop";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", curtain.trait_on_off.curValue.ToString());
--
Gitblit v1.8.0