From 02a194a40228251fef82dbca6c7687263b55b0b9 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 13 四月 2023 14:36:44 +0800 Subject: [PATCH] 2023年04月13日14:33:48 --- HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs index 0eb7ff8..0f8600b 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs @@ -264,12 +264,8 @@ TextAlignment = TextAlignment.Center, TextSize = CSS_FontSize.SubheadingFontSize, TextColor = CSS_Color.FirstLevelTitleColor, - Text = "鍔犺浇鏇村", + TextID = StringId.LoadMore, }; - if (Language.CurrentLanguage != "Chinese") - { - btnAppend.Text = "Load more"; - } functionListView.AddChidren(btnAppend); btnAppend.MouseUpEventHandler = (sender, e) => { @@ -421,13 +417,14 @@ SelectedImagePath = "FunctionIcon/Light/LightScene/CheckOnIcon.png", IsSelected = functions.Find((obj) => obj.deviceId == function.deviceId) != null }; - if (DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl) + if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl) { btnSelect.X = Application.GetRealWidth(323); } bodyDiv.AddChidren(btnSelect); btnSelect.MouseUpEventHandler = (sender, e) => { + Application.HideSoftInput(); btnSelect.IsSelected = !btnSelect.IsSelected; if(btnSelect.IsSelected) { @@ -439,7 +436,7 @@ } else { - var removeTemp = functions.Find((obj) => obj.deviceId == function.deviceId); + var removeTemp = functions.Find((obj) => obj.sid == function.deviceId); if (removeTemp != null) { functions.Remove(removeTemp); -- Gitblit v1.8.0