Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs

old mode 100755
new mode 100644
@@ -2,6 +2,7 @@
using System.Timers;
using Shared.Common;
using Shared.Phone.Device.CommonForm;
using Shared.Phone.UserCenter;

namespace Shared.Phone.Device.Account
{
@@ -34,17 +35,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 +69,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,14 +142,16 @@
            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;
                };

                //var zoneListView = new PhoneZone { };
                //zoneListView.ActionSelectedZone += (zone) =>
                //{
                //    var t = CommonPage.PhoneZoneStr;
                //    (sender as Button).Text = "+" + zone;
                //};
                //parFL.AddChidren(zoneListView);
                //zoneListView.Show();
            };

            AccountET = new EditText()
@@ -433,7 +448,7 @@
        /// VerificationCodeET
        /// </summary>
        public EditText VerificationCodeET;
    

        /// <summary>
        /// Init
        /// </summary>
@@ -879,7 +894,7 @@
                SelectedBackgroundColor=ZigbeeColor.Current.GXCButtonSelectedColor,
                Enable = false,
                IsSelected = false,
                Radius=(uint)Application.GetRealHeight(20)
                Radius=(uint)Application.GetRealHeight(12)
            };
            codeFL.AddChidren(SendCodeBtn);

@@ -1027,7 +1042,7 @@
                SelectedBackgroundColor = ZigbeeColor.Current.GXCButtonSelectedColor,
                Enable = false,
                IsSelected = false,
                Radius = (uint)Application.GetRealHeight(20)
                Radius = (uint)Application.GetRealHeight(12)
            };
            codeFL.AddChidren(SendCodeBtn);