From 1f5636d69332170ea3a41c76c9519f6ff6f0a8d9 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 15:40:30 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
index 07a7ced..cb975be 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
@@ -34,17 +34,28 @@
PhoneEmailFL = new FrameLayout()
{
Y = Application.GetRealHeight(y),
- Height = Application.GetRealHeight(height),
- Width = Application.GetRealWidth(width),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- Radius = (uint)Application.GetRealHeight(height / 2),
+ Width = Application.GetMinRealAverage(905),
+ Height = Application.GetMinRealAverage(170),
+ //BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor,
+ //Radius = (uint)Application.GetRealHeight(height / 2),
Gravity = Gravity.CenterHorizontal
};
frameLayout.AddChidren(PhoneEmailFL);
+ var bg = new Button
+ {
+ Width = Application.GetMinRealAverage(905),
+ Height = Application.GetMinRealAverage(170),
+ UnSelectedImagePath = "Account/PhoneEmail_White.png",
+ Gravity = Gravity.CenterHorizontal
+ };
+ PhoneEmailFL.AddChidren(bg);
+
SelectedPhone = new Button()
{
- Width = Application.GetRealWidth(width / 2 + 20),
+ X=Application.GetRealWidth(10),
+ Width = Application.GetMinRealAverage(905 / 2 + 20),
+ Height=Application.GetMinRealAverage(height),
SelectedBackgroundColor = ZigbeeColor.Current.GXCButtonSelectedColor,
TextID = R.MyInternationalizationString.PhoneNum,
TextColor = ZigbeeColor.Current.GXCTextColor,
@@ -57,8 +68,9 @@
SelectedEmail = new Button()
{
- X = Application.GetRealWidth(width / 2 - 20),
- Width = Application.GetRealWidth(width / 2 + 20),
+ X = Application.GetMinRealAverage(905 / 2 - 20),
+ Width = Application.GetMinRealAverage(905 / 2 + 20),
+ Height = Application.GetMinRealAverage(height),
SelectedBackgroundColor = ZigbeeColor.Current.GXCButtonSelectedColor,
TextID = R.MyInternationalizationString.Email,
TextColor = ZigbeeColor.Current.GXCTextColor,
--
Gitblit v1.8.0