合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 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);