From 6d458e4338993e578ce81c6b3c4738e85b68b4df Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期四, 02 九月 2021 10:41:49 +0800 Subject: [PATCH] 1.窗帘控制界面去掉按钮状态。 2.RGB灯光渐变时间标题异常显示问题修复。 --- HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs index 8a1097b..0607b30 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs @@ -127,12 +127,12 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; - //controlView.AddChidren(btnCollection); + controlView.AddChidren(btnCollection); //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳� - if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare) - { - controlView.AddChidren(btnCollection); - } + //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) + //{ + // controlView.AddChidren(btnCollection); + //} curtainSeekBar = new CurtainSeekBarOn() { @@ -203,7 +203,6 @@ Height = Application.GetMinRealAverage(32), UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png", SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png", - IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) == "0" }; controlView.AddChidren(btnCurtainClose); @@ -226,7 +225,6 @@ Height = Application.GetMinRealAverage(32), UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png", SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png", - IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) != "0" }; controlView.AddChidren(btnCurtainOpen); -- Gitblit v1.8.0