请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs

@@ -49,6 +49,7 @@
        public SceneFunctionSwitchControl()

        {

            this.Height = Application.GetRealHeight(90);

            this.Y = Application.GetRealHeight(40);

        }



        /// <summary>

@@ -66,7 +67,7 @@
            {

                btnTemp.Text = listTitleText[i];

                //开始初始化

                XX = this.InitTitleTextControl(i, listTitleText[i], btnTemp.GetTextWidth(), XX);

                XX = this.InitTitleTextControl(i, listTitleText[i], btnTemp.GetRealWidthByText(), XX);

            }

            //回调方法

            this.frameDefult.ButtonClickEvent?.Invoke(null, null);

@@ -89,6 +90,7 @@
            //名称

            var btnName = new NormalViewControl(frameBack.Width, Application.GetRealHeight(63), false);

            btnName.Text = titleText;

            btnName.TextAlignment = TextAlignment.Center;

            if (m_nowSelectIndex == i_index)

            {

                this.frameDefult = frameBack;