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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -103,7 +103,7 @@
                    form.AddForm();

                };

                //底线

                int lineWidth = btnForgotPsw.GetRealWidthByText(12);

                int lineWidth = btnForgotPsw.GetRealWidthByText();

                var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);

                btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;

                btnLine.Gravity = Gravity.CenterHorizontal;