From 1396007184e3e17c2465b1fea5ba5562daf7d157 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 02 六月 2021 16:02:59 +0800
Subject: [PATCH] 1

---
 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 6045637..085e701 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -475,10 +475,9 @@
                         break;
                     case ShowFunction.EnergyMonitoring:
                         #region 鑳芥簮
-                        functionCount = FunctionList.List.GetElectricals().Count;
-                        functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+                        functionCount = FunctionList.List.GetEnergyList().Count;
+                        functionOnCount = FunctionList.List.GetEnergyList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                         #endregion
-                        //functionCount = 1;
                         break;
                     case ShowFunction.Environmental:
                         #region 鐜鏁版嵁
@@ -493,7 +492,6 @@
                         functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                         if(functionCount == 0)
                         {
-                            if(MainPage.InternetStatus == 2)
                             functionCount = FunctionList.List.GetMusicList().Count;
                         }
                         break;

--
Gitblit v1.8.0