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

wxr

2023-07-17 59d9f0ad6dc40b079fa1f8f514698429ead04a75

 HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockUnlockPage.cs

@@ -182,6 +182,7 @@
                if (agreeBtn.IsSelected)
                {
                    UserInfo.Current.doorPasswordString = password;
                    UserInfo.Current.LastTimeOpenDoor = DateTime.Now;
                }
                Control.Ins.OneKeyUnlocking(this.device, etPassword.Text.Trim());
                this.RemoveFromParent();