Merge branch 'wxr6' into newBranch1

wxr

2021-07-05 4f8fc4fe0a7d6f73c3a06e6f924a4a2615b090d7

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

@@ -81,7 +81,7 @@
            {
                btnSwitch.IsSelected = !btnSwitch.IsSelected;

                if(function.spk == SPK.IrLearn || function.spk == SPK.TvIr)
                if(function.spk == SPK.IrLearn || function.spk == SPK.TvIr || function.spk == SPK.TvXmIr)
                {
                    new System.Threading.Thread(() => {
                        System.Threading.Thread.Sleep(2000);