Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

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

@@ -81,7 +81,7 @@
            var btnCode = new NormalViewControl(302, 127, true);

            btnCode.X = rowPhone.Right + Application.GetRealWidth(35);

            btnCode.Y = Application.GetRealHeight(23);

            btnCode.Radius = (uint)Application.GetMinRealAverage(4);

            btnCode.Radius = 4;

            btnCode.TextID = R.MyInternationalizationString.uGetVerificationCode;

            btnCode.TextColor = UserCenterColor.Current.White;

            btnCode.BackgroundColor = UserCenterColor.Current.TextOrangeColor;

@@ -187,8 +187,8 @@
            btnCode.BackgroundColor = 0xfffebca9;

            //?s后重发

            string repeat = Language.StringByID(R.MyInternationalizationString.RepeatSend1);

            //有效时间300秒

            int waitime = 300;

            //有效时间60秒

            int waitime = 60;

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



            HdlThreadLogic.Current.RunThread(() =>

@@ -199,7 +199,6 @@
                    System.Threading.Thread.Sleep(1000);

                    if (waitime == 0)

                    {

                        this.canCheckCode = false;

                        Application.RunOnMainThread(() =>

                        {

                            if (btnCode != null)

@@ -305,7 +304,7 @@
            /// </summary>

            public string Account = UserCenterResourse.UserInfo.Phone;

            /// <summary>

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

            /// </summary>

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

            /// <summary>