From 78df3d9006b4fa60c312cbda519096c167c1cf21 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 10:46:43 +0800
Subject: [PATCH] 20201210

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

diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 4608ca6..fdcd241 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -263,83 +263,83 @@
                 roomView.AddChidren(btnFloorAndRoomName);
 
                 #region 鐜鏁版嵁
-                var environmentalView = new FrameLayout()
-                                {
-                                    Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
-                                    Height = Application.GetRealHeight(32),
-                                    Tag = "EnvironmentalView",
-                                };
-                                roomView.AddChidren(environmentalView);
+                //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);
+                //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);
+                //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);
+                //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);
+                //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);
+                //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);
+                //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 btnAllClose = new Button()
                 {
@@ -362,12 +362,14 @@
 
                 roomViewbgColor.MouseUpEventHandler += (sender, e) =>
                 {
-                    Action ReloadRoomName = () => {
+                    Action ReloadRoomName = () =>
+                    {
                         btnFloorAndRoomName.Text = room.floorName + room.roomName;
                     };
 
                     //鎴块棿鍒犻櫎浜嬩欢
-                    Action deleteAction = () => {
+                    Action deleteAction = () =>
+                    {
                         roomView.RemoveFromParent();
                     };
 

--
Gitblit v1.8.0