Merge branch 'Dev-Branch' into wjc

wjc

2023-07-19 1b56157e8edc3f502810820d99b607e3629c7171

 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);