From f5b46f80546aac860ade6e4c53821e43df833b39 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 11:11:28 +0800
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/wxr4' into dev-tzy"
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 2f3552a..544fcaa 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -475,9 +475,10 @@
break;
case ShowFunction.EnergyMonitoring:
#region 鑳芥簮
- functionCount = FunctionList.List.GetEnergyList().Count;
- functionOnCount = FunctionList.List.GetEnergyList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+ functionCount = FunctionList.List.GetElectricals().Count;
+ functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
#endregion
+ //functionCount = 1;
break;
case ShowFunction.Environmental:
#region 鐜鏁版嵁
@@ -562,12 +563,11 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(140),
+ Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(24),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
TextAlignment = TextAlignment.CenterLeft,
- IsMoreLines = true,
};
functionView.AddChidren(btnName);
--
Gitblit v1.8.0