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

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs

@@ -83,6 +83,7 @@
            this.Height = Application.GetMinRealAverage(NumberSize * 4 + NumberTopButtomSpace * 3) + Application.GetRealHeight(368);

            this.btnTitle = new NormalViewControl(Application.CurrentWidth, Application.GetRealWidth(75), false);

            btnTitle.Text = i_title;

            btnTitle.IsBold = true;

        }



        /// <summary>