From d3c48684c8c4e0467fdf0c7a2193c9c02f122ef8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 四月 2023 15:17:13 +0800
Subject: [PATCH] pm2.5单位修改
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 74b7a31..afdeb75 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -39,7 +39,7 @@
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- if (titleId == StringId.Lights && !DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl)
+ if (titleId == StringId.Lights && !DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
{
Action action = () =>
{
@@ -141,7 +141,10 @@
if (titleId == StringId.Lights)
{
+ functionList.AddRange(FunctionList.List.groupControls);
functionList.AddRange(FunctionList.List.GetLightList());
+
+
var lightScene = FunctionList.List.scenes.FindAll((obj) => obj.sceneType == SceneType.LightScene);
foreach (var scene in lightScene)
@@ -239,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)
{
@@ -314,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