蛋分器修改

Ifish/Assets.xcassets/绚多设备/dandenqiselected.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "dandenqiselected.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Ifish/Assets.xcassets/绚多设备/danfenqi.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "danfenqi.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Ifish/Utinitys/DataCenter/UserExtendataArchaver.m

@@ -237,6 +237,11 @@
         controlName.xunhuanPump = @"循环泵";
         controlName.jiaRe = @"加热棒";
         controlName.macAddress = macaddress;
+        controlName.defaultName=@"1";
+    }
+    else
+    {
+        controlName.defaultName=@"";
     }
     return controlName;
     

Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToControlName.h

@@ -22,6 +22,7 @@
 @property(nonatomic,copy) NSString *zaolangPump;
 @property(nonatomic,copy) NSString *xunhuanPump;
 @property(nonatomic,copy) NSString *type;
+@property(nonatomic,copy) NSString *defaultName;//有值标识默认的
 
 
 

Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToControlNameViewController.m

@@ -94,6 +94,10 @@
         if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]) {
             titles = @[@"照明",@"换气",@"杀菌",@"恒温"];
         }
+        else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F])
+        {
+            titles= @[@"杀菌灯",@"蛋分器",@"灯光1",@"灯光2",@"造浪泵",@"护理灯",@"循环泵",@"加热棒"];
+        }
     }else {
         titles = @[@"气泵",@"灯1",@"灯2",@"护理灯",@"水泵",@"加热棒"];
     }
@@ -108,6 +112,10 @@
         if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]) {
              name = [UserExtendataArchaver currentPetsXuToControlName:self.device.macAddress];
         }
+        if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]&&name.defaultName.length)
+        {
+            name.zengyangPump=@"蛋分器";
+        }
     }else {
        name = [UserExtendataArchaver currentXuToControlName:self.device.macAddress];
     }

Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m

@@ -181,6 +181,9 @@
     {
         if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO5F]) {
             self.imageView.image=[UIImage imageNamed:@"seaxuanduo"];
+            [self.gasPumpLight setBackgroundImage:[UIImage imageNamed:@"danfenqi"] forState:UIControlStateNormal];
+            [self.gasPumpLight setBackgroundImage:[UIImage imageNamed:@"dandenqiselected"] forState:UIControlStateSelected];
+    
         }
         
         self.controlBtn.hidden=NO;
@@ -1042,6 +1045,10 @@
     {
         name=[UserExtendataArchaver currentPetsXuToControlName:self.currentDevice.macAddress];
     }
+    if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO5F]&&name.defaultName.length)
+    {
+        name.zengyangPump=@"蛋分器";
+    }
     self.shajunLight.text = name.shajunLight;
     self.zengyangLabel.text = name.zengyangPump;
     self.light1Label.text = name.light1;