From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25

---
 ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs |   39 +++++++++++++++++++++++++++++----------
 1 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index 7ed1c76..ebede4c 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -16,6 +16,12 @@
         /// </summary>
         public Action action;
 
+        FrameLayout roomNameBackground;
+
+        FrameLayout roomTemperatureBackground;
+
+        Button roomListBtn;
+
         public override void RemoveFromParent()
         {
             HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
@@ -58,7 +64,7 @@
             };
             roomBackView.AddChidren(roomImg);
 
-            var roomNameBackground = new FrameLayout
+            roomNameBackground = new FrameLayout
             {
                 X = Application.GetRealWidth(29),
                 Y = Application.GetRealHeight(282),
@@ -79,11 +85,11 @@
             roomNameBackground.AddChidren(roomName);
 
 
-            var roomTemperatureBackground = new FrameLayout
+            roomTemperatureBackground = new FrameLayout
             {
                 X = Application.GetRealWidth(29),
                 Y = Application.GetRealHeight(374),
-                Width = Application.GetRealWidth(340),
+                Width = Application.GetRealWidth(400),
                 Height = Application.GetRealHeight(80),
                 BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor2
             };
@@ -103,16 +109,16 @@
             var temperatureText = new Button
             {
                 X = Application.GetRealWidth(69),
-                Width = Application.GetRealWidth(86),
+                Width = Application.GetRealWidth(120),
                 Height = Application.GetRealHeight(58),
                 Gravity = Gravity.CenterVertical,
-                Text = "26鈩�"
+                Text = $"{room.Temperatrue}鈩�"
             };
             roomTemperatureBackground.AddChidren(temperatureText);
 
             var humidityIcon = new Button
             {
-                X = Application.GetRealWidth(179),
+                X = Application.GetRealWidth(200),
                 Width = Application.GetMinRealAverage(58),
                 Height = Application.GetMinRealAverage(58),
                 Gravity = Gravity.CenterVertical,
@@ -122,11 +128,11 @@
 
             var humidityText = new Button
             {
-                X = Application.GetRealWidth(236),
-                Width = Application.GetRealWidth(86),
+                X = Application.GetRealWidth(260),
+                Width = Application.GetRealWidth(120),
                 Height = Application.GetRealHeight(58),
                 Gravity = Gravity.CenterVertical,
-                Text = "13%"
+                Text = $"{room.Humidity}%"
             };
             roomTemperatureBackground.AddChidren(humidityText);
 
@@ -152,6 +158,7 @@
                             {
                                 //0鈩�
                                 temperatureText.Text = "0.0鈩�";
+                                room.Temperatrue = 0;
                             }
                             else if (data.AttriButeData > 32767)
                             {
@@ -160,6 +167,7 @@
                                 //灏忔暟鐐归渶瑕佷竴浣�
                                 strValue = strValue.Substring(0, strValue.Length - 1);
                                 temperatureText.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
+                                room.Temperatrue = int.Parse(strValue) * 0.1;
                             }
                             else
                             {
@@ -167,6 +175,7 @@
                                 string strValue = data.AttriButeData.ToString();
                                 strValue = strValue.Substring(0, strValue.Length - 1);
                                 temperatureText.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
+                                room.Temperatrue = int.Parse(strValue) * 0.1;
                             }
                         }
                     }
@@ -199,6 +208,7 @@
                             {
                                 //0
                                 humidityText.Text = "0.0%";
+                                room.Humidity = 0;
                             }
                             else
                             {
@@ -206,6 +216,7 @@
                                 string strValue = data.AttriButeData.ToString();
                                 strValue = strValue.Substring(0, strValue.Length - 1);
                                 humidityText.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
+                                room.Humidity = int.Parse(strValue) * 0.1;
                             }
                         }
                     }
@@ -218,7 +229,8 @@
                 }
             }
 
-            var roomListBtn = new Button()
+
+            roomListBtn = new Button()
             {
                 X = roomBackView.Width - Application.GetRealWidth(100 + 20),
                 Y = Application.GetRealHeight(20),
@@ -240,7 +252,14 @@
                     action?.Invoke();
                 };
             };
+        }
 
+        /// <summary>
+        /// HideName
+        /// </summary>
+        public void HideName(bool statu)
+        {
+            roomNameBackground.Visible = roomTemperatureBackground.Visible = roomListBtn.Visible = !statu;
         }
     }
 }

--
Gitblit v1.8.0