From f500e14c0a994487070380c50c85e0929cbc8e63 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 05 一月 2021 10:48:04 +0800
Subject: [PATCH] 2021-01-05 1.更新
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index ba2bf5d..2c93b08 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -24,11 +24,10 @@
public static FrameLayout UserPageView = new FrameLayout ();
- //public static Button LinkStatusTip = new Button () {
- // Height = Application.GetRealHeight (36),
- // Width = Application.GetRealWidth (Application.DesignWidth),
- // BackgroundColor = SkinStyle.Current.LinkStatusTipColor
- //};
+ public static Button LinkStatusTip = new Button () {
+ Height = Application.GetRealHeight (Convert.ToInt32 (36 * MainPage.PixelScale)),
+ BackgroundColor = SkinStyle.Current.MainColor
+ };
public static PageLayout FavoritePageView = new PageLayout () {
IsShowPoint = false,
@@ -89,7 +88,7 @@
public static FrameLayout UserMenuItem = new FrameLayout () {
Y = Application.GetRealHeight (Application.DesignHeight - userMenuItemHeight),
- Height = Application.GetRealHeight (userMenuItemHeight+5),
+ Height = Application.GetMinRealAverage (userMenuItemHeight+5),
BackgroundColor = SkinStyle.Current.MainColor
};
@@ -102,14 +101,15 @@
public static Button btnLinkStatus = new Button () {
Y = Application.GetRealHeight (10),
- Width = Application.GetRealWidth (131),
- Height = Application.GetRealHeight (80),
+ Width = Application.GetMinRealAverage (131),
+ Height = Application.GetMinRealAverage (80),
UnSelectedImagePath = MainPage.WiFiStatus,
};
#region ---Bottom Button----
public static Button btnFavorite = new Button () {
Width = Application.GetRealWidth (160),
+ Height = MainPage.GetDesignHeight (90),
TextID = R.MyInternationalizationString.Favorite,
TextColor = SkinStyle.Current.TextColor1,
SelectedTextColor = SkinStyle.Current.SelectedColor,
@@ -125,6 +125,7 @@
public static Button btnDevice = new Button () {
X = Application.GetRealWidth (160),
Width = Application.GetRealWidth (160),
+ Height = MainPage.GetDesignHeight (90),
TextID = R.MyInternationalizationString.Category,
SelectedTextColor = SkinStyle.Current.SelectedColor,
TextColor = SkinStyle.Current.TextColor1,
@@ -138,6 +139,7 @@
public static Button btnRoom = new Button () {
X = Application.GetRealWidth (160 * 2),
Width = Application.GetRealWidth (160),
+ Height = MainPage.GetDesignHeight (90),
TextID = R.MyInternationalizationString.Rooms,
SelectedTextColor = SkinStyle.Current.SelectedColor,
TextColor = SkinStyle.Current.TextColor1,
@@ -151,6 +153,7 @@
public static Button btnSetting = new Button () {
X = Application.GetRealWidth (160 * 3),
Width = Application.GetRealWidth (160),
+ Height = MainPage.GetDesignHeight (90),
TextID = R.MyInternationalizationString.Setting,
SelectedTextColor = SkinStyle.Current.SelectedColor,
TextColor = SkinStyle.Current.TextColor1,
@@ -415,7 +418,7 @@
//IO.FileUtils.SaveEquipmentMessage (ud3, "3");
#endif
UserHomePage.FrameLayoutMain.AddChidren (UserPageView);
- //UserHomePage.FrameLayoutMain.AddChidren (LinkStatusTip);
+ UserHomePage.FrameLayoutMain.AddChidren (LinkStatusTip);
UserPageView.AddChidren (FavoritePageView);
FavoritePageView.AddChidren (FavoriteBodyView);
--
Gitblit v1.8.0