Merge branch 'CJL' into temp-wxr

wxr

2021-02-23 98d002e55304e5c8ff13b7cd195920975bef69f5

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -124,6 +124,26 @@
                        TureView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                    case SPK.SensorPir:
                        var pirPage = new SensorPirPage();
                        pirPage.ShowColltionButton = false;
                        pirPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.SensorWater:
                        var waterPage = new SensorWaterImmersionPage();
                        waterPage.ShowColltionButton = false;
                        waterPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.SensorSmoke:
                        var smokePage = new SensorSmokePage();
                        smokePage.ShowColltionButton = false;
                        smokePage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.SensorDoorWindow:
                        var doorwindowPage = new SensorDoorWinwsPage();
                        doorwindowPage.ShowColltionButton = false;
                        doorwindowPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                }
            };
            return eventHandler;