代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -230,7 +230,7 @@
            btnProgress1.Y = Application.GetRealHeight(52);

            btnProgress1.TextSize = 12;

            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";

            btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";

            frameBack.AddChidren(btnProgress1);



            //进度条

@@ -241,9 +241,9 @@
            {

                btnProgress1.Text = value + "%";

                //数据变更

                linghtLevelInfo.panelDirectionsLevel = value;

                linghtLevelInfo.panelBacklightLevel = value;

            };

            seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;

            seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;



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

            btnTemp1.X = ControlCommonResourse.XXLeft;

@@ -265,8 +265,8 @@
            var frameColor = new FrameLayoutControl();

            frameColor.UseClickStatu = false;

            frameColor.Width = Application.GetRealHeight(262);

            frameColor.Height = Application.GetMinRealAverage(69);

            frameColor.Y = Application.GetRealHeight(41);

            frameColor.Height = Application.GetMinRealAverage(79);

            frameColor.Y = Application.GetRealHeight(26);

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

            frameBack.AddChidren(frameColor);

            //颜色

@@ -274,6 +274,7 @@
            btnColorView.Gravity = Gravity.CenterVertical;

            btnColorView.TextAlignment = TextAlignment.CenterRight;

            btnColorView.TextSize = 12;

            btnColorView.Y = Application.GetRealHeight(5);

            btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnColorView.TextID = R.MyInternationalizationString.uColor;

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);

@@ -282,7 +283,17 @@
            int G1 = Convert.ToInt32(this.keyColorData.CloseColorG, 16);

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

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

            btnColor.BackgroundColor = backColor;

@@ -293,6 +304,7 @@


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

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

            btnRight.Y = Application.GetRealHeight(5);

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

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

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

@@ -355,7 +367,7 @@
            btnProgress1.Y = Application.GetRealHeight(52);

            btnProgress1.TextSize = 12;

            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";

            btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";

            frameBack.AddChidren(btnProgress1);



            //进度条

@@ -366,9 +378,9 @@
            {

                btnProgress1.Text = value + "%";

                //数据变更

                linghtLevelInfo.panelBacklightLevel = value;

                linghtLevelInfo.panelDirectionsLevel = value;

            };

            seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;

            seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;



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

            btnTemp1.X = ControlCommonResourse.XXLeft;

@@ -390,8 +402,8 @@
            var frameColor = new FrameLayoutControl();

            frameColor.UseClickStatu = false;

            frameColor.Width = Application.GetRealHeight(262);

            frameColor.Height = Application.GetMinRealAverage(69);

            frameColor.Y = Application.GetRealHeight(41);

            frameColor.Height = Application.GetMinRealAverage(79);

            frameColor.Y = Application.GetRealHeight(26);

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

            frameBack.AddChidren(frameColor);

            //颜色

@@ -399,6 +411,7 @@
            btnColorView.Gravity = Gravity.CenterVertical;

            btnColorView.TextAlignment = TextAlignment.CenterRight;

            btnColorView.TextSize = 12;

            btnColorView.Y = Application.GetRealHeight(5);

            btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnColorView.TextID = R.MyInternationalizationString.uColor;

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);

@@ -407,8 +420,18 @@
            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);



            //颜色外框

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

            btnColor.BackgroundColor = backColor;

            frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);

@@ -418,6 +441,7 @@


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

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

            btnRight.Y = Application.GetRealHeight(5);

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

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

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