Merge branch 'dev-tzy' into dev-2020xm

xm

2020-06-19 eb5a57942bae8eb57fd7fb61124c247bebb67e8e

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

@@ -314,7 +314,7 @@
            btnColorView.Y = Application.GetRealHeight(5);

            btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnColorView.TextID = R.MyInternationalizationString.uColor;

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEvent);



            int R1 = Convert.ToInt32(this.keyColorData.CloseColorR, 16);

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

@@ -329,13 +329,13 @@
            btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);



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

            btnColor.Gravity = Gravity.Center;

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

            btnColor.BackgroundColor = backColor;

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);



            //变更滑动条的颜色

            seekBar1.ProgressBarColor = backColor;

@@ -344,7 +344,7 @@
            btnRight.UnSelectedImagePath = "Item/RightNext.png";

            btnRight.Y = Application.GetRealHeight(5);

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

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEvent);

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



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

@@ -476,7 +476,7 @@
            btnColorView.Y = Application.GetRealHeight(5);

            btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnColorView.TextID = R.MyInternationalizationString.uColor;

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEvent);



            int R1 = Convert.ToInt32(this.keyColorData.OpenColorR, 16);

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

@@ -491,13 +491,13 @@
            btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);



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

            btnColor.Gravity = Gravity.Center;

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

            btnColor.BackgroundColor = backColor;

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);



            //变更滑动条的颜色

            seekBar1.ProgressBarColor = backColor;

@@ -506,7 +506,7 @@
            btnRight.UnSelectedImagePath = "Item/RightNext.png";

            btnRight.Y = Application.GetRealHeight(5);

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

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEvent);

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



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