Merge branch 'Dev-Branch' into wjc

wjc

2023-08-24 ac8660d2dd439e8074c1760cbe6cc9465a452193

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -22,6 +22,12 @@
                //跳转到功能信息设置页面
                switch (function.spk)
                {
                    case SPK.ElectricEnergy:
                        var skipView = new EnergyMainPage();
                        MainPage.BasePageView.AddChidren(skipView);
                        skipView.LoadPage();
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                    case SPK.GroupControl:
                         //var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
                         //dialog.ShowDialog();
@@ -36,6 +42,12 @@
                        airSwitchPage.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                    case SPK.AirSwitchP3:
                        var airSwitchP3Page = new AirSwitchP3Page(function);
                        MainPage.BasePageView.AddChidren(airSwitchP3Page);
                        airSwitchP3Page.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                    case SPK.LightSwitch:
                        var relayView = new RelayPage(function);
                        MainPage.BasePageView.AddChidren(relayView);