Merge branch 'WJC' into wxr6

wxr

2021-11-18 a7885a24a152a164d7e26b12098ab92a0e272f24

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

@@ -119,7 +119,7 @@
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                new System.Threading.Thread(() =>
                {
                    if (function.Spk_Prefix == FunctionCategory.Light)
                    if (SPK.LightSpkList().Contains( function.spk))
                    {
                        function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                        Dictionary<string, string> d = new Dictionary<string, string>();