From 4f2dbd1f6a1ec2d9c3c39b4a37b0b7c9ddece4aa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 23 九月 2021 15:24:01 +0800
Subject: [PATCH] 主页刷新优化
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 07790c3..88c7b71 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -38,8 +38,20 @@
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,27 +95,35 @@
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());
+ }
+ 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();
@@ -120,8 +140,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 +155,7 @@
BorderColor = 0x00FFFFFF,
BorderWidth = 1,
BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = function.sid
+ Tag = function.spk + function.sid
};
functionDiv.LoadFunctionDiv();
functionListView.AddChidren(functionDiv);
@@ -148,7 +171,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