Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -214,6 +214,7 @@
        public MostRightIconControl AddMostRightEmptyIcon(int i_width, int i_height)

        {

            var btnContr = new MostRightIconControl(i_width, i_height);

            btnContr.UseClickStatu = false;

            this.AddChidren(btnContr, ChidrenBindMode.NotBind);

            btnContr.InitControl();

            //复合控件需要特殊处理

@@ -234,6 +235,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>