From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
index cb975be..194a6bb 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
{
@@ -141,14 +142,23 @@
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;
};
- 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()
@@ -891,7 +901,7 @@
SelectedBackgroundColor=ZigbeeColor.Current.GXCButtonSelectedColor,
Enable = false,
IsSelected = false,
- Radius=(uint)Application.GetRealHeight(20)
+ Radius=(uint)Application.GetRealHeight(12)
};
codeFL.AddChidren(SendCodeBtn);
@@ -1039,7 +1049,7 @@
SelectedBackgroundColor = ZigbeeColor.Current.GXCButtonSelectedColor,
Enable = false,
IsSelected = false,
- Radius = (uint)Application.GetRealHeight(20)
+ Radius = (uint)Application.GetRealHeight(12)
};
codeFL.AddChidren(SendCodeBtn);
--
Gitblit v1.8.0