From cc3be7de79f8056909253aa3c6742e58543f6a71 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 13 十二月 2019 10:32:44 +0800
Subject: [PATCH] 2019.12.13

---
 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index f6b5651..ab2ac7b 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -426,9 +426,14 @@
                 Gravity = Gravity.CenterVertical,
                 UnSelectedImagePath = "Item/Floor.png"
             };
+            if (Config.Instance.Home.FloorDics.Count > 0)
+            {
+                topFrameLayout.AddChidren(floor);
+            }
 
             floorBtn = new Button
             {
+                X = floor.Right,
                 Width = Application.GetRealWidth(500),
                 Height = Application.GetRealHeight(100),
                 Gravity = Gravity.CenterVertical,
@@ -436,11 +441,8 @@
                 TextColor = ZigbeeColor.Current.GXCTextColor,
                 Text = Config.Instance.Home.GetCurrentFloorName
             };
-
-            if(Config.Instance.Home.FloorDics.Count>0)
+            if (Config.Instance.Home.FloorDics.Count > 0)
             {
-                topFrameLayout.AddChidren(floor);
-                floorBtn.X = floor.Right;
                 topFrameLayout.AddChidren(floorBtn);
             }
 
@@ -643,10 +645,10 @@
                     Height = Application.GetRealHeight(478),
                 };
                 AddChidren(roomPageView);
-                //涓庡睆骞曡竟妗嗙殑杈硅窛
-                roomPageView.RowPadding = Application.GetRealWidth(181);
+                //绐佸嚭杈硅窛
+                roomPageView.TCBJ = Application.GetRealWidth(112);
                 //涓や釜page涔嬮棿鐨勯棿璺�
-                roomPageView.PagePadding = Application.GetRealWidth(69);
+                roomPageView.JMBJ = Application.GetRealWidth(69);
 
                 //褰撳墠鎴块棿
                 //Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;

--
Gitblit v1.8.0