From f60b17fa18701c2cee017a5117e96510f54b44cf Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 02 十二月 2024 16:05:44 +0800
Subject: [PATCH] 更新功能
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 126 +++++++----------------------------------
1 files changed, 23 insertions(+), 103 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 1e317aa..8fc33ea 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -362,106 +362,34 @@
//2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
- var btnFloorAndRoomName = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(12 - 2),
- Width = Application.GetRealWidth(266),
- Height = Application.GetRealHeight(22 + 2 + 2),
- Text = room.floorName + room.roomName,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.MainBackgroundColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- };
- roomView.AddChidren(btnFloorAndRoomName);
-
- #region 鐜鏁版嵁
- //var environmentalView = new FrameLayout()
- //{
- // Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
- // Height = Application.GetRealHeight(32),
- // Tag = "EnvironmentalView",
- //};
- //roomView.AddChidren(environmentalView);
-
- //Button btnTempIcon = new Button()
- //{
- // X = Application.GetRealWidth(12),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
- //};
- //environmentalView.AddChidren(btnTempIcon);
-
- //var btnTempValues = new Button()
- //{
- // X = btnTempIcon.Right + Application.GetRealWidth(4),
- // Width = Application.GetRealWidth(30),
- // Gravity = Gravity.CenterVertical,
- // TextColor = CSS_Color.MainBackgroundColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // Text = "--掳",
- // TextAlignment = TextAlignment.CenterLeft,
- // Tag = "TempValues"
- //};
- //environmentalView.AddChidren(btnTempValues);
-
- //Button btnHumidityIcon = new Button()
- //{
- // X = btnTempValues.Right + Application.GetRealWidth(2),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
- //};
- //environmentalView.AddChidren(btnHumidityIcon);
-
- //var btnHumidityValues = new Button()
- //{
- // X = btnHumidityIcon.Right + Application.GetRealWidth(4),
- // Width = Application.GetRealWidth(30),
- // Gravity = Gravity.CenterVertical,
- // TextColor = CSS_Color.MainBackgroundColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // Text = "--%",
- // TextAlignment = TextAlignment.CenterLeft,
- // Tag = "HumidityValues"
- //};
- //environmentalView.AddChidren(btnHumidityValues);
-
- //Button btnPm25Icon = new Button()
- //{
- // X = btnHumidityValues.Right + Application.GetRealWidth(2),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
- //};
- //environmentalView.AddChidren(btnPm25Icon);
-
- //var btnPm25Values = new Button()
- //{
- // X = btnPm25Icon.Right + Application.GetRealWidth(4),
- // Width = Application.GetRealWidth(30),
- // Gravity = Gravity.CenterVertical,
- // TextColor = CSS_Color.MainBackgroundColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // Text = "--",
- // TextAlignment = TextAlignment.CenterLeft,
- // Tag = "Pm25Values"
- //};
- //environmentalView.AddChidren(btnPm25Values);
- //roomView.AddChidren(environmentalView);
- #endregion
-
var roomViewbgColor = new Button()
{
Height = Application.GetRealWidth(192),
Radius = (uint)Application.GetRealWidth(12),
- BackgroundColor = 0x19333333,
};
roomView.AddChidren(roomViewbgColor);
+
+ var nameView = new FrameLayout()
+ {
+ Height = Application.GetRealWidth(50),
+ BackgroundColor = 0x33000000,
+ Radius = (uint)Application.GetRealWidth(12),
+ };
+ roomView.AddChidren(nameView);
+
+ var btnFloorAndRoomName = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealWidth(12 - 2),
+ Width = Application.GetRealWidth(266),
+ Height = Application.GetRealWidth(22 + 2 + 2),
+ Text = room.floorName + room.roomName,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.SubheadingFontSize + OnAppConfig.Instance.FontAmplify,
+ IsBold = true,
+ };
+ nameView.AddChidren(btnFloorAndRoomName);
var btnAllClose = new Button()
{
@@ -475,14 +403,6 @@
};
roomView.AddChidren(btnAllClose);
LoadEvent_CloseAllFunction(btnAllClose, room);
-
- //var btn = new Button()
- //{
- // Y = Application.GetRealWidth(192),
- // Height = Application.GetRealWidth(20),
- // BackgroundColor = CSS_Color.MainBackgroundColor,
- //};
- //roomView.AddChidren(btn);
roomViewbgColor.MouseUpEventHandler += (sender, e) =>
{
@@ -754,7 +674,7 @@
}
else
{
- functionCount = 1;
+ functionCount = FunctionList.List.GetEzMonitorList().Count;
}
}
break;
--
Gitblit v1.8.0