Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -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)