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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 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();

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

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

            if (chidrenYaxis != 0)

            {

                btnContr.Y += chidrenYaxis;

                btnContr.btnIcon.Y += chidrenYaxis;

            }



            return btnContr;

@@ -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>