20200706

wxr

2020-07-06 23c075a9c27946773feccf05abc90489a6bf5203

 HDL_ON/UI/UI1-Login/LoginPageBLL.cs

@@ -31,7 +31,7 @@
        /// </summary>
        void GetVerificationCode()
        {
            btnGetVerificationCode.MouseUpEventHandler += (sender, e) =>
            btnGetVerificationCode.MouseUpEventHandler = (sender, e) =>
            {
                if (btnGetVerificationCode.IsSelected)
                {
@@ -150,8 +150,10 @@
        void LoadPage_SwitchLoginType()
        {
            //选择手机登录
            btnPhoneLogin.MouseUpEventHandler += (sender, e) =>
            btnPhoneLogin.MouseUpEventHandler = (sender, e) =>
            {
                if (loginType == 0)
                    return;
                #region 切换选中按钮
                btnEmailLogin.TextColor = CSS_Color.PromptingColor1;
                btnEmailLogin.TextSize = CSS_FontSize.TextFontSize;
@@ -170,11 +172,43 @@
                //显示验证码登录方式，手机登录有验证码登录
                btnSwitchLoginMode.Visible = true;
                #endregion

                #region
                if (logintMode == 1)
                {
                    if (Regex.IsMatch(account, @"^[1]+\d{10}") && (account.Length == 11) && btnGetVerificationCode.Text == Language.StringByID(StringId.GetVerificationCode))
                    {
                        btnGetVerificationCode.IsSelected = true;
                    }
                    btnSwitchLoginMode.TextID = StringId.PasswordLogin;
                    //passwordView.AddChidren(btnGetVerificationCode);
                    btnGetVerificationCode.Visible = true;
                    etPassword.PlaceholderText = Language.StringByID(StringId.PlsEntryVerificationCode);
                    btnPasswordIcon.IsSelected = true;
                    if (btnVisiblePassword.Parent != null)
                    {
                        btnVisiblePassword.RemoveFromParent();
                    }
                    if (btnDividingLineVertical_PasswordView2.Parent != null)
                    {
                        btnDividingLineVertical_PasswordView2.RemoveFromParent();
                    }
                    if (btnForgetPassword.Parent != null)
                    {
                        btnForgetPassword.RemoveFromParent();
                    }
                    //验证码不需要隐藏
                    etPassword.SecureTextEntry = false;
                }
                #endregion

            };

            //选择邮箱登录
            btnEmailLogin.MouseUpEventHandler += (sender, e) =>
            {
                if (loginType == 1)
                    return;
                #region 切换选中按钮
                btnPhoneLogin.TextColor = CSS_Color.PromptingColor1;
                btnPhoneLogin.TextSize = CSS_FontSize.TextFontSize;
@@ -193,7 +227,7 @@
                #endregion

                //邮箱只有密码登录模式
                logintMode = 0;
                //logintMode = 0;
                //密码登录
                btnSwitchLoginMode.TextID = StringId.VerificationCodeLogin;
                passwordView.AddChidren(btnVisiblePassword);
@@ -201,10 +235,11 @@
                passwordView.AddChidren(btnForgetPassword);
                btnPasswordIcon.IsSelected = false;

                if (btnGetVerificationCode.Parent != null)
                {
                    btnGetVerificationCode.RemoveFromParent();
                }
                //if (btnGetVerificationCode.Parent != null)
                //{
                    //btnGetVerificationCode.RemoveFromParent();
                    btnGetVerificationCode.Visible = false;
                //}
                //隐藏密码
                etPassword.SecureTextEntry = true;
                //隐藏验证码登录方式，邮箱登录没有验证码登录
@@ -218,7 +253,7 @@
        /// </summary>
        void LoadPage_SwitchLoginMode()
        {
            btnSwitchLoginMode.MouseUpEventHandler += (sender, e) =>
            btnSwitchLoginMode.MouseUpEventHandler = (sender, e) =>
            {
                logintMode = logintMode == 0 ? 1 : 0;
                //清除密码框文本数据
@@ -232,22 +267,24 @@
                    etPassword.PlaceholderText = Language.StringByID(StringId.PlsEntryPassword);
                    passwordView.AddChidren(btnForgetPassword);
                    btnPasswordIcon.IsSelected = false;
                    if (btnGetVerificationCode.Parent != null)
                    {
                        btnGetVerificationCode.RemoveFromParent();
                    }
                    //if (btnGetVerificationCode.Parent != null)
                    //{
                        //btnGetVerificationCode.RemoveFromParent();
                        btnGetVerificationCode.Visible = false;
                    //}
                    //隐藏密码
                    etPassword.SecureTextEntry = true;
                }
                //验证码登录
                else if (logintMode == 1)
                {
                    if (Regex.IsMatch(account, @"^[1]+\d{10}") && (account.Length == 11))
                    if (Regex.IsMatch(account, @"^[1]+\d{10}") && (account.Length == 11) && btnGetVerificationCode.Text == Language.StringByID(StringId.GetVerificationCode))
                    {
                        btnGetVerificationCode.IsSelected = true;
                    }
                    btnSwitchLoginMode.TextID = StringId.PasswordLogin;
                    passwordView.AddChidren(btnGetVerificationCode);
                    //passwordView.AddChidren(btnGetVerificationCode);
                    btnGetVerificationCode.Visible = true;
                    etPassword.PlaceholderText = Language.StringByID(StringId.PlsEntryVerificationCode);
                    btnPasswordIcon.IsSelected = true;
                    if (btnVisiblePassword.Parent != null)
@@ -274,7 +311,7 @@
        void LoadPage_SelectionEditText()
        {
            //当焦点在账号文本框时，文本框底线点亮
            etAccount.FoucsChanged += (sender, e) =>
            etAccount.FoucsChanged = (sender, e) =>
            {
                if (etAccount.Foucs)
                {
@@ -388,7 +425,7 @@

                    if (loginType == 0)
                    {
                        if (!Regex.IsMatch(account, @"^[1]+\d{10}") && (account.Length == 11))
                        if (!Regex.IsMatch(account, @"^[1]+\d{10}") && account.Length == 11)
                        {
                            var tip = new Tip()
                            {
@@ -422,15 +459,26 @@
                }
            };
            #region 当账号密码都输入时，才能点击登录按钮
            etAccount.TextChangeEventHandler += (sender, e) =>
            etAccount.TextChangeEventHandler = (sender, e) =>
            {
                if (etAccount.Text.Trim().Length > 0 && etPassword.Text.Trim().Length > 0)
                account = etAccount.Text.Trim();
                if (account.Length > 0 && etPassword.Text.Trim().Length > 0)
                {
                    btnLogin.IsSelected = true;
                }
                else
                {
                    btnLogin.IsSelected = false;
                }
                if (Regex.IsMatch(account, @"^[1]+\d{10}") )//&& account.Length == 11)
                {
                    btnGetVerificationCode.IsSelected = true;
                    btnGetVerificationCode.TextColor = CSS_Color.MainBackgroundColor;
                }
                else
                {
                    btnGetVerificationCode.IsSelected = false;
                    btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
                }
            };
            etPassword.TextChangeEventHandler += (sender, e) =>
@@ -515,7 +563,7 @@
        {
            var result = false;
            ResponsePack loginResult;
            if (logintMode == 0)
            if (logintMode == 0 || loginType == 1)
            {
                //调用登录接口
                loginResult = pm.LoginByPassword(account, password);