From fdbcb1f7463cb766f90bd29dd715485ba9d88524 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 06 九月 2023 17:55:03 +0800
Subject: [PATCH] Merge branch 'wxr-2.0' into Dev-Branch

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

diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 265338d..6fca48a 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -89,14 +89,14 @@
             #region top
             FrameLayout topView = new FrameLayout()
             {
-                Height = Application.GetRealHeight(64),
+                Height = Application.GetRealHeight(74),
                 BackgroundColor = CSS_Color.TopViewColor,
             };
             bodyView.AddChidren(topView);
 
             btnRoomTilte = new Button()
             {
-                Y = Application.GetRealHeight(30),
+                Y = Application.GetRealHeight(40),
                 Width = Application.GetRealWidth(170),
                 Height = Application.GetRealHeight(25),
                 TextAlignment = TextAlignment.CenterRight,
@@ -111,7 +111,7 @@
             btnFuncTitle = new Button()
             {
                 X = Application.GetRealWidth(209),
-                Y = Application.GetRealHeight(30),
+                Y = Application.GetRealHeight(40),
                 Width = Application.GetRealWidth(170),
                 Height = Application.GetRealHeight(25),
                 TextAlignment = TextAlignment.CenterLeft,
@@ -125,8 +125,8 @@
 
             contentPageView = new PageLayout()
             {
-                Y = Application.GetRealHeight(64),
-                Height = Application.GetRealHeight(667 - 64 - 49 + 30),
+                Y = Application.GetRealHeight(74),
+                Height = Application.GetRealHeight(667 - 74 - 49 + 30),
                 BackgroundColor = CSS_Color.MainBackgroundColor,
                 IsShowPoint = false
             };
@@ -716,7 +716,7 @@
                         #region 鐢靛櫒
 
                         functionCount = FunctionList.List.GetElectricals().Count;
-                        functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+                        functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.spk!=SPK.ElectricalTvHisense&&obj.trait_on_off.curValue.ToString() == "on").Count;
 #if DEBUG
                         functionCount = 1;
 #endif
@@ -835,7 +835,7 @@
                     IsMoreLines = true,
                 };
                 functionView.AddChidren(btnName); 
-                //鍘绘帀鍔熻兘澶栭潰寮�鍏充釜鏁�;
+                //涓嶉渶瑕佹樉绀鸿澶囧紑鐘舵�佹暟閲�;
                 if (item != ShowFunction.Aks
                     && item != ShowFunction.VideoDoorLock
                     && item != ShowFunction.Environmental

--
Gitblit v1.8.0