新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

 ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs

@@ -58,21 +58,21 @@
            btnPhone.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnPhone.TextAlignment = TextAlignment.Center;

            btnPhone.TextSize = 16;

            btnPhone.Text = UserCenterResourse.UserInfo.Email;

            btnPhone.Text = HdlUserCenterResourse.UserInfo.UserEmail;

            btnPhone.Y = btnMsg1.Bottom + Application.GetRealHeight(12);

            bodyFrameLayout.AddChidren(btnPhone);

            if (UserCenterResourse.UserInfo.Phone.Length >= 11)

            if (HdlUserCenterResourse.UserInfo.UserPhone.Length >= 11)

            {

                var phone = UserCenterResourse.UserInfo.Phone;

                var phone = HdlUserCenterResourse.UserInfo.UserPhone;

                phone = phone.Substring(0, 3) + "".PadLeft(phone.Length - 7, '*') + phone.Substring(phone.Length - 4, 4);

                btnPhone.Text = "+" + UserCenterResourse.UserInfo.AreaCode + " " + phone;

                btnPhone.Text = "+" + HdlUserCenterResourse.UserInfo.PhoneAreaCode + " " + phone;

            }

            else

            {

                //或许这是国外的手机吧

                var phone = UserCenterResourse.UserInfo.Phone;

                var phone = HdlUserCenterResourse.UserInfo.UserPhone;

                phone = phone.Substring(0, 3) + "".PadLeft(phone.Length - 5, '*') + phone.Substring(phone.Length - 2, 2);

                btnPhone.Text = "+" + UserCenterResourse.UserInfo.AreaCode + " " + phone;

                btnPhone.Text = "+" + HdlUserCenterResourse.UserInfo.PhoneAreaCode + " " + phone;

            }



            //修改手机号前，请输入验证码确认您的身份

@@ -99,7 +99,11 @@
            btnCodeControl.FinishInputEvent += (value) =>

            {

                //校验验证码

                this.CheckVerificationCode(value);

                if (this.CheckVerificationCode(value) == false)

                {

                    //清空验证码

                    btnCodeControl.ClearInputValue();

                }

            };



            //验证码错误，请重新输入

@@ -133,13 +137,12 @@
        /// <summary>

        /// 发送验证码到手机

        /// </summary>

        private async void SendCodeToPhone(BottomClickButton btnNext)

        private void SendCodeToPhone(BottomClickButton btnNext)

        {

            var sendCodePra = new SendCodePra();



            bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/LoginSendVerCode", false, sendCodePra);

            if (flage == false)

            var errorMsg = HdlAccountLogic.Current.SendVeriCodeToEmail(HdlUserCenterResourse.UserInfo.UserPhone, VerCodeType.A其他);

            if (errorMsg != null)

            {

                HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, errorMsg);

                return;

            }



@@ -161,7 +164,7 @@
                    System.Threading.Thread.Sleep(1000);

                    if (waitime == 0)

                    {

                        Application.RunOnMainThread(() =>

                        HdlThreadLogic.Current.RunMain(() =>

                        {

                            if (btnNext != null)

                            {

@@ -173,13 +176,13 @@
                        });

                        break;

                    }

                    Application.RunOnMainThread(() =>

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        if (btnNext != null)

                        {

                            btnNext.Text = waitime + "s" + repeat;

                        }

                    });

                    }, ShowErrorMode.NO);

                }

            });

        }

@@ -192,77 +195,26 @@
        /// 验证验证码

        /// </summary>

        /// <returns></returns>

        private async void CheckVerificationCode(string code)

        private bool CheckVerificationCode(string code)

        {

            if (this.canCheckCode == false)

            {

                //验证码错误，请重新输入

                this.btnErrorMsg.Visible = true;

                return;

                return false;

            }

            var checkCodePra = new CheckCodePra();

            checkCodePra.Code = code;



            bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);

            if (flage == false)

            var result = HdlAccountLogic.Current.CheckVeriCode(HdlUserCenterResourse.UserInfo.UserPhone, VerCodeType.A其他, code);

            if (result == false)

            {

                //验证码错误，请重新输入

                this.btnErrorMsg.Visible = true;

                return;

                return false;

            }



            var from = new CheckNewPhoneForm();

            base.AddFromAndRemoveNowForm(from);

        }

            base.AddFormAndCloseNowForm(from);



        #endregion



        #region ■ 结构体_____________________________



        /// <summary>

        /// 发送验证码的启动参数

        /// </summary>

        private class SendCodePra

        {

            /// <summary>

            /// 用户账号

            /// </summary>

            public string Account = UserCenterResourse.UserInfo.Phone;

            /// <summary>

            /// 公司编号,国内使用手机短信验证码时，此字段填入0，国外手机短信验证码，此字段填入4 
            /// </summary>

            public int Company = Common.CommonPage.PhoneZoneStr == "86" ? 0 : 4;

            /// <summary>

            /// 语言

            /// </summary>

            public string Language = Shared.Language.CurrentLanguage;

            /// <summary>

            /// 国家地区代码，手机号发送验证码时使用

            /// </summary>

            public int AreaCode = 0;

        }



        /// <summary>

        /// 发送验证码的启动参数

        /// </summary>

        private class CheckCodePra

        {

            /// <summary>

            /// 用户账号

            /// </summary>

            public string Account = UserCenterResourse.UserInfo.Phone;

            /// <summary>

            /// 验证码

            /// </summary>

            public string Code = "0";

            /// <summary>

            /// 语言

            /// </summary>

            public string Language = Shared.Language.CurrentLanguage;

            /// <summary>

            /// 国家地区代码，手机号发送验证码时使用

            /// </summary>

            public int AreaCode = 0;

            return true;

        }



        #endregion