From ac334861efbf06933e95c62ced0484410f34bece Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 29 十一月 2019 18:00:32 +0800
Subject: [PATCH] 2019.11.29

---
 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 03ff3a0..050c746 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -631,16 +631,20 @@
 
             if (CanBindGateway() == false)
             {
-                var roomPageView = new PageLayout()
+
+                var roomPageView = new HorizontalPages()
                 {
                     Y = Application.GetRealHeight(302),
-                    Width = Application.GetRealWidth(CommonPage.AppRealWidth - CommonPage.XLeft * 2),
-                    Height = Application.GetMinRealAverage(roomPageView_Height),
-                    Radius = CommonPage.BigFormRadius,
-                    Gravity = Gravity.CenterHorizontal,
-                    IsShowPoint = false
+                    Width = Application.GetRealWidth(CommonPage.AppRealWidth),
+                    Height = Application.GetRealHeight(478),
+                    //Radius = CommonPage.BigFormRadius,
+                    //Gravity = Gravity.CenterHorizontal,
                 };
                 AddChidren(roomPageView);
+                //涓庡睆骞曡竟妗嗙殑杈硅窛
+                roomPageView.RowPadding = Application.GetRealWidth(181);
+                //涓や釜page涔嬮棿鐨勯棿璺�
+                roomPageView.PagePadding = Application.GetRealWidth(69);
 
                 //褰撳墠鎴块棿
                 //Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
@@ -650,9 +654,13 @@
                 {
                     var roomBackView = new FrameLayout()
                     {
-                        BackgroundImagePath = room.BackgroundImage
+                        BackgroundImagePath = room.BackgroundImage,
+                        Width = Application.GetRealWidth(717),
+                        Height=Application.GetRealHeight(478),
+                        Radius=(uint)Application.GetRealHeight(10)
                     };
                     roomPageView.AddChidren(roomBackView);
+
                     if (room.BackgroundImageType != 0)
                     {
                         roomBackView.BackgroundImagePath = System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage);
@@ -670,13 +678,13 @@
                         TextSize = 18,
                     };
                     roomBackView.AddChidren(roomName);
-                    var roomListBtn = new Device.CommonForm.SelectedStatuButton()
+                    var roomListBtn = new Button()
                     {
-                        X = roomPageView.Width - Application.GetRealWidth(100 + 20),
+                        X = roomBackView.Width - Application.GetRealWidth(100 + 20),
                         Y = Application.GetRealHeight(20),
                         Width = Application.GetMinRealAverage(100),
                         Height = Application.GetMinRealAverage(100),
-                        UnSelectedImagePath = "Item/List.png",
+                        UnSelectedImagePath = "Room/List.png",
                     };
                     roomBackView.AddChidren(roomListBtn);
 

--
Gitblit v1.8.0