上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs

@@ -417,8 +417,8 @@
            var frameBorder = new FrameLayout();

            frameBorder.Y = Application.GetRealHeight(150);

            frameBorder.Gravity = Gravity.CenterHorizontal;

            frameBorder.Width = Application.GetMinRealAverage(426);

            frameBorder.Height = Application.GetMinRealAverage(426);

            frameBorder.Width = this.GetPictrueRealSize(426);

            frameBorder.Height = this.GetPictrueRealSize(426);

            listBackControl.frameTable.AddChidren(frameBorder);



            var btnPic = new PicViewControl(frameBorder.Width, frameBorder.Height, false);

@@ -453,14 +453,14 @@
        /// <returns></returns>

        private NormalViewControl InitDeviceButtonControl(FrameLayout frame, CommonDevice device)

        {

            var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);

            var btnIcon = new NormalViewControl(this.GetPictrueRealSize(52), this.GetPictrueRealSize(52), false);

            btnIcon.Text = "Button" + device.DeviceEpoint;

            btnIcon.TextAlignment = TextAlignment.Center;

            btnIcon.TextColor = UserCenterColor.Current.TextGrayColor1;

            if (frame is FrameLayoutControl)

            if (frame is FrameLayoutStatuControl)

            {

                ((FrameLayoutControl)frame).AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);

                ((FrameLayoutControl)frame).ButtonClickEvent += (sender, e) =>

                ((FrameLayoutStatuControl)frame).AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);

                ((FrameLayoutStatuControl)frame).ButtonClickEvent += (sender, e) =>

                {

                    //按键点击

                    this.DeviceEpointSelectEvent(btnIcon, null);

@@ -498,15 +498,15 @@
        {

            //按键1

            var btnButton1 = this.InitDeviceButtonControl(frameBack, listDevice[0]);

            btnButton1.Height = Application.GetMinRealAverage(175);

            btnButton1.Width = Application.GetMinRealAverage(361);

            btnButton1.Y = Application.GetMinRealAverage(39);

            btnButton1.Height = this.GetPictrueRealSize(175);

            btnButton1.Width = this.GetPictrueRealSize(361);

            btnButton1.Y = this.GetPictrueRealSize(39);

            btnButton1.Gravity = Gravity.CenterHorizontal;



            //按键2

            var btnButton2 = this.InitDeviceButtonControl(frameBack, listDevice[1]);

            btnButton2.Height = Application.GetMinRealAverage(175);

            btnButton2.Width = Application.GetMinRealAverage(361);

            btnButton2.Height = this.GetPictrueRealSize(175);

            btnButton2.Width = this.GetPictrueRealSize(361);

            btnButton2.Y = btnButton1.Bottom;

            btnButton2.Gravity = Gravity.CenterHorizontal;

        }

@@ -525,32 +525,32 @@
            //按键1

            var btnButton1 = this.InitDeviceButtonControl(frameBack, listDevice[0]);

            btnButton1.TextSize = 12;

            btnButton1.Height = Application.GetMinRealAverage(175);

            btnButton1.Width = Application.GetMinRealAverage(183);

            btnButton1.X = Application.GetMinRealAverage(34);

            btnButton1.Y = Application.GetMinRealAverage(30);

            btnButton1.Height = this.GetPictrueRealSize(175);

            btnButton1.Width = this.GetPictrueRealSize(183);

            btnButton1.X = this.GetPictrueRealSize(34);

            btnButton1.Y = this.GetPictrueRealSize(30);



            //按键2

            var btnButton2 = this.InitDeviceButtonControl(frameBack, listDevice[1]);

            btnButton2.TextSize = 12;

            btnButton2.Height = Application.GetMinRealAverage(175);

            btnButton2.Width = Application.GetMinRealAverage(183);

            btnButton2.Height = this.GetPictrueRealSize(175);

            btnButton2.Width = this.GetPictrueRealSize(183);

            btnButton2.X = btnButton1.Right;

            btnButton2.Y = btnButton1.Y;



            //按键3

            var btnButton3 = this.InitDeviceButtonControl(frameBack, listDevice[2]);

            btnButton3.TextSize = 12;

            btnButton3.Height = Application.GetMinRealAverage(175);

            btnButton3.Width = Application.GetMinRealAverage(183);

            btnButton3.Height = this.GetPictrueRealSize(175);

            btnButton3.Width = this.GetPictrueRealSize(183);

            btnButton3.X = btnButton1.X;

            btnButton3.Y = btnButton1.Bottom + Application.GetMinRealAverage(4);

            btnButton3.Y = btnButton1.Bottom + this.GetPictrueRealSize(4);



            //按键4

            var btnButton4 = this.InitDeviceButtonControl(frameBack, listDevice[3]);

            btnButton4.TextSize = 12;

            btnButton4.Height = Application.GetMinRealAverage(175);

            btnButton4.Width = Application.GetMinRealAverage(183);

            btnButton4.Height = this.GetPictrueRealSize(175);

            btnButton4.Width = this.GetPictrueRealSize(183);

            btnButton4.X = btnButton2.X;

            btnButton4.Y = btnButton3.Y;

        }

@@ -568,10 +568,10 @@
        {

            //按键1～按键2

            var frame1 = new FrameLayout();

            frame1.X = Application.GetMinRealAverage(34);

            frame1.Y = Application.GetMinRealAverage(30);

            frame1.Height = Application.GetMinRealAverage(183);

            frame1.Width = Application.GetMinRealAverage(183);

            frame1.X = this.GetPictrueRealSize(34);

            frame1.Y = this.GetPictrueRealSize(30);

            frame1.Height = this.GetPictrueRealSize(183);

            frame1.Width = this.GetPictrueRealSize(183);

            frameBack.AddChidren(frame1);

            this.InitEightButtonPanelIcon(frame1, listDevice[0], listDevice[1]);



@@ -587,7 +587,7 @@
            //按键5～按键6

            var frame3 = new FrameLayout();

            frame3.X = frame1.X;

            frame3.Y = frame1.Bottom + Application.GetMinRealAverage(4);

            frame3.Y = frame1.Bottom + this.GetPictrueRealSize(4);

            frame3.Height = frame1.Height;

            frame3.Width = frame1.Width;

            frameBack.AddChidren(frame3);

@@ -596,7 +596,7 @@
            //按键7～按键8

            var frame4 = new FrameLayout();

            frame4.X = frame1.Right;

            frame4.Y = frame1.Bottom + Application.GetMinRealAverage(4);

            frame4.Y = frame1.Bottom + this.GetPictrueRealSize(4);

            frame4.Height = frame1.Height;

            frame4.Width = frame1.Width;

            frameBack.AddChidren(frame4);

@@ -612,19 +612,19 @@
        private void InitEightButtonPanelIcon(FrameLayout frameBack, CommonDevice device1, CommonDevice device2)

        {

            //按键1

            var frameButton1 = new FrameLayoutControl();

            var frameButton1 = new FrameLayoutStatuControl();

            frameButton1.UseClickStatu = false;

            frameButton1.Height = Application.GetMinRealAverage(92);

            frameButton1.Width = Application.GetMinRealAverage(183);

            frameButton1.Height = this.GetPictrueRealSize(92);

            frameButton1.Width = this.GetPictrueRealSize(183);

            frameBack.AddChidren(frameButton1);

            var btnButton1 = this.InitDeviceButtonControl(frameButton1, device1);

            btnButton1.TextSize = 10;

            btnButton1.Height = Application.GetMinRealAverage(35);

            btnButton1.Width = Application.GetMinRealAverage(183);

            btnButton1.Y = Application.GetMinRealAverage(37);

            btnButton1.Height = this.GetPictrueRealSize(35);

            btnButton1.Width = this.GetPictrueRealSize(183);

            btnButton1.Y = this.GetPictrueRealSize(37);



            //按键2

            var frameButton2 = new FrameLayoutControl();

            var frameButton2 = new FrameLayoutStatuControl();

            frameButton2.UseClickStatu = false;

            frameButton2.Height = frameButton1.Height;

            frameButton2.Width = frameButton1.Width;

@@ -634,7 +634,7 @@
            btnButton2.TextSize = 10;

            btnButton2.Height = btnButton1.Height;

            btnButton2.Width = btnButton1.Width;

            btnButton2.Y = Application.GetMinRealAverage(20);

            btnButton2.Y = this.GetPictrueRealSize(20);

        }



        #endregion