Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/Login/AccountForgetPWD.cs

@@ -286,7 +286,7 @@
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="mouseEventArgs"></param>
        private async void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
        private void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
        {
            if (CheckAccount(account) == false)
            {
@@ -313,7 +313,7 @@
                    AreaCode = int.Parse(CommonPage.PhoneZoneStr),
                    Language = CommonPage.ZigBeeLanguage
                };
                var requestRevertObj = await CommonFormResouce.LoginSendVerCode(reqDto);
                var requestRevertObj = CommonFormResouce.LoginSendVerCode(reqDto);
                if (requestRevertObj == null)
                {
                    errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;
@@ -396,7 +396,7 @@
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="mouseEventArgs"></param>
        private async void Reset(object sender,MouseEventArgs mouseEventArgs)
        private void Reset(object sender,MouseEventArgs mouseEventArgs)
        {

            if (CheckAccount(account) == false)
@@ -426,7 +426,7 @@
                    Language = CommonPage.ZigBeeLanguage
                };
                //验证验证码
                var requestRevertObj = await CommonFormResouce.ValidatorCode(reqDto);
                var requestRevertObj = CommonFormResouce.ValidatorCode(reqDto);
                if (requestRevertObj == null)
                {
                    CommonPage.Instance.FailureToServer();
@@ -443,7 +443,7 @@
                        AreaCode = int.Parse(CommonPage.PhoneZoneStr),
                        AgainPassword = pwdComfireRow.PasswrodET.Text.Trim()
                    };
                    var revertObj = await CommonFormResouce.ResetPassword(reqREPWD);
                    var revertObj = CommonFormResouce.ResetPassword(reqREPWD);
                    if (revertObj == null)
                    {
                        CommonPage.Instance.FailureToServer();