Merge branch 'Dev-Branch' into wjc

wjc

2023-06-05 a19e58425e44c8a83c3d1b23de292659c38a6b1e

 HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs

@@ -145,14 +145,14 @@
            //    }
            //};

            Action<View, string> textChangeEventHandler = (view, textStr) =>
            {
                LoadMothed_EnableResetButton();
            };
            //etAccount.TextChangeEventHandler += textChangeEventHandler;
            etPassword.TextChangeEventHandler += textChangeEventHandler;
            etRepeatPassword.TextChangeEventHandler += textChangeEventHandler;
            etVerificationCode.TextChangeEventHandler += textChangeEventHandler;
            //Action<View, string> textChangeEventHandler = (view, textStr) =>
            //{
            //    LoadMothed_EnableResetButton();
            //};
            ////etAccount.TextChangeEventHandler += textChangeEventHandler;
            //etPassword.TextChangeEventHandler += textChangeEventHandler;
            //etRepeatPassword.TextChangeEventHandler += textChangeEventHandler;
            //etVerificationCode.TextChangeEventHandler += textChangeEventHandler;
        }

        /// <summary>
@@ -286,23 +286,23 @@
            };

            //验证码文本框焦点变化事件
            etVerificationCode.FoucsChanged += (sender, e) =>
            {
                if (etVerificationCode.Foucs)
                {
                    HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.GotFocus);
                }
                else
                {
                    if (isHitBack) return;//点击返回关闭页面不检测提示
            //etVerificationCode.FoucsChanged += (sender, e) =>
            //{
            //    if (etVerificationCode.Foucs)
            //    {
            //        HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.GotFocus);
            //    }
            //    else
            //    {
            //        if (isHitBack) return;//点击返回关闭页面不检测提示

                    HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.Normal);
                    if (etVerificationCode.Text.Length > 4)
                    {
                        LoadMothed_EnableResetButton();
                    }
                }
            };
            //        HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.Normal);
            //        if (etVerificationCode.Text.Length > 4)
            //        {
            //            LoadMothed_EnableResetButton();
            //        }
            //    }
            //};
        }


@@ -401,7 +401,7 @@
                                    {
                                        //短信发送间隔60s
                                        (sender as Button).IsSelected = false;
                                        etVerificationCode.Foucs = true;
                                        //etVerificationCode.Foucs = true;
                                    });
                                    //2.1获取验证码倒计时
                                    new Thread(() =>