Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

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

@@ -141,14 +141,14 @@
            //当前亮度

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

            btnProgressView1.X = ControlCommonResourse.XXLeft;
            btnProgressView1.Y = Application.GetRealHeight(161);

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

            btnProgress1.X = Application.GetRealWidth(222);
            btnProgress1.Y = Application.GetRealHeight(158);

            btnProgress1.Y = Application.GetRealHeight(164);

            btnProgress1.TextSize = 12;
            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
            btnProgress1.Text = energyModeInfo.level + "%";
@@ -297,13 +297,12 @@
            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);

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

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

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

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

            btnColor.BackgroundColor = backColor;

            frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);



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

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

            btnRight.BackgroundColor = UserCenterColor.Current.Green;

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

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

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

@@ -425,13 +424,12 @@
            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);

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

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

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

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

            btnColor.BackgroundColor = backColor;

            frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);



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

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

            btnRight.BackgroundColor = UserCenterColor.Current.Green;

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

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

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