From 666b28d77fc3c1b1dae61c9dfd878c8e683cef8c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 四月 2023 13:37:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index dee3d46..afdeb75 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -141,8 +141,8 @@
if (titleId == StringId.Lights)
{
- functionList.AddRange(FunctionList.List.GetLightList());
functionList.AddRange(FunctionList.List.groupControls);
+ functionList.AddRange(FunctionList.List.GetLightList());
var lightScene = FunctionList.List.scenes.FindAll((obj) => obj.sceneType == SceneType.LightScene);
@@ -242,15 +242,15 @@
showCount = 0;
functionListView.RemoveAll();
}
- int i = 0;
- foreach (var function in showList)
+ for(var i = 0;i<50;i++)
+ //foreach (var function in showList)
{
- i++;
- if (i > 50)
+ showCount++;
+ if (showCount >= showList.Count)
{
break;
}
- showCount++;
+ var function = showList[showCount];
if (function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2)
{
@@ -317,12 +317,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) =>
{
--
Gitblit v1.8.0