From c0c734d7a84cf7105401878ffc4b64cbb67621d1 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 01 十一月 2024 15:02:24 +0800
Subject: [PATCH] 更新极光Sdk531
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 107 +++++------------------------------------------------
1 files changed, 10 insertions(+), 97 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 4cb5e50..9df41cd 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -362,6 +362,14 @@
//2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
+ var roomViewbgColor = new Button()
+ {
+ Height = Application.GetRealWidth(192),
+ Radius = (uint)Application.GetRealWidth(12),
+ BackgroundColor = 0xFFFFFFFF,
+ };
+ roomView.AddChidren(roomViewbgColor);
+
var btnFloorAndRoomName = new Button()
{
X = Application.GetRealWidth(16),
@@ -371,97 +379,10 @@
Text = room.floorName + room.roomName,
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainBackgroundColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
+ TextSize = CSS_FontSize.HeadlineFontSize,
+ IsBold = true,
};
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 btnAllClose = new Button()
{
@@ -475,14 +396,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) =>
{
--
Gitblit v1.8.0