diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m
index e28d17c..c094a00 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m
@@ -26,6 +26,8 @@
 #import "Xuanduo2TimerModel.h"
 #import "IfishDeviceInfo.h"
 #import "NSString+Add.h"
+#import "XuToControlName.h"
+#import "UserExtendataArchaver.h"
 
 #define kBtnTag 500
 #define kSwitchBtnTag 600
@@ -120,11 +122,22 @@ static NSString *setTimerflag = @"SetTimerCell";
 }
 
 - (void)setupTable {
-    _titieArr = @[@"循环泵",@"增氧泵",@"灯光1",@"灯光2",@"造浪泵",@"杀菌灯"];
+    
+    XuToControlName *name = [UserExtendataArchaver currentNewXuToControlName:self.currentdevice.macAddress];
+          if ([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F])
+          {
+              name=[UserExtendataArchaver currentPetsXuToControlName:self.currentdevice.macAddress];
+          }
+   // _titieArr = @[@"循环泵",@"增氧泵",@"灯光1",@"灯光2",@"造浪泵",@"杀菌灯"];
+     _titieArr = @[name.xunhuanPump,name.zengyangPump,name.light1,name.light2,name.zaolangPump,name.shajunLight];
+    
     _imgArr = @[@"xunhuan_big",@"gas_big",@"light_big",@"light_big",@"wave_big",@"shajun_big"];
+   
+    
+    
  if ([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F])
     {
-        _titieArr = @[@"照明",@"换气",@"杀菌"];
+        _titieArr = @[name.xunhuanPump,name.zaolangPump,name.light1];
         _imgArr = @[@"照明开",@"换气开",@"杀菌开"];
     }