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 | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs index 232684e..8f8440a 100644 --- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs +++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs @@ -67,7 +67,7 @@ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png"; - + if (SPK.CurtainSpkList().Contains(function.spk)) {//绐楀笜娌℃湁寮�鍏虫寜閽� CurtainFragment(); @@ -98,7 +98,7 @@ - else if (function.spk == SPK.SenesorMegahealth) + else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose ) { var btnStatus = new Button() { @@ -185,16 +185,16 @@ { var btnHumidityIcon = new Button() { - X = Application.GetRealWidth(110), + X = Application.GetRealWidth(120), Y = Application.GetRealHeight(66), Width = Application.GetMinRealAverage(16), - Height = Application.GetMinRealAverage(16), + Height = Application.GetMinRealAverage(18), UnSelectedImagePath = "FunctionIcon/CAC/HvacCacHumidityIcon.png", }; bodyDiv.AddChidren(btnHumidityIcon); var btnHumidityValues = new TextButton() { - X = Application.GetRealWidth(130), + X = Application.GetRealWidth(140), Y = Application.GetRealHeight(64), Height = Application.GetRealHeight(18), TextColor = 0xFF161616, @@ -242,6 +242,8 @@ + } + else if (function.spk == SPK.AcstParent) { } else { @@ -373,7 +375,7 @@ bodyDiv.AddChidren(btnCollectionIcon); } - if(function.spk == SPK.SenesorMegahealth) + if(function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose) { bodyDiv.AddChidren(btnCollectionIcon); } @@ -403,6 +405,7 @@ switch (function.spk) { case SPK.LightDimming: + case SPK.LightRGBW: case SPK.LightRGB: #region Dimmer var btnDimmerMinValues = new Button() @@ -461,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() { @@ -470,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); @@ -501,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