合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -43,13 +43,14 @@
        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);

            //场景

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

            //功能