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 | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index adce2b8..d3163c0 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -426,6 +426,10 @@
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Item/Floor.png"
};
+ if (Config.Instance.Home.FloorDics.Count > 0)
+ {
+ topFrameLayout.AddChidren(floor);
+ }
floorBtn = new Button
{
@@ -437,13 +441,10 @@
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);
topFrameLayout.AddChidren(floorBtn);
}
-
var messageBtn = new Button()
{
@@ -465,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)
{
@@ -644,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;
@@ -685,7 +687,8 @@
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
TextID = R.MyInternationalizationString.Scence,
IsSelected = true,
- TextSize=16
+ TextSize=16,
+ IsBold=true
};
functionSceneView.AddChidren(sceneBtn);
@@ -720,7 +723,9 @@
sceneBtn.IsSelected = false;
functionBtn.IsSelected = true;
sceneBtn.TextSize = 14;
+ sceneBtn.IsBold = false;
functionBtn.TextSize = 16;
+ functionBtn.IsBold = true;
RefreshBodyView();
};
//閫夋嫨鍦烘櫙鍒嗘爮
@@ -729,7 +734,9 @@
functionBtn.IsSelected = false;
sceneBtn.IsSelected = true;
sceneBtn.TextSize = 16;
+ sceneBtn.IsBold = true;
functionBtn.TextSize = 14;
+ functionBtn.IsBold = false;
RefreshBodyView();
};
@@ -911,7 +918,7 @@
{
Y = noFunction.Bottom,
Height = Application.GetRealHeight(200),
- Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}", "\r\n"),
+ Text = Language.StringByID(R.MyInternationalizationString.NoFunction_Tip).Replace("{\\r\\n}", "\r\n"),
TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
IsMoreLines = true
};
@@ -1631,7 +1638,7 @@
{
Y = noScene.Bottom,
Height = Application.GetRealHeight(200),
- Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}", "\r\n"),
+ Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n"),
TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
IsMoreLines = true
};
--
Gitblit v1.8.0