Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 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;

@@ -191,7 +191,7 @@
            int waitime = 300;

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



            new System.Threading.Thread(() =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                while (this.Parent != null)

                {

@@ -221,8 +221,7 @@
                        }

                    });

                }

            })

            { IsBackground = true }.Start();

            });

        }



        #endregion