Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs

@@ -42,7 +42,7 @@
        /// <summary>

        /// 做成一个RowLayout型的FrameLayout

        /// </summary>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(真实值,有些界面需要这种特殊操作)</param>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(【列表控件的rowSpace/2】即可,不懂默认为0即可)</param>

        public FrameRowControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)

        {

            this.Height = ControlCommonResourse.ListViewRowHeight;

@@ -331,7 +331,8 @@
            }

            var contr = this.AddLeftCaption(i_caption, i_width, Application.GetRealHeight(60), false);

            contr.TextSize = 15;

            contr.Y = Application.GetRealHeight(12) + this.chidrenYaxis;

            //当指定实际坐标时,这里需要的偏移量为2倍

            contr.Y = Application.GetRealHeight(12) + this.chidrenYaxis * 2;

            this.AddChidren(contr, ChidrenBindMode.BindEventOnly);



            return contr;

@@ -355,7 +356,8 @@
                i_width = Application.GetRealWidth(i_width);

            }

            var contr = this.AddLeftCaption(i_caption, i_width, Application.GetRealHeight(50), false);

            contr.Y = Application.GetRealHeight(72) + this.chidrenYaxis;

            //当指定实际坐标时,这里需要的偏移量为2倍

            contr.Y = Application.GetRealHeight(72) + this.chidrenYaxis * 2;

            contr.TextSize = 12;

            contr.TextColor = UserCenterColor.Current.TextGrayColor1;

            this.AddChidren(contr, ChidrenBindMode.BindEventOnly);