Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -226,7 +226,7 @@
            this.rightIconSize = Application.GetMinRealAverage(i_width);

            if (chidrenYaxis != 0)

            {

                btnContr.Y += chidrenYaxis;

                btnContr.btnIcon.Y += chidrenYaxis;

            }



            return btnContr;

@@ -234,6 +234,24 @@


        #endregion



        #region ■ 添加右边的开关图标_________________



        /// <summary>

        /// 添加右边的开关图标

        /// </summary>

        /// <returns></returns>

        public MostRightIconControl AddMostRightSwitchIcon()

        {

            var btnSwitch = this.AddMostRightEmptyIcon(104, 63);

            this.ChangedChidrenBindMode(btnSwitch, ChidrenBindMode.NotBind);

            btnSwitch.UnSelectedImagePath = "Item/Switch2.png";

            btnSwitch.SelectedImagePath = "Item/Switch2Selected.png";



            return btnSwitch;

        }



        #endregion



        #region ■ 添加最右的显示文本_________________



        /// <summary>