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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.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;

@@ -290,6 +290,7 @@
            this.CloseForm();

            //指定新建密码模式

            this.LoadFormMethodByName("EditorSecondaryPasswordForm", "SetNewPasswordFormMode");

            this.LoadFormMethodByName("EditorGesturePasswordForm", "SetNewPasswordFormMode");

        }



        #endregion