杀菌倒计时,恒温温度设定修改

This commit is contained in:
kai60
2020-05-16 14:51:19 +08:00
parent b11f6aaced
commit 9b266aea7b
13 changed files with 125 additions and 64 deletions
@@ -386,10 +386,15 @@ Assign BOOL isPush;
for (NSDictionary*deviceDic in deviceArray) {
DeviceModel*devicemodel=[[DeviceModel alloc] initWithDict:deviceDic];
if (devicemodel.storeName.length)//宠物笼
if ([devicemodel.type isEqualToString:DECICE_TYPE_XUANDUO3F])//宠物笼
{
NSString*storeName=devicemodel.storeName;
if ([storeName isKindOfClass:[NSNull class]]||([storeName isKindOfClass: [NSString class]]&&storeName.length==0)) {
storeName=@"宠物店";
}
NSMutableArray*array=petStores[storeName];
if (!array) {
array=[NSMutableArray array];
@@ -851,7 +856,7 @@ Assign BOOL isPush;
for (DeviceModel *device in deivceArr) {
if (!device.storeName.length)
if (![device.type isEqualToString:DECICE_TYPE_XUANDUO3F])
{
FormatTankAddCamera *deviceListModel =[[FormatTankAddCamera alloc] init];
deviceListModel.device = device;