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/FuntionControlView/Light/LightScene/AddLightScene.cs | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs index 2e7b60c..fd09740 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs @@ -217,15 +217,16 @@ showCount = 0; functionListView.RemoveAll(); } - int i = 0; - foreach (var function in functions) + for(var i =0;i<100;i++) + //foreach (var function in functions) { - i++; - if (i > 100) + showCount++; + if (showCount >= functions.Count) { break; } - showCount++; + var function = functions[showCount]; + var functionDiv = new LightRow(function) { Gravity = Gravity.CenterHorizontal, @@ -415,7 +416,8 @@ Height = Application.GetRealWidth(32), UnSelectedImagePath = "FunctionIcon/Light/LightScene/CheckIcon.png", SelectedImagePath = "FunctionIcon/Light/LightScene/CheckOnIcon.png", - IsSelected = functions.Find((obj) => obj.deviceId == function.deviceId) != null + IsSelected = functions.Find((obj) => obj.deviceId == function.deviceId) != null, + Tag = "ChooseIcon" }; if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl) { @@ -443,10 +445,10 @@ } } ///鍒锋柊鐣岄潰 - if (functions.Count == 0 || functions.Count == 1) - { + //if (functions.Count == 0 || functions.Count == 1) + //{ action(); - } + //} }; } -- Gitblit v1.8.0