合并新代码

xm

2020-04-15 bff8993501334c4f3c5f902216fe03253be747f8

 ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs

old mode 100644
new mode 100755
@@ -81,8 +81,8 @@
                //添加背光灯亮度控件【暂时不需要，可能后期新风面板的这个颜色要补回来】
                //this.AddBackLightControl();
                //【暂时不需要，可能后期新风面板的这个颜色要补回来】
                //this.FinishInitControl(listview, energyModeInfo.enable);

                //this.FinishInitControl(listview, energyModeInfo.enable);



                //保存
                var btnSave = new BottomClickButton();

                btnSave.TextID = R.MyInternationalizationString.uSave;

@@ -126,7 +126,7 @@
            btnLevel.X = Application.GetRealWidth(855);

            btnLevel.Y = Application.GetRealHeight(54);

            btnLevel.TextAlignment = TextAlignment.CenterRight;

            btnLevel.TextColor = UserCenterColor.Current.TextGrayColor1;
            btnLevel.TextColor = UserCenterColor.Current.TextGrayColor1;

            frameBack.AddChidren(btnLevel);



            //当前亮度

@@ -152,8 +152,8 @@
            frameBack.AddChidren(seekBar1);

            seekBar1.ProgressChangedEvent += (div, value) =>

            {

                btnProgress1.Text = value.ToString();
                switch (value)

                btnProgress1.Text = value.ToString();

                switch (value)
                {
                    case 1:
                        linghtLevelInfo.panelDirectionsLevel = 20;
@@ -180,8 +180,8 @@
                        btnLevel.Text = "0" + strRank;
                        break;
                }
            };

            };



            if (linghtLevelInfo.panelDirectionsLevel <= 20 && linghtLevelInfo.panelDirectionsLevel > 0)
            {
                btnLevel.Text = "1" + strRank;
@@ -218,7 +218,7 @@
                btnProgress1.Text = "0";
                seekBar1.Progress = 0;
            }



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

            btnTemp1.X = ControlCommonResourse.XXLeft;

            btnTemp1.Y = Application.GetRealHeight(322);

@@ -285,7 +285,7 @@
            frameBack.AddChidren(seekBar1);

            seekBar1.ProgressChangedEvent += (div, value) =>

            {

                btnProgress1.Text = value + "%";
                btnProgress1.Text = value + "%";

            };

            //seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;



@@ -598,10 +598,10 @@
            //}

            //关闭自身

            this.CloseForm();

        }

        }



        #endregion




        #region ■ 补充容器___________________________ 

        /// <summary>

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