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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs

@@ -46,7 +46,7 @@
        public MostRightIconControl(int i_width, int i_height)
        {
            this.Width = Application.GetMinRealAverage(110);
            this.Height = Application.GetMinRealAverage(110);
            this.Height = ControlCommonResourse.ListViewRowHeight;
            this.Gravity = Gravity.CenterVertical;

            var XX = Application.CurrentWidth - Application.GetMinRealAverage(i_width) - ControlCommonResourse.XXLeft;