From 1eb43291d6f565fd8106ee401240d1c7a41da776 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期一, 27 九月 2021 09:31:46 +0800 Subject: [PATCH] 组合调光 --- HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 50 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs old mode 100755 new mode 100644 index c140558..74fe7e8 --- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs +++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs @@ -38,8 +38,21 @@ public void LoadPage(int titleId) { bodyView.BackgroundColor = CSS_Color.BackgroundColor; - new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView(); - + if (titleId == StringId.Lights) + { + Action action = () => + { + var skipView = new AddLightScene(new List<Function>(), new Scene() { sceneType = SceneType.LightScene }); + MainPage.BasePageView.AddChidren(skipView); + skipView.LoadPage(); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + }; + new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView_LightFunction(action); + } + else + { + new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView(); + } /// <summary> /// 鎴块棿鍐呭鏄剧ず鍖哄煙 /// </summary> @@ -83,29 +96,37 @@ if (titleId == StringId.Lights) { - functionList.AddRange(FunctionList.List.lights); + functionList.AddRange(FunctionList.List.GetLightList()); } else if (titleId == StringId.AC) { - functionList.AddRange(FunctionList.List.aCs); + functionList.AddRange(FunctionList.List.GetAcList()); } else if (titleId == StringId.Curtain) { - functionList.AddRange(FunctionList.List.curtains); + functionList.AddRange(FunctionList.List.GetCurtainList()); } else if (titleId == StringId.FloorHeating) { - functionList.AddRange(FunctionList.List.floorHeatings); + functionList.AddRange(FunctionList.List.GetFloorHeatingList()); } else if (titleId == StringId.Electric) { - functionList.AddRange(FunctionList.List.electricals); + functionList.AddRange(FunctionList.List.GetElectricals()); } else if (titleId == StringId.EnvironmentalScience) { - functionList.AddRange(FunctionList.List.sensorsEnvironmentalScience); + functionList.AddRange(FunctionList.List.GetEnvirSensorsList()); } - functionList.OrderByDescending(o => o.usageCount).ToList(); + else if (titleId == StringId.Sensor) + { + functionList.AddRange(FunctionList.List.GetArmSensorList()); + } + else if (titleId == StringId.FreshAir) + { + functionList.AddRange(FunctionList.List.GetAirFreshList()); + } + functionList.OrderByDescending(o => o.controlCounter).ToList(); ShowFunctionRow(functionList); @@ -120,8 +141,11 @@ functionListView.RemoveAll(); foreach (var function in showList) { - - if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer) + if(function.spk == SPK.SensorDryContact) + { + continue; + } + if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming) { var functionDiv = new FunctionControlZone(function) { @@ -132,7 +156,7 @@ BorderColor = 0x00FFFFFF, BorderWidth = 1, BackgroundColor = CSS_Color.MainBackgroundColor, - Tag = function.sid + Tag = function.spk + function.sid }; functionDiv.LoadFunctionDiv(); functionListView.AddChidren(functionDiv); @@ -148,7 +172,7 @@ BorderColor = 0x00FFFFFF, BorderWidth = 1, BackgroundColor = CSS_Color.MainBackgroundColor, - Tag = function.sid + Tag = function.spk + function.sid }; functionDiv.LoadFunctionDiv(); functionListView.AddChidren(functionDiv); -- Gitblit v1.8.0