Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2020-12-23 d814c978efc068425c500a553cf7ec6b4f628219

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

@@ -146,8 +146,8 @@
                ProgressBarColor = CSS_Color.MainColor ,//: CSS_Color.PromptingColor2, // 0xFFFC9C04 : CSS_Color.PromptingColor2,
                OfflineProgressBarColor = CSS_Color.PromptingColor2,
                IsOffline = fh.trait_on_off.curValue.ToString() == "off",
                MinValue = 5,
                MaxValue = 35,
                MinValue = fh.trait_temp.min,
                MaxValue = fh.trait_temp.max,
                //IsClickable = fh.trait_on_off.curValue.ToString() == "on",
                ArcColor = CSS_Color.BackgroundColor,
                Progress = Convert.ToInt32(fh.trait_temp.curValue),