Merge branch 'WJC' into temp-wxr

wxr

2021-03-25 4975f3d6beb81e3967b1018d629be9c3410b9ea3

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -75,7 +75,7 @@
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                    case SPK.ElectricTV:
                    case SPK.IrTV:
                    case SPK.TvIr:
                        var tvView = new TVPage(function);
                        MainPage.BasePageView.AddChidren(tvView);
                        tvView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);