From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
old mode 100644
new mode 100755
similarity index 99%
rename from ZigbeeApp20200414/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index f80c37c..9b0f7c9
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -1001,7 +1001,6 @@
{
new Tip() { MaxWidth = 150, Text = msg2, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
});
- Shared.Phone.Device.Logic.SkipView.LockCloseLogic(doorLock);
}
}
action?.Invoke();
--
Gitblit v1.8.0