From 02498f7744e6fdc413e518f96b25f3635540dc6b Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 15 十一月 2022 11:27:38 +0800 Subject: [PATCH] 金茂科技系统更新 --- HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs index 4c33ddf..8f8440a 100644 --- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs +++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs @@ -98,7 +98,7 @@ - else if (function.spk == SPK.SenesorMegahealth) + else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose ) { var btnStatus = new Button() { @@ -375,7 +375,7 @@ bodyDiv.AddChidren(btnCollectionIcon); } - if(function.spk == SPK.SenesorMegahealth) + if(function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose) { bodyDiv.AddChidren(btnCollectionIcon); } @@ -464,6 +464,14 @@ /// </summary> void CurtainFragment() { + var onoffString = function.GetAttrState(FunctionAttributeKey.OnOff); + var percent = onoffString == "off" ? 0 : 100; + if (function.GetAttributes().Contains(FunctionAttributeKey.Percent)) + { + string percentString = function.GetAttrState(FunctionAttributeKey.Percent); + int.TryParse(percentString, out percent); + } + #region Curtain var btnCurtainClose = new Button() { @@ -473,7 +481,7 @@ Height = Application.GetMinRealAverage(32), UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png", SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png", - IsSelected = function.GetAttrState(FunctionAttributeKey.OnOff) == "off", + IsSelected = percent == 0, Tag = function.sid + "_off" }; bodyDiv.AddChidren(btnCurtainClose); @@ -504,7 +512,7 @@ UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png", SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png", Tag = function.sid + "_on", - IsSelected = function.GetAttrState(FunctionAttributeKey.OnOff) == "on", + IsSelected = percent != 0, }; bodyDiv.AddChidren(btnCurtainOpen); if (function.spk == SPK.CurtainRoller) -- Gitblit v1.8.0