From bfc72d34aae172a0ec25c35bee0d6c28db57d0db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 25 四月 2023 15:01:56 +0800
Subject: [PATCH] 自研可视对讲问题修复
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index d6bf43f..1b48b0d 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);
@@ -221,7 +221,7 @@
/// <summary>
/// 鏄剧ず鐨勮澶囩殑鎬绘暟
/// </summary>
- int showCount = 0;
+ int showCount = -1;
/// <summary>
/// 鍔犺浇鍔熻兘row
/// </summary>
@@ -239,18 +239,18 @@
{
if (!isAppend)
{
- showCount = 0;
+ showCount = -1;
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)
{
--
Gitblit v1.8.0