Merge branch 'WJC' into wxr6

wxr

2021-11-05 f6c4e9886b924d8f5271e8b58378d7a07269dcb8

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs

@@ -738,10 +738,12 @@
                this.btnFanView.Text = this.dicText["1档"];
            }
            this.btnFan.IsSelected = this.airFreshData.Open;
            this.btnFan.CanClick = this.airFreshData.Open;

            this.btnSetHumidityView.Text = this.airFreshData.Humidity.ToString() + "%";
            this.btnSetHumidity.Enable = this.airFreshData.Open;
            this.btnSetHumidity.CanClick = this.airFreshData.Open;
            this.btnSetHumidity.IsSelected = this.airFreshData.Open;
        }