From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
index 194a6bb..110e270 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
@@ -21,8 +21,6 @@
/// </summary>
private FrameLayout PhoneEmailFL;
-
-
public PhoneEmailForm()
{
}
@@ -149,6 +147,7 @@
form.FinishSelectEvent += (code) =>
{
(sender as Button).Text = "+" + code;
+ CommonPage.PhoneZoneStr = code;
};
//var zoneListView = new PhoneZone { };
@@ -163,7 +162,7 @@
AccountET = new EditText()
{
- X = Application.GetRealWidth(193),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -185,8 +184,6 @@
};
accountFL.AddChidren(accountLine);
}
-
-
}
public class PhoneLoginRowForm : FrameLayout
@@ -251,8 +248,6 @@
};
accountFL.AddChidren(accountLine);
}
-
-
}
public class EmailRowForm : FrameLayout
@@ -295,7 +290,7 @@
AccountET = new EditText()
{
- X = Application.GetRealWidth(236),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(700),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -318,6 +313,7 @@
accountFL.AddChidren(accountLine);
}
}
+
public class EmailLoginRowForm : FrameLayout
{
@@ -359,7 +355,7 @@
AccountET = new EditText()
{
- X = Application.GetRealWidth(193),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(700),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -455,7 +451,7 @@
/// VerificationCodeET
/// </summary>
public EditText VerificationCodeET;
-
+
/// <summary>
/// Init
/// </summary>
@@ -486,7 +482,7 @@
VerificationCodeET = new EditText()
{
- X = Application.GetRealWidth(236),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(350),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -580,7 +576,7 @@
PasswrodET = new EditText()
{
- X = Application.GetRealWidth(236),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(550),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -875,7 +871,7 @@
VerificationCodeET = new EditText()
{
- X = Application.GetRealWidth(236),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -1120,8 +1116,6 @@
t.Dispose();
base.RemoveFromParent();
}
-
}
-
}
--
Gitblit v1.8.0