From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期五, 28 二月 2020 15:25:13 +0800 Subject: [PATCH] 2020.2.28 --- ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs | 394 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 338 insertions(+), 56 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 48ea58b..6753350 --- a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs +++ b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs @@ -61,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); @@ -76,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); } @@ -108,6 +111,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// accountLine + /// </summary> + private Button accountLine; /// <summary> /// Init @@ -135,7 +142,7 @@ TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor, Text = $"+{CommonPage.PhoneZoneStr}", TextAlignment = TextAlignment.Center, - TextSize = CommonFormResouce.loginTextSize + TextSize = CommonFormResouce.TextSize }; accountFL.AddChidren(PhoneZoneBtn); PhoneZoneBtn.MouseUpEventHandler += (sender, e) => @@ -147,21 +154,13 @@ form.FinishSelectEvent += (code) => { (sender as Button).Text = "+" + code; + CommonPage.PhoneZoneStr = 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() { - X = Application.GetRealWidth(193), + X = Application.GetRealWidth(222), Width = Application.GetRealWidth(600), Height = Application.GetRealHeight(Button_Height), Gravity = Gravity.CenterVertical, @@ -170,18 +169,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.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; + } } } @@ -195,6 +215,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// accountLine + /// </summary> + private Button accountLine; /// <summary> /// Init @@ -234,18 +258,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; + } } } @@ -259,6 +305,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// accountLine + /// </summary> + private Button accountLine; /// <summary> /// Init @@ -289,7 +339,7 @@ AccountET = new EditText() { - X = Application.GetRealWidth(236), + X = Application.GetRealWidth(222), Width = Application.GetRealWidth(700), Height = Application.GetRealHeight(Button_Height), Gravity = Gravity.CenterVertical, @@ -298,20 +348,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 { @@ -323,6 +396,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// accountLine + /// </summary> + private Button accountLine; /// <summary> /// Init @@ -353,7 +430,7 @@ AccountET = new EditText() { - X = Application.GetRealWidth(193), + X = Application.GetRealWidth(222), Width = Application.GetRealWidth(700), Height = Application.GetRealHeight(Button_Height), Gravity = Gravity.CenterVertical, @@ -362,19 +439,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 @@ -387,6 +486,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// accountLine + /// </summary> + private Button accountLine; /// <summary> /// Init @@ -416,18 +519,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; + } } } @@ -449,6 +573,10 @@ /// VerificationCodeET /// </summary> public EditText VerificationCodeET; + /// <summary> + /// pwdLine + /// </summary> + private Button pwdLine; /// <summary> /// Init @@ -480,7 +608,7 @@ VerificationCodeET = new EditText() { - X = Application.GetRealWidth(236), + X = Application.GetRealWidth(222), Width = Application.GetRealWidth(350), Height = Application.GetRealHeight(Button_Height), Gravity = Gravity.CenterVertical, @@ -512,19 +640,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; + } } } @@ -542,6 +693,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// pwdLine + /// </summary> + private Button pwdLine; /// <summary> /// Init @@ -574,7 +729,7 @@ PasswrodET = new EditText() { - X = Application.GetRealWidth(236), + X = Application.GetRealWidth(222), Width = Application.GetRealWidth(550), Height = Application.GetRealHeight(Button_Height), Gravity = Gravity.CenterVertical, @@ -583,7 +738,7 @@ TextColor = ZigbeeColor.Current.GXCTextBlackColor, Text = password, TextAlignment = TextAlignment.CenterLeft, - TextSize = CommonFormResouce.loginTextSize, + TextSize = CommonFormResouce.PlaceHolderTextSize, SecureTextEntry = true }; pwdFL.AddChidren(PasswrodET); @@ -606,14 +761,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 @@ -622,6 +779,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; + } } } @@ -639,6 +815,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// pwdLine + /// </summary> + private Button pwdLine; /// <summary> /// Init @@ -680,7 +860,7 @@ TextColor = ZigbeeColor.Current.GXCTextBlackColor, Text = password, TextAlignment = TextAlignment.CenterLeft, - TextSize = CommonFormResouce.loginTextSize, + TextSize = CommonFormResouce.PlaceHolderTextSize, SecureTextEntry = true }; pwdFL.AddChidren(PasswrodET); @@ -703,14 +883,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 @@ -719,6 +901,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; + } } } @@ -736,6 +937,10 @@ /// Button_Height /// </summary> private int Button_Height = 92; + /// <summary> + /// pwdLine + /// </summary> + private Button pwdLine; /// <summary> /// Init @@ -767,7 +972,7 @@ TextColor = ZigbeeColor.Current.GXCTextBlackColor, Text = password, TextAlignment = TextAlignment.CenterLeft, - TextSize = CommonFormResouce.loginTextSize, + TextSize = CommonFormResouce.PlaceHolderTextSize, SecureTextEntry = true }; pwdFL.AddChidren(PasswrodET); @@ -790,14 +995,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 @@ -806,6 +1013,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; + } } } @@ -827,6 +1054,10 @@ /// VerificationCodeET /// </summary> public EditText VerificationCodeET; + /// <summary> + /// pwdLine + /// </summary> + private Button pwdLine; /// <summary> /// sendCodeBG /// </summary> @@ -869,7 +1100,7 @@ VerificationCodeET = new EditText() { - X = Application.GetRealWidth(236), + X = Application.GetRealWidth(222), Width = Application.GetRealWidth(300), Height = Application.GetRealHeight(Button_Height), Gravity = Gravity.CenterVertical, @@ -895,18 +1126,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> @@ -984,6 +1239,10 @@ /// </summary> public EditText VerificationCodeET; /// <summary> + /// pwdLine + /// </summary> + private Button pwdLine; + /// <summary> /// Timer /// </summary> private Timer t; @@ -1043,18 +1302,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> -- Gitblit v1.8.0