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

xm

2020-04-29 07466c19110693e3e439a7d7c8ad0bc21d9b3287

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

old mode 100644
new mode 100755
@@ -299,16 +299,16 @@
            btnTemp2.Text = "100%";

            frameBack.AddChidren(btnTemp2);



            var frameColor = new FrameLayoutControl();

            var frameColor = new FrameLayoutStatuControl();

            frameColor.UseClickStatu = false;

            frameColor.Width = Application.GetRealHeight(262);

            frameColor.Height = Application.GetMinRealAverage(79);

            frameColor.Height = this.GetPictrueRealSize(79);

            frameColor.Y = Application.GetRealHeight(26);

            frameColor.X = listview.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);

            frameBack.AddChidren(frameColor);



            //颜色

            var btnColorView = new NormalViewControl(Application.GetRealHeight(110), Application.GetMinRealAverage(49), false);

            var btnColorView = new NormalViewControl(Application.GetRealHeight(110), this.GetPictrueRealSize(49), false);

            btnColorView.Gravity = Gravity.CenterVertical;

            btnColorView.TextAlignment = TextAlignment.CenterRight;

            btnColorView.TextSize = 12;

@@ -323,30 +323,30 @@
            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);

            //颜色外框 
            var btnColorLine = new FrameLayoutControl();
            var btnColorLine = new FrameLayoutStatuControl();

            btnColorLine.Width = Application.GetRealHeight(79);

            btnColorLine.Height = Application.GetMinRealAverage(79);
            btnColorLine.Height = this.GetPictrueRealSize(79);

            btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);

            btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;

            btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xffcccccc;
            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);



            var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);

            var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);

            btnColor.Gravity = Gravity.Center;

            btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;

            btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;

            btnColor.BackgroundColor = backColor;

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);



            //变更滑动条的颜色

            seekBar1.ProgressBarColor = backColor;



            var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);

            var btnRight = new NormalViewControl(this.GetPictrueRealSize(58), this.GetPictrueRealSize(58), false);

            btnRight.UnSelectedImagePath = "Item/RightNext.png";

            btnRight.Y = Application.GetRealHeight(5);

            btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);

            btnRight.X = frameColor.Width - this.GetPictrueRealSize(58);

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

            btnRight.Y += Application.GetMinRealAverage(8);

            btnRight.Y += this.GetPictrueRealSize(8);



            frameColor.ButtonClickEvent += (sender, e) =>

            {

@@ -437,16 +437,16 @@
            btnTemp2.Text = "100%";

            frameBack.AddChidren(btnTemp2);



            var frameColor = new FrameLayoutControl();

            var frameColor = new FrameLayoutStatuControl();

            frameColor.UseClickStatu = false;

            frameColor.Width = Application.GetRealHeight(262);

            frameColor.Height = Application.GetMinRealAverage(79);

            frameColor.Height = this.GetPictrueRealSize(79);

            frameColor.Y = Application.GetRealHeight(26);

            frameColor.X = listview.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);

            frameBack.AddChidren(frameColor);

            //颜色
            var btnColorView = new NormalViewControl(Application.GetRealHeight(110), Application.GetMinRealAverage(49), false);

            var btnColorView = new NormalViewControl(Application.GetRealHeight(110), this.GetPictrueRealSize(49), false);

            btnColorView.Gravity = Gravity.CenterVertical;

            btnColorView.TextAlignment = TextAlignment.CenterRight;

            btnColorView.TextSize = 12;

@@ -461,30 +461,30 @@
            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);

            //颜色外框
            var btnColorLine = new FrameLayoutControl();
            var btnColorLine = new FrameLayoutStatuControl();

            btnColorLine.Width = Application.GetRealHeight(79);

            btnColorLine.Height = Application.GetMinRealAverage(79);
            btnColorLine.Height = this.GetPictrueRealSize(79);

            btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);

            btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;

            btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xffcccccc;
            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);

            var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
            var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);

            btnColor.Gravity = Gravity.Center;

            btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;

            btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;

            btnColor.BackgroundColor = backColor;

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);



            //变更滑动条的颜色

            seekBar1.ProgressBarColor = backColor;



            var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);

            var btnRight = new NormalViewControl(this.GetPictrueRealSize(58), this.GetPictrueRealSize(58), false);

            btnRight.UnSelectedImagePath = "Item/RightNext.png";

            btnRight.Y = Application.GetRealHeight(5);

            btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);

            btnRight.X = frameColor.Width - this.GetPictrueRealSize(58);

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

            btnRight.Y += Application.GetMinRealAverage(8);

            btnRight.Y += this.GetPictrueRealSize(8);



            frameColor.ButtonClickEvent += (sender, e) =>

            {

@@ -576,7 +576,7 @@


            //节能模式修改(他们说随便一个回路就行)

            //肖志豪给按键控制面板（四开八控）设备，说默认15秒时间，这样接近感应功能才合理

            energyModeInfo.time = 4094;

            energyModeInfo.time = 15;

            result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);

            if (result == false)

            {