From 741cf87691107698b211c45df1f7392329e87f9a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 三月 2022 10:36:22 +0800
Subject: [PATCH] 门锁功能、俄语优化

---
 HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
index 6d6f61d..0376173 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
@@ -911,7 +911,17 @@
                 HdlMessageLogic.Current.ShowMassage(ShowMsgType.TipRemind, Language.StringByID(StringId.DeviceNotOnline), null, null, null, 2);
                 return;
             }
-            Control.Ins.OneKeyUnlocking(this.device, this.device.GetAttrState("key"));
+            if (UserInfo.Current.VerOpenDoorPw || string.IsNullOrEmpty(UserInfo.Current.doorPasswordString))
+            {
+                var page = new DoorLockUnlockPage(this.device);
+                MainPage.BasePageView.AddChidren(page);
+                page.LoadView();
+                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+            }
+            else
+            {
+                Control.Ins.OneKeyUnlocking(this.device, UserInfo.Current.doorPasswordString);
+            }
             //绗竴娆′娇鐢紝璇峰厛缁戝畾闂ㄩ攣瀵嗙爜
             //HdlMessageLogic.Current.ShowMassage(ShowMsgType.Confirm, Language.StringByID(StringId.PleaseBindTheDoorPswFirst), () =>
             //{

--
Gitblit v1.8.0