From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
old mode 100755
new mode 100644
index 61e1041..327cf96
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -148,7 +148,13 @@
var listDevice = new List<CommonDevice> { };
listDevice.Add(doorLock);
var devTemp = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
- if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
+ if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone
+ || devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_AT1TF
+ || devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_AT1F
+ || devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_AT1T
+ || devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_HAT1B
+ || devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_HAT1T
+ || devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_ATFT)
{
return true;
}
@@ -525,7 +531,13 @@
var listDevice = new List<CommonDevice> { };
listDevice.Add(doorLock);
var devTemp = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
- if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
+ if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone
+ || devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_AT1TF
+ || devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_AT1F
+ || devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_AT1T
+ || devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_HAT1B
+ || devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_HAT1T
+ || devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_ATFT)
{
return true;
}
@@ -1140,6 +1152,16 @@
return password;
}
+ //// <summary>
+ /// 鍙栧緱鏌愭湀鐨勬渶鍚庝竴澶�
+ /// </summary>
+ /// <param name="datetime">瑕佸彇寰楁湀浠芥渶鍚庝竴澶╃殑鏃堕棿</param>
+ /// <returns></returns>
+ public static DateTime LastDayOfMonth(DateTime datetime)
+ {
+ return datetime.AddDays(1 - datetime.Day).AddMonths(1).AddDays(-1);
+ }
+
/// <summary>
/// 灏哢NIX鏃堕棿鎴宠浆鎹㈡垚绯荤粺鏃堕棿(绮剧‘鍒扮)
/// <returns></returns>
--
Gitblit v1.8.0