Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -173,12 +173,17 @@
        /// 添加左边图标

        /// </summary>

        /// <param name="i_Iconsize">图标大小</param>

        /// <param name="i_IconPath">图标地址</param>

        /// <returns></returns>

        public IconViewControl AddLeftIcon(int i_Iconsize = 81)

        public IconViewControl AddLeftIcon(int i_Iconsize = 81, string i_IconPath = null)

        {

            var btnIcon = new IconViewControl(i_Iconsize);

            btnIcon.X = ControlCommonResourse.XXLeft + LeftOffset;

            btnIcon.Gravity = Gravity.CenterVertical;

            if (i_IconPath != null)

            {

                btnIcon.UnSelectedImagePath = i_IconPath;

            }

            this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);

            if (chidrenYaxis != 0)

            {