合并代码

xm

2020-04-22 dfa6733793434bdcfd394f978ae72f1628b2260f

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

old mode 100755
new mode 100644
@@ -152,12 +152,22 @@
            frameBack.AddChidren(seekBar1);

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

            {

                if (value == 0)
                {
                    btnProgress1.Text = (value + 1).ToString();
                }
                else
                {
                btnProgress1.Text = value.ToString();

                }

                switch (value)
                {
                    case 0:
                    case 1:
                        linghtLevelInfo.panelDirectionsLevel = 20;
                        btnLevel.Text = "1" + strRank;

                        break;
                    case 2:
                        linghtLevelInfo.panelDirectionsLevel = 40;
@@ -175,14 +185,22 @@
                        linghtLevelInfo.panelDirectionsLevel = 100;
                        btnLevel.Text = "5" + strRank;
                        break;
                    default:
                        linghtLevelInfo.panelDirectionsLevel = 0;
                        btnLevel.Text = "0" + strRank;
                        break;
                }
            };



            if (linghtLevelInfo.panelDirectionsLevel <= 20 && linghtLevelInfo.panelDirectionsLevel > 0)
            seekBar1.OnStopTrackingTouchEvent += (div, value) =>

            {

                if (value == 0)
                {
                    seekBar1.Progress = 1;
                }
                else
                {
                    seekBar1.Progress = value;
                }
            };



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


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

@@ -224,7 +242,7 @@
            btnTemp1.Y = Application.GetRealHeight(322);

            btnTemp1.TextSize = 12;

            btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnTemp1.Text = "0";

            btnTemp1.Text = "1";

            frameBack.AddChidren(btnTemp1);



            var btnTemp2 = new NormalViewControl(100, 50, true);

@@ -565,15 +583,15 @@
            this.ShowProgressBar();



            //节能模式修改(他们说随便一个回路就行)

            //设备同事说默认去1秒时间，这样接近感应功能才合理

            energyModeInfo.time = 1;

            //设备同事说新风面板默认60秒时间，这样接近感应功能才合理

            energyModeInfo.time = 60;

            var result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);

            if (result == false)

            {

                this.CloseProgressBar();

                return;

            }

            //接近感应(他们说随便一个回路就行)

            //接近感应(提供设备的同事说随便一个回路就行)

            result = await HdlDevicePanelLogic.Current.SetProximitySensorStatus(panelDevice, proximitySensorsInfo.enable);

            if (result == false)

            {