Merge branch 'WJC' into wxr7

wxr

2021-08-21 264f86c363a6a019fac8eb138877fee9e4734e2d

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -76,6 +76,7 @@
                        break;
                    case SPK.ElectricTV:
                    case SPK.TvIr:
                    case SPK.TvXmIr:
                        var tvView = new TVPage(function);
                        MainPage.BasePageView.AddChidren(tvView);
                        tvView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
@@ -142,9 +143,23 @@
                        doorwindowPage.ShowColltionButton = false;
                        doorwindowPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.SenesorMegahealth:
                        var smPage = new SenesorMegahealthPage();
                        smPage.ShowColltionButton = false;
                        smPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.SensorGas:
                        var gasPage = new SensorGasPage();
                        gasPage.ShowColltionButton = false;
                        gasPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.ClothesHanger:
                        var clothesHangerpage = new ClothesHangerPage();
                        clothesHangerpage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.FanIr:
                        var fanIr = new IrFanPage();
                        fanIr.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.AcIr:
                    case SPK.AcStandard:
@@ -159,6 +174,10 @@
                        var airFresh1 = new AirFreshControlPage();
                        airFresh1.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.AirFreshStandard:
                        var airFresh2 = new AirFreshRelayControlPage();
                        airFresh2.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                }
            };
            return eventHandler;