上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

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

@@ -144,6 +144,10 @@
                    {

                        device.IconPath = "Device/Light.png";

                    }

                    else

                    {

                        device.IconPath = "Device/RelayEpoint.png";

                    }

                    device.ReSave();

                }

                this.CloseProgressBar();

@@ -332,10 +336,19 @@
                        var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);



                        var form = new BottomItemSelectForm();

                        form.CancelCallEvent = true;//允许取消

                        form.AddForm(title, listText, nowSelectNo);

                        form.FinishSelectEvent += (selectNo) =>

                        {

                            btnFunction.Text = listText[selectNo];

                            if (selectNo == -1)

                            {

                                //选择取消

                                btnFunction.Text = string.Empty;

                            }

                            else

                            {

                                btnFunction.Text = listText[selectNo];

                            }

                            nowSelectNo = selectNo;

                            //记录起当前选择的功能类型

                            if (selectNo == 0)

@@ -346,9 +359,13 @@
                            {

                                dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A灯光;

                            }

                            else

                            else if (selectNo == 2)

                            {

                                dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A插座;

                            }

                            else

                            {

                                dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A未定义;

                            }

                        };

                    };

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

@@ -431,12 +448,12 @@
        /// <param name="frame">扩大点击区域的容器</param>

        /// <param name="device">设备对象</param>

        /// <returns></returns>

        private void InitDeviceIcon(FrameLayoutControl frame, CommonDevice device)

        private void InitDeviceIcon(FrameLayoutStatuControl frame, CommonDevice device)

        {

            //不使用点击特效

            frame.UseClickStatu = false;



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

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

            btnIcon.Name = "btn" + device.DeviceEpoint;

            btnIcon.Gravity = Gravity.Center;

            btnIcon.RadiusEx = 16;

@@ -469,20 +486,20 @@
        private void InitTwoButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)

        {

            //按键1

            var frame1 = new FrameLayoutControl();

            frame1.Height = Application.GetMinRealAverage(110);

            frame1.Width = Application.GetMinRealAverage(110);

            frame1.Y = Application.GetMinRealAverage(63);

            var frame1 = new FrameLayoutStatuControl();

            frame1.Height = this.GetPictrueRealSize(110);

            frame1.Width = this.GetPictrueRealSize(110);

            frame1.Y = this.GetPictrueRealSize(63);

            frame1.Gravity = Gravity.CenterHorizontal;

            frameBack.AddChidren(frame1);

            //初始化设备图标

            this.InitDeviceIcon(frame1, listDevice[0]);



            //按键2

            var frame2 = new FrameLayoutControl();

            frame2.Height = Application.GetMinRealAverage(110);

            frame2.Width = Application.GetMinRealAverage(110);

            frame2.Y = Application.GetMinRealAverage(245);

            var frame2 = new FrameLayoutStatuControl();

            frame2.Height = this.GetPictrueRealSize(110);

            frame2.Width = this.GetPictrueRealSize(110);

            frame2.Y = this.GetPictrueRealSize(245);

            frame2.Gravity = Gravity.CenterHorizontal;

            frameBack.AddChidren(frame2);

            //初始化设备图标

@@ -501,31 +518,31 @@
        private void InitThreeButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)

        {

            //按键1

            var frame1 = new FrameLayoutControl();

            frame1.Height = Application.GetMinRealAverage(110);

            frame1.Width = Application.GetMinRealAverage(110);

            frame1.Y = Application.GetMinRealAverage(63);

            var frame1 = new FrameLayoutStatuControl();

            frame1.Height = this.GetPictrueRealSize(110);

            frame1.Width = this.GetPictrueRealSize(110);

            frame1.Y = this.GetPictrueRealSize(63);

            frame1.Gravity = Gravity.CenterHorizontal;

            frameBack.AddChidren(frame1);

            //初始化设备图标

            this.InitDeviceIcon(frame1, listDevice[0]);



            //按键2

            var frame2 = new FrameLayoutControl();

            frame2.Height = Application.GetMinRealAverage(110);

            frame2.Width = Application.GetMinRealAverage(110);

            frame2.X = Application.GetMinRealAverage(63);

            frame2.Y = Application.GetMinRealAverage(245);

            var frame2 = new FrameLayoutStatuControl();

            frame2.Height = this.GetPictrueRealSize(110);

            frame2.Width = this.GetPictrueRealSize(110);

            frame2.X = this.GetPictrueRealSize(63);

            frame2.Y = this.GetPictrueRealSize(245);

            frameBack.AddChidren(frame2);

            //初始化设备图标

            this.InitDeviceIcon(frame2, listDevice[1]);



            //按键3

            var frame3 = new FrameLayoutControl();

            frame3.Height = Application.GetMinRealAverage(110);

            frame3.Width = Application.GetMinRealAverage(110);

            frame3.X = Application.GetMinRealAverage(245);

            frame3.Y = Application.GetMinRealAverage(245);

            var frame3 = new FrameLayoutStatuControl();

            frame3.Height = this.GetPictrueRealSize(110);

            frame3.Width = this.GetPictrueRealSize(110);

            frame3.X = this.GetPictrueRealSize(245);

            frame3.Y = this.GetPictrueRealSize(245);

            frameBack.AddChidren(frame3);

            //初始化设备图标

            this.InitDeviceIcon(frame3, listDevice[2]);

@@ -543,41 +560,41 @@
        private void InitFourButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)

        {

            //按键1

            var frame1 = new FrameLayoutControl();

            frame1.Height = Application.GetMinRealAverage(110);

            frame1.Width = Application.GetMinRealAverage(110);

            frame1.X = Application.GetMinRealAverage(63);

            frame1.Y = Application.GetMinRealAverage(63);

            var frame1 = new FrameLayoutStatuControl();

            frame1.Height = this.GetPictrueRealSize(110);

            frame1.Width = this.GetPictrueRealSize(110);

            frame1.X = this.GetPictrueRealSize(63);

            frame1.Y = this.GetPictrueRealSize(63);

            frameBack.AddChidren(frame1);

            //初始化设备图标

            this.InitDeviceIcon(frame1, listDevice[0]);



            //按键2

            var frame2 = new FrameLayoutControl();

            frame2.Height = Application.GetMinRealAverage(110);

            frame2.Width = Application.GetMinRealAverage(110);

            frame2.X = Application.GetMinRealAverage(245);

            frame2.Y = Application.GetMinRealAverage(63);

            var frame2 = new FrameLayoutStatuControl();

            frame2.Height = this.GetPictrueRealSize(110);

            frame2.Width = this.GetPictrueRealSize(110);

            frame2.X = this.GetPictrueRealSize(245);

            frame2.Y = this.GetPictrueRealSize(63);

            frameBack.AddChidren(frame2);

            //初始化设备图标

            this.InitDeviceIcon(frame2, listDevice[1]);



            //按键3

            var frame3 = new FrameLayoutControl();

            frame3.Height = Application.GetMinRealAverage(110);

            frame3.Width = Application.GetMinRealAverage(110);

            frame3.X = Application.GetMinRealAverage(63);

            frame3.Y = Application.GetMinRealAverage(245);

            var frame3 = new FrameLayoutStatuControl();

            frame3.Height = this.GetPictrueRealSize(110);

            frame3.Width = this.GetPictrueRealSize(110);

            frame3.X = this.GetPictrueRealSize(63);

            frame3.Y = this.GetPictrueRealSize(245);

            frameBack.AddChidren(frame3);

            //初始化设备图标

            this.InitDeviceIcon(frame3, listDevice[2]);



            //按键4

            var frame4 = new FrameLayoutControl();

            frame4.Height = Application.GetMinRealAverage(110);

            frame4.Width = Application.GetMinRealAverage(110);

            frame4.X = Application.GetMinRealAverage(245);

            frame4.Y = Application.GetMinRealAverage(245);

            var frame4 = new FrameLayoutStatuControl();

            frame4.Height = this.GetPictrueRealSize(110);

            frame4.Width = this.GetPictrueRealSize(110);

            frame4.X = this.GetPictrueRealSize(245);

            frame4.Y = this.GetPictrueRealSize(245);

            frameBack.AddChidren(frame4);

            //初始化设备图标

            this.InitDeviceIcon(frame4, listDevice[3]);