From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 53e5ead..eca6471 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -255,7 +255,7 @@
Height = Application.GetRealHeight(1238),
Width = Application.GetRealWidth(965),
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
- Radius = 6,
+ Radius = (uint)Application.GetRealHeight(17),
};
this.midFrameLayout.AddChidren(midTopFrameLayout);
@@ -266,6 +266,10 @@
btnDoorLockTitle.IsBold = true;
btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
btnDoorLockTitle.Width = btnDoorLockTitle.GetRealWidthByText();
+ if (btnDoorLockTitle.Width > 664)
+ {
+ btnDoorLockTitle.Width = 664;
+ }
btnDoorLockTitle.TextAlignment = TextAlignment.Center;
btnDoorLockTitle.Gravity = Gravity.CenterHorizontal;
midTopFrameLayout.AddChidren(btnDoorLockTitle);
@@ -380,7 +384,7 @@
progressFrameLayoutMatch = new FrameLayout()
{
Width = Application.GetRealHeight(84),//639-35
- Height = Application.GetRealHeight(446),
+ Height = Application.GetRealHeight(446 + 30),
X = Application.GetMinReal(51),
BackgroundColor = ZigbeeColor.Current.XMWhite,
};
@@ -388,7 +392,9 @@
var progressFrameLayout = new FrameLayout()
{
- Width = Application.GetRealHeight(17),//639-35
+ Width = Application.GetRealHeight(15),//639-35
+ Height = Application.GetRealHeight(440),
+ Radius = (uint)Application.GetRealHeight(17),
Gravity = Gravity.CenterHorizontal,
BackgroundColor = ZigbeeColor.Current.XMVerticalSeekBar,
};
@@ -492,7 +498,7 @@
Height = Application.GetRealHeight(138),
Y = Application.GetRealHeight(1100),
BackgroundColor = ZigbeeColor.Current.XMBlack,
- Radius = 6,
+ Radius = (uint)Application.GetRealHeight(17),
};
midTopFrameLayout.AddChidren(btnCurrentFrameLayout);
#endregion
--
Gitblit v1.8.0