Merge branch 'Dev-Branch' into Dev-Wxr-1.8.1

wxr

2023-07-17 59d9f0ad6dc40b079fa1f8f514698429ead04a75

 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs

@@ -92,7 +92,7 @@
            faceUnlockSettingView.AddChidren(btnFaceText);

            btnFaceText.MouseUpEventHandler = (sender, e) => {
                var page = new UnlockSettingFacePage();
                var page = new UnlockSettingFacePage(device);
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;