Merge branch 'temp-wxr' into NewFilePath

wxr

2021-03-04 5266531a3a1552a11a29473974481d60100812c6

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -65,12 +65,6 @@
                        rollingShutterView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                    case SPK.AcStandard:
                        var acView = new ACPage(function as AC);
                        MainPage.BasePageView.AddChidren(acView);
                        acView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                    case SPK.FloorHeatStandard:
                        var fhView = new FloorHeatingPage(function as FloorHeating);
                        MainPage.BasePageView.AddChidren(fhView);
@@ -148,6 +142,17 @@
                        var clothesHangerpage = new ClothesHangerPage();
                        clothesHangerpage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.IrAC:
                    case SPK.AcStandard:
                        var acPage = new AcControlPage();
                        acPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    //case SPK.AcStandard:
                    //    var acView = new ACPage(function as AC);
                    //    MainPage.BasePageView.AddChidren(acView);
                    //    acView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                    //    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    //    break;
                }
            };
            return eventHandler;