diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerSettingViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerSettingViewController.m
index 5a0cb25..5612df0 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerSettingViewController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerSettingViewController.m
@@ -195,7 +195,7 @@ static NSString *cycleTimerflag = @"CycleTimerCell";
         }
         
         CGSize size= [label.text boundingRectWithSize:CGSizeMake(300, MAXFLOAT) options:(NSStringDrawingUsesFontLeading | NSStringDrawingTruncatesLastVisibleLine | NSStringDrawingUsesLineFragmentOrigin) attributes:@{NSFontAttributeName: label.font} context:NULL].size;
-        label.frame=CGRectMake((kScreenWidth-size.width)/2.0, 300, size.width, size.height);
+        label.frame=CGRectMake((kScreenWidth-size.width)/2.0, kScreenHeight-NavigationBarHeight-size.height-88, size.width, size.height);
         [self.view addSubview:label];
     }
 }
diff --git a/Ifish/controllers/FishTinkController/maincontroller/RightViewController.m b/Ifish/controllers/FishTinkController/maincontroller/RightViewController.m
index 43ea693..fbd68ac 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/RightViewController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/RightViewController.m
@@ -52,7 +52,7 @@
 //};
 
 
-NS_ENUM(NSInteger,indexViewState){
+typedef NS_ENUM(NSInteger,IndexViewState){
     
     //右上角编辑按钮的两种状态；
     //正常的状态，按钮显示“编辑”;
@@ -62,7 +62,7 @@ NS_ENUM(NSInteger,indexViewState){
     
 };
 
-NS_ENUM(NSInteger,deviceType){
+typedef NS_ENUM(NSInteger,DeviceType){
     
     FishTank,
     
@@ -77,8 +77,8 @@ NS_ENUM(NSInteger,deviceType){
 @property (nonatomic,strong) UICollectionViewFlowLayout *flowLayout;
 
 //@property (nonatomic,strong) enum CellState;
-@property (nonatomic,strong) enum indexViewState;
-@property (nonatomic,strong) enum deviceType;
+@property (nonatomic,assign)   IndexViewState indexViewState;
+@property (nonatomic,assign)  DeviceType deviceType;
 //下面数组用来存放头部标题；
 @property(strong,nonatomic) NSMutableArray *headerArray;