From e379994f2754481fa5c9ac4affbd64908b0918bd Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 09 十二月 2019 15:01:48 +0800
Subject: [PATCH] 2019-12-09-3
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index a25457b..0fbe09b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -37,6 +37,7 @@
/// </summary>
private CommonDevice deviceObj = null;
Action action;
+ Action actionNone;
string modifyDeviceName = "";
bool IsModifyName = true;
public Action<string> devicNameAction;
@@ -293,21 +294,18 @@
{
if (currentIndex == 3)
{
- if (!UserCenterResourse.Option.DoorUnLockByRemote)
+ action = async () =>
{
- SecurityRequest(doorLock, action);
- }
- else
+ var temporaryPassword = new Shared.Phone.UserCenter.DoorLock.TemporaryPassword(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(temporaryPassword);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ temporaryPassword.Show();
+ };
+ actionNone = async () =>
{
- action = async () =>
- {
- var temporaryPassword = new Shared.Phone.UserCenter.DoorLock.TemporaryPassword(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(temporaryPassword);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- temporaryPassword.Show();
- };
- HdlCheckLogic.Current.CheckSecondarySecurity(action);
- }
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock, action);
+ };
+ HdlCheckLogic.Current.CheckSecondarySecurity(action, actionNone);
}
else if (currentIndex == 4)
{
--
Gitblit v1.8.0