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

wei

2020-12-24 8413f493d6e527c3f71cf704c6b22212e94a6c60

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

@@ -66,7 +66,7 @@
            barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
            {
                light.fadeTime = e;
                light.SaveFunctionData(true);
                light.UpdataFuncitonInfo();
            };
        }