From 62d6c4bf6c30da21ccd8245199234c5004117d56 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 四月 2023 13:32:15 +0800
Subject: [PATCH] V1.7.1发布版本

---
 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index d6bf43f..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)
                             {

--
Gitblit v1.8.0