From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp20200414/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 1c46c2c..f80c37c 100644
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp20200414/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -908,9 +908,9 @@
string msg = Language.StringByID(R.MyInternationalizationString.NomallyModeIsCanceled).Replace("{0}", "\r\n");
var confirm = Language.StringByID(R.MyInternationalizationString.SureCancel);
var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.NomallyOpenMode, msg, confirm);
- var HaveLogicNormallyOpenMode = await Shared.Phone.Device.Logic.SkipView.Exist();
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist();
- if (HaveLogicNormallyOpenMode)
+ if (resTemp == 1)
{
//鏈夐�昏緫璁剧疆鐨勫脊绐�
alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.CancelNomallyOpenModeWithLogic, msg, confirm);
--
Gitblit v1.8.0