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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 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 = 4;

            btnCode.RadiusEx = 12;

            btnCode.TextID = R.MyInternationalizationString.uGetVerificationCode;

            btnCode.TextColor = UserCenterColor.Current.White;

            btnCode.BackgroundColor = UserCenterColor.Current.TextOrangeColor;

@@ -154,8 +154,6 @@
                if (frameTran.Visible == false)

                {

                    frameTran.Visible = true;

                    //动画效果

                    frameAnimate.Animate = Animate.UpToDown;

                }

            };

        }