From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25
---
ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs | 72 ++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
old mode 100755
new mode 100644
index 07a7ced..01c2e9c
--- a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
@@ -2,6 +2,7 @@
using System.Timers;
using Shared.Common;
using Shared.Phone.Device.CommonForm;
+using Shared.Phone.UserCenter;
namespace Shared.Phone.Device.Account
{
@@ -20,8 +21,6 @@
/// </summary>
private FrameLayout PhoneEmailFL;
-
-
public PhoneEmailForm()
{
}
@@ -34,17 +33,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 +67,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,
@@ -129,19 +140,21 @@
accountFL.AddChidren(PhoneZoneBtn);
PhoneZoneBtn.MouseUpEventHandler += (sender, e) =>
{
- var zoneListView = new PhoneZone { };
- zoneListView.ActionSelectedZone += (zone) =>
- {
- var t = CommonPage.PhoneZoneStr;
- (sender as Button).Text = "+" + zone;
- };
- parFL.AddChidren(zoneListView);
- zoneListView.Show();
+ var form = new AreaCodeSelectForm();
parFL.AddChidren(form);
form.InitForm();
form.ShowForm();
form.FinishSelectEvent += (code) =>
{
(sender as Button).Text = "+" + code;
CommonPage.PhoneZoneStr = code;
};
+
+ //var zoneListView = new PhoneZone { };
+ //zoneListView.ActionSelectedZone += (zone) =>
+ //{
+ // var t = CommonPage.PhoneZoneStr;
+ // (sender as Button).Text = "+" + zone;
+ //};
+ //parFL.AddChidren(zoneListView);
+ //zoneListView.Show();
};
AccountET = new EditText()
{
- X = Application.GetRealWidth(193),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -163,8 +176,6 @@
};
accountFL.AddChidren(accountLine);
}
-
-
}
public class PhoneLoginRowForm : FrameLayout
@@ -229,8 +240,6 @@
};
accountFL.AddChidren(accountLine);
}
-
-
}
public class EmailRowForm : FrameLayout
@@ -273,7 +282,7 @@
AccountET = new EditText()
{
- X = Application.GetRealWidth(236),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(700),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -296,6 +305,7 @@
accountFL.AddChidren(accountLine);
}
}
+
public class EmailLoginRowForm : FrameLayout
{
@@ -337,7 +347,7 @@
AccountET = new EditText()
{
- X = Application.GetRealWidth(193),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(700),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -433,7 +443,7 @@
/// VerificationCodeET
/// </summary>
public EditText VerificationCodeET;
-
+
/// <summary>
/// Init
/// </summary>
@@ -464,7 +474,7 @@
VerificationCodeET = new EditText()
{
- X = Application.GetRealWidth(236),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(350),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -558,7 +568,7 @@
PasswrodET = new EditText()
{
- X = Application.GetRealWidth(236),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(550),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -853,7 +863,7 @@
VerificationCodeET = new EditText()
{
- X = Application.GetRealWidth(236),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -879,7 +889,7 @@
SelectedBackgroundColor=ZigbeeColor.Current.GXCButtonSelectedColor,
Enable = false,
IsSelected = false,
- Radius=(uint)Application.GetRealHeight(20)
+ Radius=(uint)Application.GetRealHeight(12)
};
codeFL.AddChidren(SendCodeBtn);
@@ -1027,7 +1037,7 @@
SelectedBackgroundColor = ZigbeeColor.Current.GXCButtonSelectedColor,
Enable = false,
IsSelected = false,
- Radius = (uint)Application.GetRealHeight(20)
+ Radius = (uint)Application.GetRealHeight(12)
};
codeFL.AddChidren(SendCodeBtn);
@@ -1098,8 +1108,6 @@
t.Dispose();
base.RemoveFromParent();
}
-
}
-
}
--
Gitblit v1.8.0