Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -164,11 +164,11 @@
            btnNext.CanClick = false;

            //?s后重发

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

            //有效时间300秒

            int waitime = 300;

            //有效时间60秒

            int waitime = 60;

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



            new System.Threading.Thread(() =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                while (this.Parent != null)

                {

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

                    if (waitime == 0)

                    {

                        this.canCheckCode = false;

                        Application.RunOnMainThread(() =>

                        {

                            if (btnNext != null)

@@ -197,8 +196,7 @@
                        }

                    });

                }

            })

            { IsBackground = true }.Start();

            });

        }



        #endregion