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

陈嘉乐

2021-01-11 1026814d931de92f0da5f15a58870565a94100e0

 HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs

@@ -85,7 +85,9 @@
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    if(fadeTime!= null)
                    {
                        d.Add(FunctionAttributeKey.FadeTime, fadeTime.curValue.ToString());
                        int result = 0;
                        int.TryParse(fadeTime.curValue.ToString(), out result);
                        d.Add(FunctionAttributeKey.FadeTime, result.ToString());
                    }
                    Control.Ins.SendWriteCommand(function, d);
                })
@@ -104,7 +106,7 @@
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                new System.Threading.Thread(() =>
                {
                    if (function.functionCategory == FunctionCategory.Light)
                    if (function.Spk_Prefix == FunctionCategory.Light)
                    {
                        var light = function as Light;
                        light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
@@ -123,7 +125,7 @@
        /// </summary>
        void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
        {
            if(function.functionType == FunctionType.Dimmer || function.functionType == FunctionType.RGB)
            if(function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
            {
                var light = function as Light;
                dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {