wxr
2023-07-10 46a03f3b19b39cfa6e00b7af41c1ef90ae812e26
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -23,8 +23,12 @@
                switch (function.spk)
                {
                    case SPK.GroupControl:
                         var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
                         dialog.ShowDialog();
                         //var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
                         //dialog.ShowDialog();
                         var groupControlPage = new GroupControlPage_V2(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
                        MainPage.BasePageView.AddChidren(groupControlPage);
                        groupControlPage.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                    case SPK.AirSwitch:
                        var airSwitchPage = new AirSwitchPage(function);
@@ -166,6 +170,7 @@
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                    case SPK.SensorPir:
                    case SPK.SensorPirHold:
                        var pirPage = new SensorPirPage();
                        pirPage.ShowColltionButton = false;
                        pirPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);