From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 66 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index eca6471..67009a0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -221,8 +221,8 @@
btnFuncSet = new Button
{
X = Application.GetRealWidth(103),
- Height = Application.GetMinReal(69),
- Width = Application.GetMinReal(69),
+ Height = Application.GetMinRealAverage(69),
+ Width = Application.GetMinRealAverage(69),
UnSelectedImagePath = "DoorLock/SettingIcon.png",
};
btnFuncSetFrameLayout.AddChidren(btnFuncSet);
@@ -266,10 +266,8 @@
btnDoorLockTitle.IsBold = true;
btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
btnDoorLockTitle.Width = btnDoorLockTitle.GetRealWidthByText();
- if (btnDoorLockTitle.Width > 664)
- {
- btnDoorLockTitle.Width = 664;
- }
+ btnDoorLockTitle.Width = Application.GetRealWidth(500);
+
btnDoorLockTitle.TextAlignment = TextAlignment.Center;
btnDoorLockTitle.Gravity = Gravity.CenterHorizontal;
midTopFrameLayout.AddChidren(btnDoorLockTitle);
@@ -284,8 +282,8 @@
midTopFrameLayout.AddChidren(btnRecordFrameLayout);
btnRecord = new Button()
{
- Width = Application.GetMinReal(69),
- Height = Application.GetMinReal(69),
+ Width = Application.GetMinRealAverage(69),
+ Height = Application.GetMinRealAverage(69),
X = Application.GetRealWidth(46),
Y = Application.GetRealHeight(46),
UnSelectedImagePath = "DoorLock/RecordIcon.png",
@@ -302,8 +300,8 @@
midTopFrameLayout.AddChidren(btnCollectFrameLayout);
btnCollect = new Button()
{
- Width = Application.GetMinReal(69),
- Height = Application.GetMinReal(69),
+ Width = Application.GetMinRealAverage(69),
+ Height = Application.GetMinRealAverage(69),
X = Application.GetRealWidth(15),
Y = Application.GetRealHeight(46),
UnSelectedImagePath = "Item/Collection.png",
@@ -344,8 +342,8 @@
//闂ㄩ攣寮�/鍏冲浘鐗�
btnDoorLockPic = new Button()
{
- Width = Application.GetMinReal(383),
- Height = Application.GetMinReal(343),
+ Width = Application.GetMinRealAverage(383),
+ Height = Application.GetMinRealAverage(343),
X = Application.GetRealWidth(161),
Y = Application.GetRealHeight(415),
UnSelectedImagePath = "DoorLock/DoorLockPicClose.png",
@@ -402,8 +400,8 @@
progressButton = new Button()
{
- Width = Application.GetMinReal(84),//639-35
- Height = Application.GetMinReal(93),
+ Width = Application.GetMinRealAverage(84),//639-35
+ Height = Application.GetMinRealAverage(93),
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(347),
UnSelectedImagePath = "DoorLock/UnLockButton.png",
@@ -412,8 +410,8 @@
btnDoorOpenPic = new Button()
{
- Width = Application.GetMinReal(81),
- Height = Application.GetMinReal(81),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
X = Application.GetRealWidth(164),
Y = Application.GetRealHeight(6),
UnSelectedImagePath = "DoorLock/DoorLockOpen.png",
@@ -422,8 +420,8 @@
btnDoorClosePic = new Button()
{
- Width = Application.GetMinReal(81),
- Height = Application.GetMinReal(81),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
X = Application.GetRealWidth(164),
Y = Application.GetRealHeight(117),
UnSelectedImagePath = "DoorLock/DoorLockClose.png",
@@ -434,8 +432,8 @@
//鐢甸噺
btnPower = new Button()
{
- Width = Application.GetMinReal(81),
- Height = Application.GetMinReal(81),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
X = Application.GetRealWidth(253),
Y = Application.GetRealHeight(994),
UnSelectedImagePath = "DoorLock/PowerOffline.png",
@@ -453,8 +451,8 @@
midTopFrameLayout.AddChidren(btnVolumeFrameLayout);
btnVolume = new Button()
{
- Width = Application.GetMinReal(81),
- Height = Application.GetMinReal(81),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
X = Application.GetRealWidth(40),
Y = Application.GetRealHeight(40),
UnSelectedImagePath = "DoorLock/VolumeIcon.png",
@@ -465,16 +463,16 @@
//甯稿紑
btnNormallyOpenFrameLayout = new FrameLayout()
{
- Width = Application.GetRealWidth(81 + 80),
- Height = Application.GetRealHeight(81 + 80),
+ Width = Application.GetMinRealAverage(81 + 80),
+ Height = Application.GetMinRealAverage(81 + 80),
X = Application.GetRealWidth(631 - 40),
Y = Application.GetRealHeight(994 - 40),
};
midTopFrameLayout.AddChidren(btnNormallyOpenFrameLayout);
btnNormallyOpen = new Button()
{
- Width = Application.GetMinReal(81),
- Height = Application.GetMinReal(81),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
X = Application.GetRealWidth(40),
Y = Application.GetRealHeight(40),
UnSelectedImagePath = "DoorLock/NormallyOpen.png",
@@ -506,8 +504,8 @@
#region 褰撳墠鎴块棿
var btnCurrentRoomPic = new Button()
{
- Width = Application.GetMinReal(81),
- Height = Application.GetMinReal(81),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(29),
UnSelectedImagePath = "DoorLock/RoomPic.png",
@@ -518,7 +516,7 @@
{
Width = Application.GetRealWidth(172),
Height = Application.GetRealHeight(49),
- X = Application.GetRealWidth(150),
+ X = btnCurrentRoomPic.Right + Application.GetRealWidth(12),
Y = Application.GetRealHeight(46),
Text = currentRoom.Name,
TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
@@ -526,7 +524,7 @@
TextAlignment = TextAlignment.CenterLeft,
};
btnCurrentFrameLayout.AddChidren(btnCurrentRoomName);
- #endregion
+ #endregion
}
#region 闊抽噺寮圭獥
@@ -552,8 +550,8 @@
var progressBackground = new FrameLayout()
{
- Width = Application.GetRealWidth(271),
- Height = Application.GetRealHeight(700),
+ Width = Application.GetMinRealAverage(271),
+ Height = Application.GetMinRealAverage(700),
X = Application.GetRealWidth(403),
Y = Application.GetRealHeight(582),
BackgroundImagePath = "DoorLock/ProgressBackground.png",
@@ -572,8 +570,8 @@
diyImageVerticalSeekBar = new DiyImageVerticalSeekBar()
{
- Width = Application.GetRealWidth(271),
- Height = Application.GetRealHeight(447 + 63),
+ Width = Application.GetMinRealAverage(271),
+ Height = Application.GetMinRealAverage(447 + 63),
Y = Application.GetRealHeight(155),
IsProgressTextShow = false,//鏄剧ず鐧惧垎姣�
ProgressBarColor = ZigbeeColor.Current.XMProgressBarColor,//閫変腑杩涘害鏉￠鑹�
--
Gitblit v1.8.0