合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -43,19 +43,21 @@
        public void InitControl()

        {

            var btnTemp = new NormalViewControl(10, 10, false);

            btnTemp.TextSize = 16;

            btnTemp.TextID = R.MyInternationalizationString.uScence;



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

            var frameScene = new FrameLayoutControl();

            frameScene.UseClickStatu = false;

            frameScene.Height = Application.GetRealHeight(90);

            frameScene.Width = btnTemp.GetRealWidthByText(16);

            frameScene.Width = btnTemp.GetRealWidthByText();

            frameScene.X = ControlCommonResourse.XXLeft;

            this.AddChidren(frameScene);

            //场景

            var btnScene = new NormalViewControl(frameScene.Width, Application.GetRealHeight(63), false);

            btnScene.Text = btnTemp.Text;

            btnScene.TextSize = 16;

            btnScene.IsBold = true;

            btnScene.TextColor = UserCenterColor.Current.TextColor2;

            frameScene.AddChidren(btnScene, ChidrenBindMode.BindEventOnly);

            //底线

@@ -71,7 +73,7 @@
            var frameFunc = new FrameLayoutControl();

            frameFunc.UseClickStatu = false;

            frameFunc.Height = Application.GetRealHeight(90);

            frameFunc.Width = btnTemp.GetRealWidthByText(16);

            frameFunc.Width = btnTemp.GetRealWidthByText();

            frameFunc.X = frameScene.Right + Application.GetRealWidth(58);

            this.AddChidren(frameFunc);

            //功能

@@ -98,8 +100,10 @@
                this.m_nowSelectIndex = 1;



                btnScene.TextSize = 16;

                btnScene.IsBold = true;

                btnScene.TextColor = UserCenterColor.Current.TextColor2;

                btnFunc.TextSize = 14;

                btnFunc.IsBold = false;

                btnFunc.TextColor = UserCenterColor.Current.TextGrayColor3;

                btnSceneLine.Visible = true;

                btnFuncLine.Visible = false;

@@ -117,8 +121,10 @@
                this.m_nowSelectIndex = 2;



                btnScene.TextSize = 14;

                btnScene.IsBold = false;

                btnScene.TextColor = UserCenterColor.Current.TextGrayColor3;

                btnFunc.TextSize = 16;

                btnFunc.IsBold = true;

                btnFunc.TextColor = UserCenterColor.Current.TextColor2;

                btnFuncLine.Visible = true;

                btnSceneLine.Visible = false;