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 | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
index cb975be..110e270 100755
--- 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
{
@@ -19,8 +20,6 @@
/// 鎵嬫満閭
/// </summary>
private FrameLayout PhoneEmailFL;
-
-
public PhoneEmailForm()
{
@@ -141,19 +140,29 @@
accountFL.AddChidren(PhoneZoneBtn);
PhoneZoneBtn.MouseUpEventHandler += (sender, e) =>
{
- var zoneListView = new PhoneZone { };
- zoneListView.ActionSelectedZone += (zone) =>
+ var form = new AreaCodeSelectForm();
+ parFL.AddChidren(form);
+ form.InitForm();
+ form.ShowForm();
+ form.FinishSelectEvent += (code) =>
{
- var t = CommonPage.PhoneZoneStr;
- (sender as Button).Text = "+" + zone;
+ (sender as Button).Text = "+" + code;
+ CommonPage.PhoneZoneStr = code;
};
- parFL.AddChidren(zoneListView);
- zoneListView.Show();
+
+ //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,
@@ -175,8 +184,6 @@
};
accountFL.AddChidren(accountLine);
}
-
-
}
public class PhoneLoginRowForm : FrameLayout
@@ -241,8 +248,6 @@
};
accountFL.AddChidren(accountLine);
}
-
-
}
public class EmailRowForm : FrameLayout
@@ -285,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,
@@ -308,6 +313,7 @@
accountFL.AddChidren(accountLine);
}
}
+
public class EmailLoginRowForm : FrameLayout
{
@@ -349,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,
@@ -445,7 +451,7 @@
/// VerificationCodeET
/// </summary>
public EditText VerificationCodeET;
-
+
/// <summary>
/// Init
/// </summary>
@@ -476,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,
@@ -570,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,
@@ -865,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,
@@ -891,7 +897,7 @@
SelectedBackgroundColor=ZigbeeColor.Current.GXCButtonSelectedColor,
Enable = false,
IsSelected = false,
- Radius=(uint)Application.GetRealHeight(20)
+ Radius=(uint)Application.GetRealHeight(12)
};
codeFL.AddChidren(SendCodeBtn);
@@ -1039,7 +1045,7 @@
SelectedBackgroundColor = ZigbeeColor.Current.GXCButtonSelectedColor,
Enable = false,
IsSelected = false,
- Radius = (uint)Application.GetRealHeight(20)
+ Radius = (uint)Application.GetRealHeight(12)
};
codeFL.AddChidren(SendCodeBtn);
@@ -1110,8 +1116,6 @@
t.Dispose();
base.RemoveFromParent();
}
-
}
-
}
--
Gitblit v1.8.0