From b6fdafae7a4d67ea44bbf8cc27563bca3244de4e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 24 七月 2023 09:19:01 +0800
Subject: [PATCH] 群控更新bug修复
---
HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs b/HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs
index aec513e..e9b11a2 100644
--- a/HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs
@@ -5,6 +5,10 @@
using Shared;
namespace HDL_ON.UI.UI2.Classification
{
+ /// <summary>
+ /// 璺戦┈鐏〉闈�
+ /// 搴忓垪椤甸潰
+ /// </summary>
public class SeriesFunctionListPage : FrameLayout
{
FrameLayout bodyView;
@@ -31,19 +35,25 @@
Dictionary<string, List<Button>> dicGroupButtons = new Dictionary<string, List<Button>>();
+ List<string> oidList = new List<string>();
+
foreach(var rgb in FunctionList.List.GetLightList())
{
- if(rgb.spk == SPK.LightRGB)
+ //if(rgb.spk == SPK.LightRGB)
{
- if (rgb.GetAttribute(FunctionAttributeKey.Colorful) == null)
+ var oid = rgb.sid.Substring(0, 16);
+ if (oidList.Contains(oid))
{
continue;
}
- List<Button> groupButtons = new List<Button>();
- var list = new List<Function>();
- list.Add(rgb);
- var oid = rgb.sid.Substring(0, 16);
var seriesList = FunctionList.List.GetSeries().FindAll((obj) => obj.sid.StartsWith(oid));
+ if (seriesList.Count == 0)
+ {
+ continue;
+ }
+ oidList.Add(oid);
+ var list = new List<Function>();
+ List<Button> groupButtons = new List<Button>();
list.AddRange(seriesList);
var groupView = new VerticalScrolViewLayout()
{
@@ -66,8 +76,12 @@
TextSize = CSS_FontSize.SubheadingFontSize,
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainColor,
- Text = rgb.name,
+ Text =Language.StringByID( StringId.HorseRaceLampGroup )+ " "+ oidList.Count.ToString(),
};
+ if(Language.CurrentLanguage == "Chinese")
+ {
+ btnTitle.Text = Language.StringByID(StringId.HorseRaceLampGroup) + oidList.Count.ToString();
+ }
titleView.AddChidren(btnTitle);
#endregion
--
Gitblit v1.8.0