From b129359c5a0df75f63d9131e5e41d3060ac38cc3 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期一, 30 十二月 2019 14:14:06 +0800 Subject: [PATCH] 2019.12.30 --- ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs | 408 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 337 insertions(+), 71 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs old mode 100755 new mode 100644 index 194a6bb..a618366 --- a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs +++ b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs @@ -21,8 +21,6 @@ /// </summary> private FrameLayout PhoneEmailFL; - - public PhoneEmailForm() { } @@ -63,7 +61,9 @@ SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor, Radius = (uint)Application.GetRealHeight(height / 2), IsSelected = true, - Tag = "Phone" + IsBold=true, + Tag = "Phone", + TextSize= CommonFormResouce.TextSize }; PhoneEmailFL.AddChidren(SelectedPhone); @@ -78,7 +78,8 @@ SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor, Radius = (uint)Application.GetRealHeight(height / 2), IsSelected = false, - Tag = "Email" + Tag = "Email", + TextSize = CommonFormResouce.TextSize }; PhoneEmailFL.AddChidren(SelectedEmail); } @@ -110,6 +111,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// accountLine + /// </summary> + private Button accountLine; /// <summary> /// Init @@ -137,33 +142,17 @@ TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor, Text = $"+{CommonPage.PhoneZoneStr}", TextAlignment = TextAlignment.Center, - TextSize = CommonFormResouce.loginTextSize + 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; - }; - - //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; CommonPage.PhoneZoneStr = code; }; }; AccountET = new EditText() { - X = Application.GetRealWidth(193), + X = Application.GetRealWidth(222), Width = Application.GetRealWidth(600), Height = Application.GetRealHeight(Button_Height), Gravity = Gravity.CenterVertical, @@ -172,21 +161,40 @@ TextColor = ZigbeeColor.Current.GXCTextBlackColor, Text = account, TextAlignment = TextAlignment.CenterLeft, - TextSize = CommonFormResouce.loginTextSize + TextSize = CommonFormResouce.PlaceHolderTextSize }; accountFL.AddChidren(AccountET); - var accountLine = new Button() + accountLine = new Button() { - Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 1, + Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 2, Width = Application.GetRealWidth(CommonFormResouce.Row_Width), Height = 1, BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor }; accountFL.AddChidren(accountLine); + + AccountET.FoucsChanged += Text_FoucesChangeEvent; } - + /// <summary> + /// 鍏夋爣鏀瑰彉 + /// </summary> + /// <param name="sender"></param> + /// <param name="focusEvent"></param> + private void Text_FoucesChangeEvent(object sender, FocusEventArgs focusEvent) + { + if (focusEvent.Focus) + { + accountLine.BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor; + accountLine.Height = 2; + } + else + { + accountLine.BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor; + accountLine.Height = 1; + } + } } public class PhoneLoginRowForm : FrameLayout @@ -199,6 +207,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// accountLine + /// </summary> + private Button accountLine; /// <summary> /// Init @@ -238,21 +250,41 @@ TextColor = ZigbeeColor.Current.GXCTextBlackColor, Text = account, TextAlignment = TextAlignment.CenterLeft, - TextSize = CommonFormResouce.loginTextSize + TextSize = CommonFormResouce.PlaceHolderTextSize }; accountFL.AddChidren(AccountET); - var accountLine = new Button() + accountLine = new Button() { - Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 1, + Y = Application.GetRealHeight(CommonFormResouce.Row_Height)-2, Width = Application.GetRealWidth(CommonFormResouce.Row_Width), Height = 1, BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor }; accountFL.AddChidren(accountLine); + + AccountET.FoucsChanged += Text_FoucesChangeEvent; + } - + /// <summary> + /// 鍏夋爣鏀瑰彉 + /// </summary> + /// <param name="sender"></param> + /// <param name="focusEvent"></param> + private void Text_FoucesChangeEvent(object sender, FocusEventArgs focusEvent) + { + if(focusEvent.Focus) + { + accountLine.BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor; + accountLine.Height = 2; + } + else + { + accountLine.BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor; + accountLine.Height = 1; + } + } } public class EmailRowForm : FrameLayout @@ -265,6 +297,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// accountLine + /// </summary> + private Button accountLine; /// <summary> /// Init @@ -295,7 +331,7 @@ AccountET = new EditText() { - X = Application.GetRealWidth(236), + X = Application.GetRealWidth(222), Width = Application.GetRealWidth(700), Height = Application.GetRealHeight(Button_Height), Gravity = Gravity.CenterVertical, @@ -304,20 +340,43 @@ TextColor = ZigbeeColor.Current.GXCTextBlackColor, Text = account, TextAlignment = TextAlignment.CenterLeft, - TextSize = CommonFormResouce.loginTextSize + TextSize = CommonFormResouce.PlaceHolderTextSize }; accountFL.AddChidren(AccountET); - var accountLine = new Button() + accountLine = new Button() { - Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 1, + Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 2, Width = Application.GetRealWidth(CommonFormResouce.Row_Width), Height = 1, BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor }; accountFL.AddChidren(accountLine); + + AccountET.FoucsChanged += Text_FoucesChangeEvent; } + + /// <summary> + /// 鍏夋爣鏀瑰彉 + /// </summary> + /// <param name="sender"></param> + /// <param name="focusEvent"></param> + private void Text_FoucesChangeEvent(object sender, FocusEventArgs focusEvent) + { + if (focusEvent.Focus) + { + accountLine.BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor; + accountLine.Height = 2; + } + else + { + accountLine.BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor; + accountLine.Height = 1; + } + } + } + public class EmailLoginRowForm : FrameLayout { @@ -329,6 +388,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// accountLine + /// </summary> + private Button accountLine; /// <summary> /// Init @@ -359,7 +422,7 @@ AccountET = new EditText() { - X = Application.GetRealWidth(193), + X = Application.GetRealWidth(222), Width = Application.GetRealWidth(700), Height = Application.GetRealHeight(Button_Height), Gravity = Gravity.CenterVertical, @@ -368,19 +431,41 @@ TextColor = ZigbeeColor.Current.GXCTextBlackColor, Text = account, TextAlignment = TextAlignment.CenterLeft, - TextSize = CommonFormResouce.loginTextSize + TextSize = CommonFormResouce.PlaceHolderTextSize }; accountFL.AddChidren(AccountET); - var accountLine = new Button() + accountLine = new Button() { - Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 1, + Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 2, Width = Application.GetRealWidth(CommonFormResouce.Row_Width), Height = 1, BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor }; accountFL.AddChidren(accountLine); + + AccountET.FoucsChanged += Text_FoucesChangeEvent; } + + /// <summary> + /// 鍏夋爣鏀瑰彉 + /// </summary> + /// <param name="sender"></param> + /// <param name="focusEvent"></param> + private void Text_FoucesChangeEvent(object sender, FocusEventArgs focusEvent) + { + if (focusEvent.Focus) + { + accountLine.BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor; + accountLine.Height = 2; + } + else + { + accountLine.BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor; + accountLine.Height = 1; + } + } + } public class EmailForgotRowForm : FrameLayout @@ -393,6 +478,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// accountLine + /// </summary> + private Button accountLine; /// <summary> /// Init @@ -422,18 +511,39 @@ TextColor = ZigbeeColor.Current.GXCTextBlackColor, Text = account, TextAlignment = TextAlignment.CenterLeft, - TextSize = CommonFormResouce.loginTextSize + TextSize = CommonFormResouce.PlaceHolderTextSize }; accountFL.AddChidren(AccountET); - var accountLine = new Button() + accountLine = new Button() { - Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 1, + Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 2, Width = Application.GetRealWidth(CommonFormResouce.Row_Width), Height = 1, - BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor + BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor }; accountFL.AddChidren(accountLine); + + AccountET.FoucsChanged += Text_FoucesChangeEvent; + } + + /// <summary> + /// 鍏夋爣鏀瑰彉 + /// </summary> + /// <param name="sender"></param> + /// <param name="focusEvent"></param> + private void Text_FoucesChangeEvent(object sender, FocusEventArgs focusEvent) + { + if (focusEvent.Focus) + { + accountLine.BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor; + accountLine.Height = 2; + } + else + { + accountLine.BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor; + accountLine.Height = 1; + } } } @@ -455,7 +565,11 @@ /// VerificationCodeET /// </summary> public EditText VerificationCodeET; - + /// <summary> + /// pwdLine + /// </summary> + private Button pwdLine; + /// <summary> /// Init /// </summary> @@ -486,7 +600,7 @@ VerificationCodeET = new EditText() { - X = Application.GetRealWidth(236), + X = Application.GetRealWidth(222), Width = Application.GetRealWidth(350), Height = Application.GetRealHeight(Button_Height), Gravity = Gravity.CenterVertical, @@ -518,19 +632,42 @@ TextColor = ZigbeeColor.Current.GXCTextGrayColor, SelectedTextColor = ZigbeeColor.Current.GXCTextColor, TextAlignment = TextAlignment.Center, + TextSize=CommonFormResouce.TextSize, Enable = false, - IsSelected = false + IsSelected = false, + IsBold=true }; codeFL.AddChidren(SendCodeBtn); - var pwdLine = new Button() + pwdLine = new Button() { - Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 1, + Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 2, Width = Application.GetRealWidth(CommonFormResouce.Row_Width), Height = 1, - BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor + BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor }; codeFL.AddChidren(pwdLine); + + VerificationCodeET.FoucsChanged += Text_FoucesChangeEvent; + } + + /// <summary> + /// 鍏夋爣鏀瑰彉 + /// </summary> + /// <param name="sender"></param> + /// <param name="focusEvent"></param> + private void Text_FoucesChangeEvent(object sender, FocusEventArgs focusEvent) + { + if (focusEvent.Focus) + { + pwdLine.BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor; + pwdLine.Height = 2; + } + else + { + pwdLine.BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor; + pwdLine.Height = 1; + } } } @@ -548,6 +685,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// pwdLine + /// </summary> + private Button pwdLine; /// <summary> /// Init @@ -580,7 +721,7 @@ PasswrodET = new EditText() { - X = Application.GetRealWidth(236), + X = Application.GetRealWidth(222), Width = Application.GetRealWidth(550), Height = Application.GetRealHeight(Button_Height), Gravity = Gravity.CenterVertical, @@ -589,7 +730,7 @@ TextColor = ZigbeeColor.Current.GXCTextBlackColor, Text = password, TextAlignment = TextAlignment.CenterLeft, - TextSize = CommonFormResouce.loginTextSize, + TextSize = CommonFormResouce.PlaceHolderTextSize, SecureTextEntry = true }; pwdFL.AddChidren(PasswrodET); @@ -612,14 +753,16 @@ PasswrodET.SecureTextEntry = (sender as Button).IsSelected; }; - var pwdLine = new Button() + pwdLine = new Button() { - Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 1, + Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 2, Width = Application.GetRealWidth(CommonFormResouce.Row_Width), Height = 1, BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor }; pwdFL.AddChidren(pwdLine); + + PasswrodET.FoucsChanged += Text_FoucesChangeEvent; } /// <summary> /// SetPlaceholdText @@ -628,6 +771,25 @@ public void SetPlaceholdText(string holdText) { PasswrodET.PlaceholderText = holdText; + } + + /// <summary> + /// 鍏夋爣鏀瑰彉 + /// </summary> + /// <param name="sender"></param> + /// <param name="focusEvent"></param> + private void Text_FoucesChangeEvent(object sender, FocusEventArgs focusEvent) + { + if (focusEvent.Focus) + { + pwdLine.BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor; + pwdLine.Height = 2; + } + else + { + pwdLine.BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor; + pwdLine.Height = 1; + } } } @@ -645,6 +807,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// pwdLine + /// </summary> + private Button pwdLine; /// <summary> /// Init @@ -686,7 +852,7 @@ TextColor = ZigbeeColor.Current.GXCTextBlackColor, Text = password, TextAlignment = TextAlignment.CenterLeft, - TextSize = CommonFormResouce.loginTextSize, + TextSize = CommonFormResouce.PlaceHolderTextSize, SecureTextEntry = true }; pwdFL.AddChidren(PasswrodET); @@ -709,14 +875,16 @@ PasswrodET.SecureTextEntry = (sender as Button).IsSelected; }; - var pwdLine = new Button() + pwdLine = new Button() { - Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 1, + Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 2, Width = Application.GetRealWidth(CommonFormResouce.Row_Width), Height = 1, - BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor + BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor }; pwdFL.AddChidren(pwdLine); + + PasswrodET.FoucsChanged += Text_FoucesChangeEvent; } /// <summary> /// SetPlaceholdText @@ -725,6 +893,25 @@ public void SetPlaceholdText(string holdText) { PasswrodET.PlaceholderText = holdText; + } + + /// <summary> + /// 鍏夋爣鏀瑰彉 + /// </summary> + /// <param name="sender"></param> + /// <param name="focusEvent"></param> + private void Text_FoucesChangeEvent(object sender, FocusEventArgs focusEvent) + { + if (focusEvent.Focus) + { + pwdLine.BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor; + pwdLine.Height = 2; + } + else + { + pwdLine.BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor; + pwdLine.Height = 1; + } } } @@ -742,6 +929,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// pwdLine + /// </summary> + private Button pwdLine; /// <summary> /// Init @@ -773,7 +964,7 @@ TextColor = ZigbeeColor.Current.GXCTextBlackColor, Text = password, TextAlignment = TextAlignment.CenterLeft, - TextSize = CommonFormResouce.loginTextSize, + TextSize = CommonFormResouce.PlaceHolderTextSize, SecureTextEntry = true }; pwdFL.AddChidren(PasswrodET); @@ -796,14 +987,16 @@ PasswrodET.SecureTextEntry = (sender as Button).IsSelected; }; - var pwdLine = new Button() + pwdLine = new Button() { - Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 1, + Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 2, Width = Application.GetRealWidth(CommonFormResouce.Row_Width), Height = 1, BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor }; pwdFL.AddChidren(pwdLine); + + PasswrodET.FoucsChanged += Text_FoucesChangeEvent; } /// <summary> /// SetPlaceholdText @@ -812,6 +1005,26 @@ public void SetPlaceholdText(string holdText) { PasswrodET.PlaceholderText = holdText; + } + + + /// <summary> + /// 鍏夋爣鏀瑰彉 + /// </summary> + /// <param name="sender"></param> + /// <param name="focusEvent"></param> + private void Text_FoucesChangeEvent(object sender, FocusEventArgs focusEvent) + { + if (focusEvent.Focus) + { + pwdLine.BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor; + pwdLine.Height = 2; + } + else + { + pwdLine.BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor; + pwdLine.Height = 1; + } } } @@ -833,6 +1046,10 @@ /// VerificationCodeET /// </summary> public EditText VerificationCodeET; + /// <summary> + /// pwdLine + /// </summary> + private Button pwdLine; /// <summary> /// sendCodeBG /// </summary> @@ -875,7 +1092,7 @@ VerificationCodeET = new EditText() { - X = Application.GetRealWidth(236), + X = Application.GetRealWidth(222), Width = Application.GetRealWidth(300), Height = Application.GetRealHeight(Button_Height), Gravity = Gravity.CenterVertical, @@ -901,18 +1118,42 @@ SelectedBackgroundColor=ZigbeeColor.Current.GXCButtonSelectedColor, Enable = false, IsSelected = false, - Radius=(uint)Application.GetRealHeight(12) + Radius=(uint)Application.GetRealHeight(12), + IsBold=true, + TextSize=CommonFormResouce.TextSize }; codeFL.AddChidren(SendCodeBtn); - var pwdLine = new Button() + pwdLine = new Button() { - Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 1, + Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 2, Width = Application.GetRealWidth(536), Height = 1, - BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor + BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor }; codeFL.AddChidren(pwdLine); + + VerificationCodeET.FoucsChanged += Text_FoucesChangeEvent; + + } + + /// <summary> + /// 鍏夋爣鏀瑰彉 + /// </summary> + /// <param name="sender"></param> + /// <param name="focusEvent"></param> + private void Text_FoucesChangeEvent(object sender, FocusEventArgs focusEvent) + { + if (focusEvent.Focus) + { + pwdLine.BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor; + pwdLine.Height = 2; + } + else + { + pwdLine.BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor; + pwdLine.Height = 1; + } } /// <summary> @@ -990,6 +1231,10 @@ /// </summary> public EditText VerificationCodeET; /// <summary> + /// pwdLine + /// </summary> + private Button pwdLine; + /// <summary> /// Timer /// </summary> private Timer t; @@ -1049,18 +1294,41 @@ SelectedBackgroundColor = ZigbeeColor.Current.GXCButtonSelectedColor, Enable = false, IsSelected = false, - Radius = (uint)Application.GetRealHeight(12) + Radius = (uint)Application.GetRealHeight(12), + IsBold=true, + TextSize=CommonFormResouce.TextSize }; codeFL.AddChidren(SendCodeBtn); - var pwdLine = new Button() + pwdLine = new Button() { - Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 1, + Y = Application.GetRealHeight(CommonFormResouce.Row_Height) - 2, Width = Application.GetRealWidth(536), Height = 1, - BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor + BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor }; codeFL.AddChidren(pwdLine); + + VerificationCodeET.FoucsChanged += Text_FoucesChangeEvent; + } + + /// <summary> + /// 鍏夋爣鏀瑰彉 + /// </summary> + /// <param name="sender"></param> + /// <param name="focusEvent"></param> + private void Text_FoucesChangeEvent(object sender, FocusEventArgs focusEvent) + { + if (focusEvent.Focus) + { + pwdLine.BackgroundColor = ZigbeeColor.Current.GXCSelectedLineColor; + pwdLine.Height = 2; + } + else + { + pwdLine.BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor; + pwdLine.Height = 1; + } } /// <summary> @@ -1120,8 +1388,6 @@ t.Dispose(); base.RemoveFromParent(); } - } - } -- Gitblit v1.8.0