From 93a578f5182792b4dd981e874e2746e8b3e34e2e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 四月 2023 18:01:05 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into Dev-Wxr
---
HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
index c908e90..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) =>
{
@@ -440,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