Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

@@ -37,7 +37,7 @@
        /// <summary>

        /// 默认的那个菜单

        /// </summary>

        private FrameLayoutControl frameDefult = null;

        private FrameLayoutStatuControl frameDefult = null;



        #endregion



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

@@ -80,7 +81,7 @@
        private int InitTitleTextControl(int i_index, string titleText, int realWidth, int XX)

        {

            //场景框(点击范围有点小，需要扩大它的点击范围)

            var frameBack = new FrameLayoutControl();

            var frameBack = new FrameLayoutStatuControl();

            frameBack.UseClickStatu = false;

            frameBack.Height = Application.GetRealHeight(90);

            frameBack.Width = realWidth;

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