请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -40,7 +40,7 @@
        /// <param name="i_listdevice">面板设备的全部回路</param>

        public void ShowForm(Panel i_panel)

        {

            UserView.HomePage.Instance.ScrollEnabled = false;

            this.ScrollEnabled = false;



            this.panelDevice = i_panel;



@@ -112,6 +112,10 @@
            frameBack.Height = Application.GetRealHeight(170);

            bodyFrameLayout.AddChidren(frameBack);



            //当前亮度(先声明,为了对应IOS的折叠后,没有完全遮挡的问题)

            var btnProgressView1 = new NormalViewControl(200, 49, true);

            var btnProgress1 = new NormalViewControl(200, 49, true);



            //节能模式

            frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uEnergyConservationMode), 400);

            //开关控件

@@ -126,11 +130,15 @@
                {

                    frameBack.Height += value;

                    frameLinght.Y += value;

                    btnProgressView1.Visible = true;

                    btnProgress1.Visible = true;

                }

                else

                {

                    frameBack.Height -= value;

                    frameLinght.Y -= value;

                    btnProgressView1.Visible = false;

                    btnProgress1.Visible = false;

                }

            };

            if (energyModeInfo.enable == true)

@@ -139,20 +147,20 @@
            }



            //当前亮度

            var btnProgressView1 = new NormalViewControl(200, 49, true);

            btnProgressView1.X = ControlCommonResourse.XXLeft;

            btnProgressView1.Y = Application.GetRealHeight(164);

            btnProgressView1.TextSize = 12;

            btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;

            frameBack.AddChidren(btnProgressView1);

            var btnProgress1 = new NormalViewControl(200, 49, true);

            btnProgressView1.Visible = false;

            btnProgress1.X = Application.GetRealWidth(222);

            btnProgress1.Y = Application.GetRealHeight(164);

            btnProgress1.TextSize = 12;

            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnProgress1.Text = energyModeInfo.level + "%";

            frameBack.AddChidren(btnProgress1);

            btnProgress1.Visible = false;



            //进度条

            var seekBar1 = new SeekBarControl();

@@ -190,6 +198,9 @@
                var value = Application.GetRealHeight(259);

                frameBack.Height += value;

                frameLinght.Y += value;



                btnProgressView1.Visible = true;

                btnProgress1.Visible = true;

            }

        }



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



            //颜色外框

            var btnColorLine = new NormalViewControl(Application.GetMinRealAverage(79), Application.GetMinRealAverage(79), false);

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

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

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xff666666;

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);

            var frameColorLine = new FrameLayoutControl();

            frameColorLine.UseClickStatu = false;

            frameColorLine.Height = Application.GetMinRealAverage(79);

            frameColorLine.Width = Application.GetMinRealAverage(79);

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

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

            frameColorLine.BorderWidth = 1;

            frameColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);



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

            btnColor.Y = Application.GetRealHeight(5);

            btnColor.X = btnColorView.Right + Application.GetRealHeight(23);

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

            //分两步计算，不然有可能它得出的结果有误差导致不居中

            int btnColorWidth = frameColorLine.Height - Application.GetMinRealAverage(7) - Application.GetMinRealAverage(7);

            var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);

            btnColor.Gravity = Gravity.Center;

            btnColor.Radius = (uint)btnColorWidth / 2;

            btnColor.BackgroundColor = backColor;

            frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);

            frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);

            frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEventOnly);



            //变更滑动条的颜色

            seekBar1.ProgressBarColor = backColor;



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

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

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

            btnRight.Y = Application.GetRealHeight(5);

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

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

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



            //颜色外框

            var btnColorLine = new NormalViewControl(Application.GetMinRealAverage(79), Application.GetMinRealAverage(79), false);

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

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

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xff666666;

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);

            var frameColorLine = new FrameLayoutControl();

            frameColorLine.UseClickStatu = false;

            frameColorLine.Height = Application.GetMinRealAverage(79);

            frameColorLine.Width = Application.GetMinRealAverage(79);

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

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

            frameColorLine.BorderWidth = 1;

            frameColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);



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

            btnColor.X = btnColorView.Right + Application.GetRealHeight(23);

            btnColor.Y = Application.GetRealHeight(5);

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

            //分两步计算，不然有可能它得出的结果有误差导致不居中

            int btnColorWidth = frameColorLine.Height - Application.GetMinRealAverage(7) - Application.GetMinRealAverage(7);

            var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);

            btnColor.Gravity = Gravity.Center;

            btnColor.Radius = (uint)btnColorWidth / 2;

            btnColor.BackgroundColor = backColor;

            frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);

            frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);

            frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEventOnly);



            //变更滑动条的颜色

            seekBar1.ProgressBarColor = backColor;



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

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

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

            btnRight.Y = Application.GetRealHeight(5);

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

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

@@ -557,20 +578,6 @@
        private uint GetColorByRGB(byte R, byte G, byte B)

        {

            return (uint)(0xFF000000 + R * 256 * 256 + G * 256 + B);

        }



        #endregion



        #region ■ 界面关闭___________________________



        /// <summary>

        /// 界面关闭

        /// </summary>

        public override void CloseFormBefore()

        {

            UserView.HomePage.Instance.ScrollEnabled = true;



            base.CloseFormBefore();

        }



        #endregion