From eb424d24e39bab4a245725f35deab3f234ea0f13 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 13 十二月 2019 10:48:50 +0800
Subject: [PATCH] 2019.12.13
---
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index f6b5651..d3163c0 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);
}
@@ -464,7 +466,8 @@
TextAlignment = TextAlignment.CenterLeft,
Text = Config.Instance.Home.Name ?? Language.StringByID(R.MyInternationalizationString.TheResidenceNameNull),
TextSize = 24,
- TextColor = ZigbeeColor.Current.GXCTextBlackColor
+ TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ IsBold=true
};
if (Config.Instance.Home.IsOthreShare)
{
@@ -643,10 +646,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;
@@ -684,7 +687,8 @@
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
TextID = R.MyInternationalizationString.Scence,
IsSelected = true,
- TextSize=16
+ TextSize=16,
+ IsBold=true
};
functionSceneView.AddChidren(sceneBtn);
@@ -719,7 +723,9 @@
sceneBtn.IsSelected = false;
functionBtn.IsSelected = true;
sceneBtn.TextSize = 14;
+ sceneBtn.IsBold = false;
functionBtn.TextSize = 16;
+ functionBtn.IsBold = true;
RefreshBodyView();
};
//閫夋嫨鍦烘櫙鍒嗘爮
@@ -728,7 +734,9 @@
functionBtn.IsSelected = false;
sceneBtn.IsSelected = true;
sceneBtn.TextSize = 16;
+ sceneBtn.IsBold = true;
functionBtn.TextSize = 14;
+ functionBtn.IsBold = false;
RefreshBodyView();
};
--
Gitblit v1.8.0