From 9ed4d6675aa1f0abe20e3f84e92f5ac2da8ab4f4 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 12 十二月 2020 20:02:00 +0800
Subject: [PATCH] 20201212-4
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index cd5f76e..85d3b62 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -434,41 +434,41 @@
{
case ShowFunction.Light:
#region Light
- functionCount = DB_ResidenceData.functionList.lights.Count;
- functionOnCount = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.lights.Count;
+ functionOnCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.AC:
#region AC
- functionCount = DB_ResidenceData.functionList.aCs.Count;
- functionOnCount = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.aCs.Count;
+ functionOnCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.Curtain:
#region Curtain
- functionCount = DB_ResidenceData.functionList.curtains.Count;
- functionOnCount = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.curtains.Count;
+ functionOnCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.FloorHeating:
#region 鍦扮儹
- functionCount = DB_ResidenceData.functionList.floorHeatings.Count;
- functionOnCount = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.floorHeatings.Count;
+ functionOnCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.DoorLock:
break;
case ShowFunction.Electric:
#region 鐢靛櫒
- functionCount = DB_ResidenceData.functionList.electricals.Count;
- functionOnCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.electricals.Count;
+ functionOnCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
break;
case ShowFunction.EnergyMonitoring:
break;
case ShowFunction.Environmental:
#region 鐜鏁版嵁
- functionCount = DB_ResidenceData.functionList.sensorsEnvironmentalScience.Count;
+ functionCount = FunctionList.List.sensorsEnvironmentalScience.Count;
#endregion
break;
case ShowFunction.FreshAir:
@@ -553,8 +553,8 @@
case ShowFunction.Light:
#region Light
btnName.TextID = StringId.Lights;
- functionCount = DB_ResidenceData.functionList.lights.Count;
- functionOnCount = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.lights.Count;
+ functionOnCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnLightPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -579,8 +579,8 @@
case ShowFunction.AC:
#region AC
btnName.TextID = StringId.AC;
- functionCount = DB_ResidenceData.functionList.aCs.Count;
- functionOnCount = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.aCs.Count;
+ functionOnCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnAcPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -603,8 +603,8 @@
case ShowFunction.Curtain:
#region Curtain
btnName.TextID = StringId.Curtain;
- functionCount = DB_ResidenceData.functionList.curtains.Count;
- functionOnCount = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.curtains.Count;
+ functionOnCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnClose;
btnClose = new Button()
{
@@ -639,8 +639,8 @@
case ShowFunction.FloorHeating:
#region 鍦扮儹
btnName.TextID = StringId.FloorHeating;
- functionCount = DB_ResidenceData.functionList.floorHeatings.Count;
- functionOnCount = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.floorHeatings.Count;
+ functionOnCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnFhPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -666,8 +666,8 @@
case ShowFunction.Electric:
#region 鐢靛櫒
btnName.TextID = StringId.Electric;
- functionCount = DB_ResidenceData.functionList.electricals.Count;
- functionOnCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.electricals.Count;
+ functionOnCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
Button btnElectricPower = new Button()
{
X = Application.GetRealWidth(120),
--
Gitblit v1.8.0