From bba578c2f0acf2eca747edcb69426771e0cadd32 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 18:20:50 +0800
Subject: [PATCH] 2020-03-23-3

---
 ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs |   99 +++++++++++++++++++++++--------------------------
 1 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs b/ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs
index 24ca941..96c8331 100755
--- a/ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs
@@ -145,18 +145,19 @@
                 TextSize = CommonFormResouce.TextSize
             };
             accountFL.AddChidren(PhoneZoneBtn);
-            PhoneZoneBtn.MouseUpEventHandler += (sender, e) =>
-            {
-                var form = new AreaCodeSelectForm();
-                parFL.AddChidren(form);
-                form.InitForm();
-                form.ShowForm();
-                form.FinishSelectEvent += (code) =>
-                {
-                    (sender as Button).Text = "+" + code;
-                    CommonPage.PhoneZoneStr = code;
-                };
-            };
+            //鐩墠鍙拡瀵�+86
+            //PhoneZoneBtn.MouseUpEventHandler += (sender, e) =>
+            //{
+            //    var form = new AreaCodeSelectForm();
+            //    parFL.AddChidren(form);
+            //    form.InitForm();
+            //    form.ShowForm();
+            //    form.FinishSelectEvent += (code) =>
+            //    {
+            //        (sender as Button).Text = "+" + code;
+            //        CommonPage.PhoneZoneStr = code;
+            //    };
+            //};
 
             AccountET = new EditText()
             {
@@ -226,16 +227,13 @@
         /// <param name="frameLayout"></param>
         /// <param name="account"></param>
         public void Init(FrameLayout frameLayout, FrameLayout parFL, string account, int x, int y)
-        {
-            var accountFL = new FrameLayout()
-            {
-                X = Application.GetRealWidth(x),
-                Y = Application.GetRealHeight(y),
-                Width = Application.GetRealWidth(CommonFormResouce.Row_Width),
-                Height = Application.GetRealHeight(CommonFormResouce.Row_Height),
-                BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
-            };
-            frameLayout.AddChidren(accountFL);
+        {
+            this.X = Application.GetRealWidth(x);
+            this.Y = Application.GetRealHeight(y);
+            this.Width = Application.GetRealWidth(CommonFormResouce.Row_Width);
+            this.Height = Application.GetRealHeight(CommonFormResouce.Row_Height);
+            this.BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+            frameLayout.AddChidren(this);
 
             var accountBtn = new Button()
             {
@@ -245,7 +243,7 @@
                 Gravity = Gravity.CenterVertical,
                 UnSelectedImagePath = "Account/Account.png"
             };
-            accountFL.AddChidren(accountBtn);
+            this.AddChidren(accountBtn);
 
             AccountET = new EditText()
             {
@@ -258,9 +256,10 @@
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 Text = account,
                 TextAlignment = TextAlignment.CenterLeft,
-                TextSize = CommonFormResouce.PlaceHolderTextSize
+                TextSize = CommonFormResouce.PlaceHolderTextSize,
+                IsNumberKeyboardType = true
             };
-            accountFL.AddChidren(AccountET);
+            this.AddChidren(AccountET);
 
             accountLine = new Button()
             {
@@ -269,7 +268,7 @@
                 Height = 1,
                 BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor
             };
-            accountFL.AddChidren(accountLine);
+            this.AddChidren(accountLine);
 
             AccountET.FoucsChanged += Text_FoucesChangeEvent;
 
@@ -407,16 +406,13 @@
         /// <param name="frameLayout"></param>
         /// <param name="account"></param>
         public void Init(FrameLayout frameLayout, string account, int x, int y)
-        {
-            var accountFL = new FrameLayout()
-            {
-                X = Application.GetRealWidth(x),
-                Y = Application.GetRealHeight(y),
-                Width = Application.GetRealWidth(CommonFormResouce.Row_Width),
-                Height = Application.GetRealHeight(CommonFormResouce.Row_Height),
-                BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
-            };
-            frameLayout.AddChidren(accountFL);
+        {
+            this.X = Application.GetRealWidth(x);
+            this.Y = Application.GetRealHeight(y);
+            this.Width = Application.GetRealWidth(CommonFormResouce.Row_Width);
+            this.Height = Application.GetRealHeight(CommonFormResouce.Row_Height);
+            this.BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+            frameLayout.AddChidren(this);
 
             var accountBtn = new Button()
             {
@@ -426,7 +422,7 @@
                 Gravity = Gravity.CenterVertical,
                 UnSelectedImagePath = "Account/Account.png"
             };
-            accountFL.AddChidren(accountBtn);
+            this.AddChidren(accountBtn);
 
             AccountET = new EditText()
             {
@@ -441,7 +437,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CommonFormResouce.PlaceHolderTextSize
             };
-            accountFL.AddChidren(AccountET);
+            this.AddChidren(AccountET);
 
             accountLine = new Button()
             {
@@ -450,7 +446,7 @@
                 Height = 1,
                 BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor
             };
-            accountFL.AddChidren(accountLine);
+            this.AddChidren(accountLine);
 
             AccountET.FoucsChanged += Text_FoucesChangeEvent;
         }
@@ -828,16 +824,13 @@
         /// <param name="x"></param>
         /// <param name="y"></param>
         public void Init(FrameLayout frameLayout, int x, int y, string password = "")
-        {
-            var pwdFL = new FrameLayout()
-            {
-                X = Application.GetRealWidth(x),
-                Y = Application.GetRealHeight(y),
-                Width = Application.GetRealWidth(CommonFormResouce.Row_Width),
-                Height = Application.GetRealHeight(CommonFormResouce.Row_Height),
-                BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
-            };
-            frameLayout.AddChidren(pwdFL);
+        {
+            this.X = Application.GetRealWidth(x);
+            this.Y = Application.GetRealHeight(y);
+            this.Width = Application.GetRealWidth(CommonFormResouce.Row_Width);
+            this.Height = Application.GetRealHeight(CommonFormResouce.Row_Height);
+            this.BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+            frameLayout.AddChidren(this);
 
             var passwordBtn = new Button()
             {
@@ -847,7 +840,7 @@
                 Gravity = Gravity.CenterVertical,
                 UnSelectedImagePath = "Account/Password.png"
             };
-            pwdFL.AddChidren(passwordBtn);
+            this.AddChidren(passwordBtn);
 
             PasswrodET = new EditText()
             {
@@ -863,7 +856,7 @@
                 TextSize = CommonFormResouce.PlaceHolderTextSize,
                 SecureTextEntry = true
             };
-            pwdFL.AddChidren(PasswrodET);
+            this.AddChidren(PasswrodET);
 
             hidenPWDbtn = new Button()
             {
@@ -875,7 +868,7 @@
                 UnSelectedImagePath = "Account/UnhidePwd.png",
                 IsSelected = true
             };
-            pwdFL.AddChidren(hidenPWDbtn);
+            this.AddChidren(hidenPWDbtn);
 
             hidenPWDbtn.MouseUpEventHandler += (sender, e) =>
             {
@@ -890,7 +883,7 @@
                 Height = 1,
                 BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor
             };
-            pwdFL.AddChidren(pwdLine);
+            this.AddChidren(pwdLine);
 
             PasswrodET.FoucsChanged += Text_FoucesChangeEvent;
         }

--
Gitblit v1.8.0