From 0e4ad9a4de5b95f58daf1a6c5072c6a57cf223f9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 30 十二月 2019 10:02:10 +0800
Subject: [PATCH] 2019.12.30
---
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 811d6e9..0e49440 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -482,7 +482,7 @@
if(UserCenterResourse.Option.SafetyShortcut)
{
var safetyBtn = new SafetyShortcutControl();
- safetyBtn.X = Application.GetRealWidth(855);
+ safetyBtn.X = Application.GetRealWidth(860);
safetyBtn.Gravity = Gravity.CenterVertical;
topFrameLayout.AddChidren(safetyBtn);
}
@@ -503,7 +503,7 @@
TextAlignment = TextAlignment.CenterLeft,
Text = Config.Instance.Home.Name ?? Language.StringByID(R.MyInternationalizationString.TheResidenceNameNull),
TextSize = 24,
- TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor,
IsBold=true
};
if (Config.Instance.Home.IsOthreShare)
@@ -696,6 +696,7 @@
var roomView = new Device.CommonForm.RoomView(0, 0);
roomPageView.AddChidren(roomView);
roomView.Init(room);
+ roomView.HideName(true);
roomView.action += () =>
{
Show();
@@ -703,6 +704,11 @@
}
var curIndex = rList.FindIndex((obj) => obj.Id == Room.CurrentRoom.Id);
roomPageView.PageIndex = curIndex;
+ if (roomPageView.GetChildren(roomPageView.PageIndex) != null)
+ {
+ (roomPageView.GetChildren(roomPageView.PageIndex) as RoomView).HideName(false);
+
+ }
var functionSceneView = new FrameLayout()
{
@@ -782,9 +788,22 @@
roomPageView.PageChange += (sender, e) =>
{
+ if(roomPageView.GetChildren(roomPageView.PageIndex - 1) !=null)
+ {
+ (roomPageView.GetChildren(roomPageView.PageIndex - 1) as RoomView).HideName(true);
+ }
+ if (roomPageView.GetChildren(roomPageView.PageIndex + 1) != null)
+ {
+ (roomPageView.GetChildren(roomPageView.PageIndex + 1) as RoomView).HideName(true);
+ }
+ if (roomPageView.GetChildren(roomPageView.PageIndex) != null)
+ {
+ (roomPageView.GetChildren(roomPageView.PageIndex) as RoomView).HideName(false);
+ }
//鍒囨崲褰撳墠鎴块棿
Room.CurrentRoom = rList[roomPageView.PageIndex];
RefreshBodyView();
+
};
}
else
--
Gitblit v1.8.0