Merge branch 'WJC' into NewFilePath

wxr

2020-12-21 ae9061e8e648af95393d96d6f5e59c434aed1558

 HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs

@@ -63,7 +63,7 @@
        /// </summary>
        void LoadEvet_ChangeFadeTime()
        {
            barFadeTime.OnProgressChangedEvent = (sender, e) =>
            barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
            {
                light.fadeTime = e;
                light.SaveFunctionData(true);