代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs

@@ -248,7 +248,7 @@
            btnProgress1.Y = Application.GetRealHeight(29);

            btnProgress1.TextSize = 12;

            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;

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

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

            frameLinght.AddChidren(btnProgress1);



            //进度条

@@ -260,10 +260,10 @@
            {

                btnProgress1.Text = value + "%";

                //数据变更

                linghtLevelInfo.panelDirectionsLevel = value;

                linghtLevelInfo.panelBacklightLevel = value;

                valueChanged = true;

            };

            seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;

            seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;



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

            btnTemp1.X = ControlCommonResourse.XXLeft;

@@ -312,7 +312,7 @@
            btnProgress1.Y = Application.GetRealHeight(369);

            btnProgress1.TextSize = 12;

            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;

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

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

            frameLinght.AddChidren(btnProgress1);



            //进度条

@@ -324,10 +324,10 @@
            {

                btnProgress1.Text = value + "%";

                //数据变更

                linghtLevelInfo.panelBacklightLevel = value;

                linghtLevelInfo.panelDirectionsLevel = value;

                valueChanged = true;

            };

            seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;

            seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;



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

            btnTemp1.X = ControlCommonResourse.XXLeft;