请合并代码，完成晾衣架最终功能。

xm

2020-12-14 d6fb0646531172f23648441c224cdcccd721b894

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs

old mode 100755
new mode 100644
@@ -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>
        /// 将UNIX时间戳转换成系统时间(精确到秒)
        /// <returns></returns>