新代码

xm

2020-07-20 b02e8275a21dc06bf54b66273485d44e007a2616

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

old mode 100755
new mode 100644
@@ -54,7 +54,7 @@
            set { btnSleepTime.Text = value; }

        }

        /// <summary>

        ///睡眠时间

        ///睡眠时间 
        /// </summary>

        public NormalViewControl btnSleepTime = null;
        #endregion

@@ -133,7 +133,7 @@


        #endregion



        #region ■ 屏幕亮度级别_______________________

        #region ■ 屏幕亮度级别_______________________ 
        /// <summary>

        /// 添加屏幕亮度级别控件

        /// </summary>

@@ -321,17 +321,17 @@
            btnLevelView.Y = Application.GetRealHeight(54);

            btnLevelView.Gravity = Gravity.CenterVertical;

            btnLevelView.TextID = R.MyInternationalizationString.BackgroundLightColor;

            frameBack.AddChidren(btnLevelView);



            frameBack.AddChidren(btnLevelView);

            var frameColor = new FrameLayoutStatuControl();

            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);

            frameBack.AddChidren(frameColor);



            //颜色

            frameColor.Y = Application.GetRealHeight(26);

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

            frameBack.AddChidren(frameColor);

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

            btnColorView.Gravity = Gravity.CenterVertical;

            btnColorView.TextAlignment = TextAlignment.CenterRight;

@@ -344,24 +344,28 @@
            int R1 = Convert.ToInt32(this.keyColorData.OpenColorR, 16);

            int G1 = Convert.ToInt32(this.keyColorData.OpenColorG, 16);

            int B1 = Convert.ToInt32(this.keyColorData.OpenColorB, 16);

            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);

            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);

            //颜色外框
            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 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 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";

            btnRight.Y = Application.GetRealHeight(5);

@@ -371,50 +375,25 @@


            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);

            };

        }

                var form = new PanelColorSelectForm();

                form.AddForm(R1, G1, B1);

                form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>

                {

                    R1 = Rcolor;

                    G1 = Gcolor;

                    B1 = Bcolor;



        /// <summary>

        /// PanelColorSelectForm

        /// </summary>

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

        {

            var form = new PanelColorSelectForm();

            form.AddForm(R1, G1, B1);

            form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>

            {

                R1 = Rcolor;

                G1 = Gcolor;

                B1 = Bcolor;

                    this.keyColorData.OpenColorR = Convert.ToString(Rcolor, 16);

                    this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);

                    this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);



                this.keyColorData.OpenColorR = Convert.ToString(Rcolor, 16);

                this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);

                this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);



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

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

            };

        }



        }
        #endregion



        #region ■ 节能模式行_________________________


        #region ■ 节能模式行_________________________ 
        /// <summary>

        ///  添加节能模式行

        /// </summary>

@@ -513,7 +492,7 @@
            }

            //添加接近感应

            this.AddProximitySensorsRow(frameBack);

            //底线

            //底线  
            var btnLine = new NormalViewControl(965, 5, true);

            btnLine.Height = 1;

            btnLine.X = Application.GetRealWidth(52);

@@ -619,7 +598,7 @@
            };

        }



        #region ■ 显示选择设备睡眠时间_______________

        #region ■ 显示选择设备睡眠时间_______________ 
        /// <summary>

        /// 显示选择设备睡眠时间的界面

        /// </summary>

@@ -747,7 +726,7 @@
        }

        #endregion



        #region ■ 补充容器___________________________

        #region ■ 补充容器___________________________ 
        /// <summary>

        /// 行数超过容器时，补一个空白FrameLayout，使之能滑动

        /// </summary>