From c1cb2d8c6034a2ee7aa8a5710bba15b14f76cebc Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期五, 18 八月 2023 18:54:31 +0800 Subject: [PATCH] 2023年08月18日18:54:22 --- HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs index 785a7fd..f7fe3ad 100644 --- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs +++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs @@ -164,12 +164,12 @@ if (titleId == StringId.Lights) { - functionList.AddRange(FunctionList.List.groupControls); + //functionList.AddRange(FunctionList.List.groupControls); functionList.AddRange(FunctionList.List.GetLightList()); - - - - + } + else if(titleId == StringId.HorseRaceLamp) + { + functionList.AddRange(FunctionList.List.GetSeries()); } else if (titleId == StringId.AC) { @@ -186,6 +186,8 @@ else if (titleId == StringId.Electric) { functionList.AddRange(FunctionList.List.GetElectricals()); + functionList.Add(new Function { spk = SPK.ElectricalTvHisense, name = "娴蜂俊鐢佃1",sid="123456789"}); + functionList.Add(new Function { spk = SPK.ElectricalTvHisense, name = "娴蜂俊鐢佃2", sid = "1234567890" }); } else if (titleId == StringId.EnvironmentalScience) { @@ -199,11 +201,11 @@ { functionList.AddRange(FunctionList.List.GetAirFreshList()); } - else if(titleId == StringId.MechanicalArm) + else if (titleId == StringId.MechanicalArm) { functionList.AddRange(FunctionList.List.GetMechanicalArmList()); } - else if(titleId == StringId.SecurityMonitoring) + else if (titleId == StringId.SecurityMonitoring) { functionList.AddRange(FunctionList.List.GetIpCamImouList()); } -- Gitblit v1.8.0