Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-07-22 98c51b309741620d7a9d6bf6260327a6041b8f12

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