Merge branch 'Dev-Branch' into wjc

wjc

2023-06-05 e27305d6720bb4238307731f95c03e5e38f19380

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -166,6 +166,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);