测试修改

2020-05-03 21:05:25 +08:00
parent 53f06fcf43
commit 8d0003b9cd
34 changed files with 862 additions and 170 deletions
@@ -399,7 +399,9 @@ Assign BOOL isPush;
                            
                            petStores[storeName]=array;
                        }
-                        else                        {
+                        
+                        
+                        {
                            [deviceArr insertObject:devicemodel atIndex:0];
                        }

@@ -848,12 +850,17 @@ Assign BOOL isPush;
    }
    
    for (DeviceModel *device in deivceArr) {
-        FormatTankAddCamera *deviceListModel =[[FormatTankAddCamera alloc] init];
-        deviceListModel.device = device;
-        deviceListModel.type = @"tank";
-        deviceListModel.deviceName = device.showName;
-        deviceListModel.imgeaName  = @"home_iocn_aquarium";
-        [self.totalArr addObject:deviceListModel];
+        
+        if (!device.storeName.length)
+        {
+            FormatTankAddCamera *deviceListModel =[[FormatTankAddCamera alloc] init];
+            deviceListModel.device = device;
+            deviceListModel.type = @"tank";
+            deviceListModel.deviceName = device.showName;
+            deviceListModel.imgeaName  = @"home_iocn_aquarium";
+            [self.totalArr addObject:deviceListModel];
+
+        }
        
    }