优化代码，更改门锁需求接口

xm

2020-04-29 07466c19110693e3e439a7d7c8ad0bc21d9b3287

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

@@ -322,7 +322,9 @@
            //只有简约面板才会有这个菜单

            if (myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleTwo

                || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleThree

                || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleFour)

                || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleFour

                || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FourButtonScene

                || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_TwoButtonCurtain)

            {

                //震动反馈

                var rowContr = new FrameRowControl(listview.rowSpace / 2);

@@ -436,8 +438,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);

@@ -468,12 +470,12 @@
        /// <param name="device">设备对象</param>

        /// <param name="isFirst">是否是第一个</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;

@@ -506,20 +508,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);

            //初始化设备图标

@@ -538,31 +540,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]);

@@ -580,41 +582,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]);