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/Device/Logic/DelayTime.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 232bbd8..c2fab2e 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -38,30 +38,30 @@
var blancolorFl = new FrameLayout
{
- Width = Application.GetMinRealAverage(200),
- Height = Application.GetMinRealAverage(200),
+ Width = Application.GetRealWidth(200),
+ Height = Application.GetRealWidth(200),
Y = Application.GetRealHeight(130),
BackgroundColor = 0xFFFFFFFF,
- Radius = (uint)Application.GetMinRealAverage(100),
+ Radius = (uint)Application.GetRealWidth(100),
X = Application.GetRealWidth(440),
};
middle.AddChidren(blancolorFl);
var colorBtn = new Button
{
- Width = Application.GetMinRealAverage(200-24),
- Height =Application.GetMinRealAverage(200-24),
- X = Application.GetMinRealAverage(12),
- Y = Application.GetMinRealAverage(12),
+ Width = Application.GetRealWidth(200-24),
+ Height =Application.GetRealWidth(200-24),
+ X = Application.GetRealWidth(12),
+ Y = Application.GetRealWidth(12),
BackgroundColor = 0xFFFEF1ED,
Radius = (uint)Application.GetMinRealAverage(88),
};
blancolorFl.AddChidren(colorBtn);
var btnicon = new Button
{
- X = Application.GetMinRealAverage(58),
- Y = Application.GetMinRealAverage(58),
- Width = Application.GetMinRealAverage(84),
- Height = Application.GetMinRealAverage(84),
+ X = Application.GetRealWidth(58),
+ Y = Application.GetRealWidth(58),
+ Width = Application.GetRealWidth(84),
+ Height = Application.GetRealWidth(84),
UnSelectedImagePath = "ZigeeLogic/delay.png",
};
blancolorFl.AddChidren(btnicon);
--
Gitblit v1.8.0