From 64390bc739286477167e186f1f2b40a27a73a9a5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 02 三月 2021 17:31:01 +0800
Subject: [PATCH] 20210302-1
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 2122e54..c527412 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -173,7 +173,16 @@
{
if (view.Tag.ToString() == function.sid)
{
- var state = function.trait_on_off.curValue.ToString() == "on";
+ var state = false;
+ if (function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades || function.spk == SPK.CurtainTrietex ||
+ function.spk == SPK.CurtainSwitch)//绐楀笜璁惧鏍规嵁鐧惧垎姣斿垽鏂紑鍏崇姸鎬�
+ {
+ state = function.GetAttrState(FunctionAttributeKey.Percent) != "0";
+ }
+ else
+ {
+ state = function.trait_on_off.curValue.ToString() == "on";
+ }
for (int i = 0; i < view.ChildrenCount; i++)
{
if (view.GetChildren(i).GetType() == typeof(Button))
@@ -325,13 +334,9 @@
/// </summary>
void LoadEvent_ControlCurtain(Curtain curtain, Button btnClose, Button btnOpen)
{
- btnClose.MouseDownEventHandler = (sender, e) =>
- {
- btnClose.IsSelected = true;
- };
btnClose.MouseUpEventHandler = (sender, e) =>
{
- btnClose.IsSelected = false;
+ btnClose.IsSelected = true;
curtain.trait_on_off.curValue = "off";
curtain.percent = 0;
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -339,13 +344,9 @@
Control.Ins.SendWriteCommand(curtain, d);
};
- btnOpen.MouseDownEventHandler = (sender, e) =>
- {
- btnOpen.IsSelected = true;
- };
btnOpen.MouseUpEventHandler = (sender, e) =>
{
- btnOpen.IsSelected = false;
+ btnOpen.IsSelected = true;
curtain.trait_on_off.curValue = "on";
curtain.percent = 100;
Dictionary<string, string> d = new Dictionary<string, string>();
--
Gitblit v1.8.0