diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index a3ce89f..f1f1e43 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -16025,7 +16025,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 15; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -16145,7 +16145,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 15; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; diff --git a/Ifish/Assets.xcassets/绚多设备/danfenqisetting.imageset/Contents.json b/Ifish/Assets.xcassets/绚多设备/danfenqisetting.imageset/Contents.json new file mode 100644 index 0000000..c2c827c --- /dev/null +++ b/Ifish/Assets.xcassets/绚多设备/danfenqisetting.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "danfenqisetting.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/绚多设备/danfenqisetting.imageset/danfenqisetting.png b/Ifish/Assets.xcassets/绚多设备/danfenqisetting.imageset/danfenqisetting.png new file mode 100644 index 0000000..b77fe5f Binary files /dev/null and b/Ifish/Assets.xcassets/绚多设备/danfenqisetting.imageset/danfenqisetting.png differ diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerListViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerListViewController.m index 3a8b35f..43dadf8 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerListViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerListViewController.m @@ -148,7 +148,7 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell"; _imgArr = @[@"循环棒",@"增氧泵",@"灯光1",@"灯光2",@"造浪",@"杀菌"]; if ([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO5F]&&name.defaultName.length) { - _imgArr = @[@"循环棒",@"dandenqiselected",@"灯光1",@"灯光2",@"造浪",@"杀菌"]; + _imgArr = @[@"循环棒",@"danfenqisetting",@"灯光1",@"灯光2",@"造浪",@"杀菌"]; } diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.m index a4f6d92..2505083 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.m @@ -143,7 +143,7 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell"; _imgArr = @[@"循环棒",@"增氧泵",@"灯光1",@"灯光2",@"造浪",@"杀菌"]; if ([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO5F]&&name.defaultName.length) { - _imgArr = @[@"循环棒",@"dandenqiselected",@"灯光1",@"灯光2",@"造浪",@"杀菌"]; + _imgArr = @[@"循环棒",@"danfenqisetting",@"灯光1",@"灯光2",@"造浪",@"杀菌"]; }