From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
index d8c9401..3719595 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
@@ -66,6 +66,7 @@
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
Gravity = Gravity.CenterHorizontal,
TextSize = 20,
+ IsBold =true,
};
this.midFrameLayout.AddChidren(btnPicTip);
@@ -131,7 +132,7 @@
var btnLine = new FrameLayout()
{
Width = Application.GetRealWidth(965),
- Height = Application.GetRealHeight(5),
+ Height = 1,
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(81 + 127),
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
@@ -152,7 +153,7 @@
Width = Application.GetRealWidth(222),
Height = Application.GetRealHeight(58),
Y = Application.GetRealHeight(35),
- Text = Language.StringByID(R.MyInternationalizationString.MatchPerson),
+ Text = Language.StringByID(R.MyInternationalizationString.MatchPerson) + ":",
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextAlignment = TextAlignment.CenterLeft,
TextSize = 14,
@@ -171,6 +172,16 @@
};
personRemarkRemarkFrameLayout.AddChidren(btnMatchPersonContent);
+ var btnLine1 = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(965),
+ Height = 1,
+ X = Application.GetRealWidth(58),
+ Y = Application.GetRealHeight(81 + 127 + 12 + 127),
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ };
+ bottomFrameLayout.AddChidren(btnLine1);
+
var completeBtn = new Button
{
X = Application.GetRealWidth(86),
@@ -183,6 +194,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
Radius = (uint)Application.GetRealHeight(127 / 2),
TextSize = 16,
+ IsBold =true,
};
bottomFrameLayout.AddChidren(completeBtn);
--
Gitblit v1.8.0