From d12e7730bb88d57763a6caaeacb0248a65bf3309 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 03 十二月 2019 13:10:32 +0800
Subject: [PATCH] 2019.12.3
---
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 79 ++++++++++++---------------------------
1 files changed, 25 insertions(+), 54 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 03ff3a0..1ac5300 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -503,7 +503,7 @@
Y = Application.GetRealHeight(248),
Width = Application.GetMinRealAverage(449),
Height = Application.GetMinRealAverage(478),
- UnSelectedImagePath = "Item/SelectHouse"
+ UnSelectedImagePath = "Item/SelectHouse.png"
};
closeBGview.AddChidren(bg);
@@ -511,8 +511,8 @@
{
X = Application.GetRealWidth(35),
Y = Application.GetRealHeight(271),
- Height = Application.GetRealHeight(449),
- Width = Application.GetRealWidth(440),
+ Height = Application.GetMinRealAverage(449),
+ Width = Application.GetMinRealAverage(440),
Radius = CommonPage.BigFormRadius,
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
@@ -624,23 +624,25 @@
//娑堟伅
messageBtn.MouseUpEventHandler += (send, e) =>
{
-
+
};
#endregion
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),
};
AddChidren(roomPageView);
+ //涓庡睆骞曡竟妗嗙殑杈硅窛
+ roomPageView.RowPadding = Application.GetRealWidth(181);
+ //涓や釜page涔嬮棿鐨勯棿璺�
+ roomPageView.PagePadding = Application.GetRealWidth(69);
//褰撳墠鎴块棿
//Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
@@ -648,49 +650,12 @@
Room.CurrentRoom = rList[0];
foreach (var room in rList)
{
- var roomBackView = new FrameLayout()
+ var roomView = new Device.CommonForm.RoomView(0, 0);
+ roomPageView.AddChidren(roomView);
+ roomView.Init(room);
+ roomView.action += () =>
{
- BackgroundImagePath = room.BackgroundImage
- };
- roomPageView.AddChidren(roomBackView);
- if (room.BackgroundImageType != 0)
- {
- roomBackView.BackgroundImagePath = System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage);
- }
-
- var roomName = new Button()
- {
- X = Application.GetRealWidth(20),
- Y = Application.GetRealHeight(20),
- Width = Application.GetRealWidth(500),
- Height = Application.GetRealHeight(80),
- Text = room.Name,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
- TextSize = 18,
- };
- roomBackView.AddChidren(roomName);
- var roomListBtn = new Device.CommonForm.SelectedStatuButton()
- {
- X = roomPageView.Width - Application.GetRealWidth(100 + 20),
- Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(100),
- Height = Application.GetMinRealAverage(100),
- UnSelectedImagePath = "Item/List.png",
- };
- roomBackView.AddChidren(roomListBtn);
-
- roomListBtn.MouseUpEventHandler += (send, e) =>
- {
- CommonPage.Instance.IsDrawerLockMode = true;
- var editRoom = new Device.Room.EditRoom();
- HomePage.Instance.AddChidren(editRoom);
- HomePage.Instance.PageIndex += 1;
- editRoom.Show(room);
- editRoom.action += () =>
- {
- Show();
- };
+ Show();
};
}
@@ -714,7 +679,8 @@
TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
TextID = R.MyInternationalizationString.Scence,
- IsSelected = false
+ IsSelected = true,
+ TextSize=16
};
functionSceneView.AddChidren(sceneBtn);
@@ -728,7 +694,8 @@
TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
TextID = R.MyInternationalizationString.Function,
- IsSelected = false
+ IsSelected = false,
+ TextSize=14
};
functionSceneView.AddChidren(functionBtn);
@@ -747,6 +714,8 @@
{
sceneBtn.IsSelected = false;
functionBtn.IsSelected = true;
+ sceneBtn.TextSize = 14;
+ functionBtn.TextSize = 16;
RefreshBodyView();
};
//閫夋嫨鍦烘櫙鍒嗘爮
@@ -754,6 +723,8 @@
{
functionBtn.IsSelected = false;
sceneBtn.IsSelected = true;
+ sceneBtn.TextSize = 16;
+ functionBtn.TextSize = 14;
RefreshBodyView();
};
--
Gitblit v1.8.0