diff --git a/Ifish/Assets.xcassets/绚多设备/dandenqiselected.imageset/Contents.json b/Ifish/Assets.xcassets/绚多设备/dandenqiselected.imageset/Contents.json new file mode 100644 index 0000000..5c7c7b1 --- /dev/null +++ b/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 + } +} diff --git a/Ifish/Assets.xcassets/绚多设备/dandenqiselected.imageset/dandenqiselected.png b/Ifish/Assets.xcassets/绚多设备/dandenqiselected.imageset/dandenqiselected.png new file mode 100644 index 0000000..87ac5fe Binary files /dev/null and b/Ifish/Assets.xcassets/绚多设备/dandenqiselected.imageset/dandenqiselected.png differ diff --git a/Ifish/Assets.xcassets/绚多设备/danfenqi.imageset/Contents.json b/Ifish/Assets.xcassets/绚多设备/danfenqi.imageset/Contents.json new file mode 100644 index 0000000..2a67780 --- /dev/null +++ b/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 + } +} diff --git a/Ifish/Assets.xcassets/绚多设备/danfenqi.imageset/danfenqi.png b/Ifish/Assets.xcassets/绚多设备/danfenqi.imageset/danfenqi.png new file mode 100644 index 0000000..1f9531e Binary files /dev/null and b/Ifish/Assets.xcassets/绚多设备/danfenqi.imageset/danfenqi.png differ diff --git a/Ifish/Utinitys/DataCenter/UserExtendataArchaver.m b/Ifish/Utinitys/DataCenter/UserExtendataArchaver.m index 8fac588..f7a20fa 100644 --- a/Ifish/Utinitys/DataCenter/UserExtendataArchaver.m +++ b/Ifish/Utinitys/DataCenter/UserExtendataArchaver.m @@ -237,6 +237,11 @@ controlName.xunhuanPump = @"循环泵"; controlName.jiaRe = @"加热棒"; controlName.macAddress = macaddress; + controlName.defaultName=@"1"; + } + else + { + controlName.defaultName=@""; } return controlName; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToControlName.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToControlName.h index cf265eb..d1a2137 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToControlName.h +++ b/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;//有值标识默认的 diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToControlNameViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToControlNameViewController.m index f497bc5..6f08e15 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToControlNameViewController.m +++ b/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]; } diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m index a24d09c..36c25e5 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m +++ b/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;