From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
index 361bc59..68da839 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
@@ -149,8 +149,8 @@
var btnRight = new Button()
{
- Height = Application.GetRealHeight(60),
- Width = Application.GetRealWidth(60),
+ Height = Application.GetMinRealAverage(60),
+ Width = Application.GetMinRealAverage(60),
X = Application.GetRealWidth(72),
Y = Application.GetRealHeight(32),
UnSelectedImagePath = "DoorLock/RightIcon.png",
@@ -176,8 +176,8 @@
btnText.Text = Language.StringByID(R.MyInternationalizationString.FrozenUser);
btnRight.X = Application.GetRealWidth(50);
btnRight.Y = Application.GetRealHeight(32);
- btnRight.Height = Application.GetRealHeight(63);
- btnRight.Width = Application.GetRealWidth(104);
+ btnRight.Height = Application.GetMinRealAverage(63);
+ btnRight.Width = Application.GetMinRealAverage(104);
btnRight.UnSelectedImagePath = "DoorLock/Switch.png";
btnRight.SelectedImagePath = "DoorLock/SwitchOn.png";
var result = doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark];
@@ -197,8 +197,8 @@
btnText.Text = Language.StringByID(R.MyInternationalizationString.TempUnlockPermission);
btnRight.X = Application.GetRealWidth(50);
btnRight.Y = Application.GetRealHeight(32);
- btnRight.Height = Application.GetRealHeight(63);
- btnRight.Width = Application.GetRealWidth(104);
+ btnRight.Height = Application.GetMinRealAverage(63);
+ btnRight.Width = Application.GetMinRealAverage(104);
btnRight.UnSelectedImagePath = "DoorLock/Switch.png";
btnRight.SelectedImagePath = "DoorLock/SwitchOn.png";
line2.Visible = false;
--
Gitblit v1.8.0