From af9c3e0b3b1eb370e966b3ca9db3f62848d4189b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 21 八月 2021 13:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index ba8453a..890573b 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -702,6 +702,9 @@
break;
case ShowFunction.Music:
functionCount = FunctionList.List.GetMusicList().Count;
+#if DEBUG
+ functionCount = 1;
+#endif
break;
case ShowFunction.Panel:
break;
@@ -722,9 +725,10 @@
break;
case ShowFunction.SecurityCenter:
functionCount = FunctionList.List.securities.Count;
-#if DEBUG
- functionCount = 1;
-#endif
+ if (DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ functionCount = 1;
+ }
break;
}
--
Gitblit v1.8.0