新代码

xm

2020-07-20 b02e8275a21dc06bf54b66273485d44e007a2616

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

old mode 100755
new mode 100644
@@ -327,8 +327,8 @@
            frameColor.UseClickStatu = false;

            frameColor.Width = Application.GetRealHeight(262);

            frameColor.Height = this.GetPictrueRealSize(79);

            frameColor.Gravity = Gravity.CenterVertical;

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

            frameColor.Y = Application.GetRealHeight(26);

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

            frameBack.AddChidren(frameColor);



            //颜色

@@ -347,20 +347,24 @@
            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);



            //颜色外框

            var btnColorLine = new FrameLayoutStatuControl();

            btnColorLine.Width = Application.GetRealHeight(79);

            btnColorLine.Height = this.GetPictrueRealSize(79);

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

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

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);

            var frameColorLine = new FrameLayoutStatuControl();

            frameColorLine.UseClickStatu = false;

            frameColorLine.Height = this.GetPictrueRealSize(79);

            frameColorLine.Width = this.GetPictrueRealSize(79);

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

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

            frameColorLine.BorderWidth = 1;

            frameColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);



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

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

            int btnColorWidth = frameColorLine.Height - this.GetPictrueRealSize(7) - this.GetPictrueRealSize(7);

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

            btnColor.Gravity = Gravity.Center;

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

            btnColor.Radius = (uint)btnColorWidth / 2;

            btnColor.BackgroundColor = backColor;

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);

            frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);

            frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEvent);


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

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

@@ -370,31 +374,6 @@
            btnRight.Y += this.GetPictrueRealSize(8);



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

            {

                PanelColor(btnColor, R1, G1, B1);

            };

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

            {

                PanelColor(btnColor, R1, G1, B1);

            };

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

            {

                PanelColor(btnColor, R1, G1, B1);

            };

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

            {

                PanelColor(btnColor, R1, G1, B1);

            };

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

            {

                PanelColor(btnColor, R1, G1, B1);

            };

        }



        /// <summary>

        /// PanelColorSelectForm

        /// </summary>

        private void PanelColor(NormalViewControl btnColor, int R1, int G1, int B1)

        {

            var form = new PanelColorSelectForm();

            form.AddForm(R1, G1, B1);

@@ -410,8 +389,8 @@


                btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);

            };

            };

        }



        #endregion



        #region ■ 节能模式行_________________________