From 76f93f093282d72e97894132277d3412b6bf8bea Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 20 九月 2022 13:31:27 +0800 Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr --- HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs index 064e64e..eaa5c14 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs @@ -68,7 +68,6 @@ lightSwitchView.btnText.TextID = StringId.switchLogic; fLayout.AddChidren(lightSwitchView.FLayoutView()); - ///璁惧寤舵椂iewv DelayView(fLayout, lightSwitchView.frameLayout.Bottom); #endregion @@ -102,7 +101,7 @@ brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom; brightnessView.btnText.TextID = StringId.brightnesLogic; fLayout.AddChidren(brightnessView.FLayoutView()); - //brightnessView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06 + brightnessView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06 ///璁惧寤舵椂iewv DelayView(fLayout, brightnessView.frameLayout.Bottom); #endregion @@ -742,9 +741,8 @@ /// <summary> /// 浜害/鐧惧垎姣�=鍔熻兘涓嬩竴绾х晫闈� /// </summary> - /// <param name="device">璁惧瀵硅薄</param> - /// <param name="button">鏄剧ず鐘舵�佸璞�</param> - /// <param name="titleName">鏍囬</param> + /// <param name="device"></param> + /// <param name="button"></param> private void BrightnessMethod(Entity.Function device, Button button, string titleName) { #region 鐣岄潰 -- Gitblit v1.8.0