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

wxr

2020-12-18 aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c

 HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs

@@ -29,6 +29,14 @@
                    {
                        bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uFh.trait_temp.curValue));
                    }
                    if(uFh.trait_on_off.curValue.ToString() == "on")
                    {
                        bodyView.arcBar.Enable = true;
                    }
                    else
                    {
                        bodyView.arcBar.Enable = false;
                    }
                });
            }
            catch (Exception ex)