diff --git a/.DS_Store b/.DS_Store
index adbf317..4568cff 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj
index adcfb13..79e1e73 100644
--- a/Ifish.xcodeproj/project.pbxproj
+++ b/Ifish.xcodeproj/project.pbxproj
@@ -17640,7 +17640,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "eeefa590-8286-4301-b6e5-f1eeee0de64f";
+				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "";
diff --git a/Ifish/AppDelegate.m b/Ifish/AppDelegate.m
index 31b65ff..9ce1818 100644
--- a/Ifish/AppDelegate.m
+++ b/Ifish/AppDelegate.m
@@ -43,7 +43,6 @@
 #define BMKMAP_APPKEY @"wYcF3YXqeepKfzruExLPn0eS"
 //#import <BaiduMapAPI_Map/BMKMapComponent.h>
 #import "Socketsingleton.h"
-#import "CenterViewController.h"
 #import <UMCommunitySDK/UMCommunitySDK.h>
 #import <UMCommunitySDK/UMComSession.h>
 #import <UMSocialCore/UMSocialCore.h>
diff --git a/Ifish/Info.plist b/Ifish/Info.plist
index 631dab8..014ced4 100644
--- a/Ifish/Info.plist
+++ b/Ifish/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>爱鱼奇</string>
+	<string>爱鱼奇TEST</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.9.0</string>
+	<string>4.9.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -70,7 +70,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>531</string>
+	<string>535</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m
index 000a6ed..3fe8b40 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m
@@ -98,12 +98,11 @@
     [self creatTableView];
     [self initUI];
     [self fishTankData];
-    
+
     [self creatMyindicaterView];
     [self notBindDeviceState];
     [self creatRefreshView];
     
-
     
 }
 
@@ -637,7 +636,7 @@
     
     if (self.tableView==nil) {
         UITableView*table=[[UITableView alloc]init];
-        table.frame=CGRectMake(0,0, kScreenSize.width, kScreenSize.height );
+        table.frame=CGRectMake(0,0, kScreenSize.width, kScreenSize.height-TOP_HEIGHT);
         table.dataSource=self;
         table.delegate=self;
         table.separatorStyle=UITableViewCellSeparatorStyleSingleLine;
@@ -660,9 +659,9 @@
     return 0;
 }
 -(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
-   
-    
-    
+
+
+
     return nil;
 
 }
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
index 4be0528..6fdb753 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
@@ -114,7 +114,7 @@
     for (int i = 0; i < 3; i ++) {
         
         self.button = [[UIButton alloc] init] ;
-        self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -10 - 10 , btnControlWith, btnControlWith +11);
+        self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -(is_iPhone_X?40:20) , btnControlWith, btnControlWith +11);
         
         [self.button setImage:[UIImage imageNamed:nameArr[i]] forState:UIControlStateNormal];
         //self.button.backgroundColor = [UIColor redColor];
@@ -122,7 +122,7 @@
         [self.button  addTarget:self action:@selector(controlBtnCilck:) forControlEvents:UIControlEventTouchUpInside];
         
         
-        self.chName = [[UILabel alloc] initWithFrame:CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -20 + btnControlWith -5 , btnControlWith, btnControlPlace - 5)];
+        self.chName = [[UILabel alloc] initWithFrame:CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -20 + btnControlWith -5-(is_iPhone_X?20:0) , btnControlWith, btnControlPlace - 5)];
         //textLbl.backgroundColor = [UIColor blackColor];
         self.chName.textColor = [UIColor colorWithRed:250/255.0f green:255/255.0f blue:255/254.0f alpha:1];
         self.chName.textAlignment = NSTextAlignmentCenter;
@@ -155,7 +155,7 @@
     
     for (int i = 0; i < 3; i ++) {
         self.button = [[UIButton alloc] init] ;
-        self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -25 -5 , btnControlWith, btnControlWith + 11);
+        self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -(is_iPhone_X?50:30) , btnControlWith, btnControlWith + 11);
         
         
         [self.button setImage:[UIImage imageNamed:nameArr[i+3]]forState:UIControlStateNormal];
@@ -163,7 +163,7 @@
         self.button.tag= 6003+i;
         [self.button  addTarget:self action:@selector(controlBtnCilck:) forControlEvents:UIControlEventTouchUpInside];
         
-        UILabel* textLbl = [[UILabel alloc] initWithFrame:CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -35 + btnControlWith, btnControlWith, btnControlPlace - 5)];
+        UILabel* textLbl = [[UILabel alloc] initWithFrame:CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -35 + btnControlWith-(is_iPhone_X?20:0), btnControlWith, btnControlPlace - 5)];
         //textLbl.backgroundColor = [UIColor blackColor];
         textLbl.textAlignment = NSTextAlignmentCenter;
         textLbl.textColor = [UIColor colorWithRed:250/255.0f green:255/255.0f blue:255/254.0f alpha:1];
diff --git a/Ifish/controllers/IfishTabControllers/我的/IfishMineGold/ViewControlller/IfishMineGoldViewController.m b/Ifish/controllers/IfishTabControllers/我的/IfishMineGold/ViewControlller/IfishMineGoldViewController.m
index c1d59bb..7a17aa1 100644
--- a/Ifish/controllers/IfishTabControllers/我的/IfishMineGold/ViewControlller/IfishMineGoldViewController.m
+++ b/Ifish/controllers/IfishTabControllers/我的/IfishMineGold/ViewControlller/IfishMineGoldViewController.m
@@ -35,6 +35,15 @@
     [self loadRightData];
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBar.translucent = YES;
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    self.navigationController.navigationBar.translucent = NO;
+}
 
 -(void)creatSubViews
 {
diff --git a/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastDetailViewController.m b/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastDetailViewController.m
index 5b23858..c1051fa 100644
--- a/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastDetailViewController.m
+++ b/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastDetailViewController.m
@@ -26,7 +26,7 @@
 
 -(void)creatTab{
     
-    self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height) style:UITableViewStyleGrouped];
+    self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStylePlain];
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     self.tableView.scrollEnabled = YES;
@@ -37,7 +37,7 @@
     [self.view addSubview:self.tableView];
     
     UIButton *duiHuanBtn=[UIButton buttonWithType:UIButtonTypeCustom];
-    duiHuanBtn.frame = CGRectMake(0, self.view.frame.size.height -49, self.view.frame.size.width, 49);
+    duiHuanBtn.frame = CGRectMake(0, 0, self.view.frame.size.width, 49);
     
     [duiHuanBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     NSMutableAttributedString *title = [[NSMutableAttributedString alloc] initWithString:@"立即兑换"];
@@ -47,9 +47,7 @@
     [duiHuanBtn setAttributedTitle:title forState:UIControlStateNormal];
     [duiHuanBtn setBackgroundColor:RGB(67, 186, 255)];
     [duiHuanBtn addTarget:self action:@selector(duihuanBtnClick) forControlEvents:UIControlEventTouchUpInside];
-    
-    [self.view addSubview:duiHuanBtn];
-    
+    self.tableView.tableFooterView = duiHuanBtn;
     
     
 }
@@ -87,17 +85,6 @@
     return 470;
 }
 
--(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
-    
-    return 0.1;
-}
-
--(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
-    
-    return 10;
-    
-}
-
 #pragma mark -金币兑换
 -(void)duihuanBtnClick{
     
diff --git a/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastViewController.m b/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastViewController.m
index b85aa42..8988be3 100644
--- a/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastViewController.m
+++ b/Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastViewController.m
@@ -15,6 +15,7 @@
 @property(nonatomic,strong)UITableView *tableView;
 @property(nonatomic,strong)NSMutableArray *dataArr;
 @property (nonatomic) NSIndexPath *selectIndexPath;
+@property(nonatomic,strong) UIView *sectionHeaderView;
 @property (nonatomic) BOOL isChage;
 @end
 
@@ -57,7 +58,7 @@
 
 -(void)creatTab{
     
-    self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStyleGrouped];
+    self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStylePlain];
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     self.tableView.scrollEnabled = YES;
@@ -99,13 +100,26 @@
 
 -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
     
-    return 0.1;
+    return CGFLOAT_MIN;
+}
+
+-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
+    return nil;
 }
 
 -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
-    
-    return 0.1;
-    
+    return 10;
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+    return self.sectionHeaderView;
+}
+
+-(UIView *)sectionHeaderView {
+    if (!_sectionHeaderView) {
+        _sectionHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
+    }
+    return _sectionHeaderView;
 }
 
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/ViewControlller/IfishUsersActivityListController.m b/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/ViewControlller/IfishUsersActivityListController.m
index 1cfce20..5037b75 100644
--- a/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/ViewControlller/IfishUsersActivityListController.m
+++ b/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/ViewControlller/IfishUsersActivityListController.m
@@ -17,6 +17,7 @@ const float ActivityPageSize = 20;
 @property (nonatomic,strong) UITableView *tableView;
 @property (nonatomic,strong) NSMutableArray *dataArr;
 @property (nonatomic,strong) NSMutableArray *activTypes;
+@property (nonatomic,strong) UIView *sectionHeaderView;
 @property (nonatomic) NSInteger firstResult;
 @property(nonatomic,copy) NSString* total;
 @property(nonatomic)BOOL isLoadMore;
@@ -87,7 +88,7 @@ const float ActivityPageSize = 20;
 
 -(void)creatTab{
     
-    self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStyleGrouped];
+    self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStylePlain];
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     self.tableView.scrollEnabled = YES;
@@ -127,18 +128,27 @@ const float ActivityPageSize = 20;
 }
 
 -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
-    
-    if (section==0) {
-        return 0.01;
-    }else{
-        
-        return 10;
-    }
+    return 10;
+}
+
+-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+    return self.sectionHeaderView;
 }
 
 -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
     
-    return 0.01;
+    return CGFLOAT_MIN;
+}
+
+-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{
+    return nil;
+}
+
+-(UIView *)sectionHeaderView{
+    if (!_sectionHeaderView) {
+        _sectionHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
+    }
+    return _sectionHeaderView;
 }
 
 -(void)creatReatRefreshView{
diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/view/IFishUserActivityListCell.xib b/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/view/IFishUserActivityListCell.xib
index d316614..7ee6563 100644
--- a/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/view/IFishUserActivityListCell.xib
+++ b/Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/view/IFishUserActivityListCell.xib
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -16,18 +15,18 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="124"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="123"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="123.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="yCp-Pc-niT">
-                        <rect key="frame" x="15" y="19" width="43" height="43"/>
+                        <rect key="frame" x="23" y="22" width="43" height="43"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="43" id="K1h-6R-dgq"/>
                             <constraint firstAttribute="width" constant="43" id="utS-Lc-5nb"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MC2-dj-tQV">
-                        <rect key="frame" x="15" y="70" width="43" height="21"/>
+                        <rect key="frame" x="23" y="73" width="43" height="21"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="43" id="O0H-Fu-MQP"/>
                             <constraint firstAttribute="height" constant="21" id="spG-aM-uyY"/>
@@ -44,7 +43,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j4H-3i-r5P">
-                        <rect key="frame" x="66" y="19" width="44" height="21"/>
+                        <rect key="frame" x="74" y="22" width="44" height="21"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="21" id="E4g-ow-Bbo"/>
                         </constraints>
@@ -53,7 +52,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o4z-Rh-bJE">
-                        <rect key="frame" x="66" y="44" width="31" height="15"/>
+                        <rect key="frame" x="74" y="47" width="31" height="15"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="15" id="ehn-eA-OyR"/>
                         </constraints>
@@ -62,14 +61,14 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rvn-dY-yD4" customClass="IFishActivityCateView">
-                        <rect key="frame" x="207" y="13" width="113" height="18"/>
+                        <rect key="frame" x="199" y="15.5" width="113" height="18"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="113" id="prU-qW-zDS"/>
                             <constraint firstAttribute="height" constant="18" id="zt9-Kb-dri"/>
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ncX-Ol-5UJ">
-                        <rect key="frame" x="66" y="75" width="230" height="16"/>
+                        <rect key="frame" x="74" y="78" width="214" height="16"/>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m
index f069c66..146a73e 100644
--- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m
+++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m
@@ -41,7 +41,6 @@
 #import "IfishAlibcWebViewController.h"
 #import "MBProgressHUD.h"
 #import "NTESSessionListViewController.h"
-#import "RunSun84biteCenterViewController.h"
 #import "RunSunChangeNameViewController.h"
 
 @interface IfishDeviceViewController ()<UITableViewDelegate,UITableViewDataSource,LxPopViewDelegate,ShopTtemListDelegate,NIMSystemNotificationManagerDelegate,NIMConversationManagerDelegate>
@@ -675,7 +674,7 @@
     [self.tableView registerNib:[UINib nibWithNibName:@"TabBarDeviceShouYeCell" bundle:nil] forCellReuseIdentifier:@"TabBarDeviceShouYeCell"];
     [self.tableView registerNib:[UINib nibWithNibName:@"TabbarDeiceSecdCell" bundle:nil] forCellReuseIdentifier:@"TabbarDeiceSecdCell"];
     //CGFloat sapce=TabContentHeaght*0.011;//20/1776
-    self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStyleGrouped];
+    self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height) style:UITableViewStyleGrouped];
    
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
index 2eb409b..2a89c3d 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
@@ -499,7 +499,7 @@
     
     //显示监控画面的载体canvasView
     CGFloat canvasView_h = [UIScreen mainScreen].bounds.size.width * 9/16;
-    UIView *canvasView = [[UIView alloc] initWithFrame:CGRectMake(0, 64, width, canvasView_h)];
+    UIView *canvasView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, width, canvasView_h)];
     canvasView.backgroundColor = [UIColor blackColor];
     [self.view addSubview:canvasView];
     self.canvasView = canvasView;
@@ -1074,7 +1074,7 @@
                 
                 CGFloat height = rect.size.height;
                 if (!_fishControlView) {
-                    _fishControlView=[[MonitorBootmView alloc] initWithFrame:CGRectMake(0,0, width, height-CGRectGetMaxY(self.segControl.frame) -15)];
+                    _fishControlView=[[MonitorBootmView alloc] initWithFrame:CGRectMake(0,0, width, height-CGRectGetMaxY(self.segControl.frame) -15-TOP_HEIGHT)];
                     _fishControlView.cameraId = self.contact.cameraId;
                     _fishControlView.MonitorBottomDelegate=self;
                     [self.bottomFishHView addSubview:_fishControlView];
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
index 24402d3..036e4d3 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
@@ -948,13 +948,13 @@ withFilterContext:(id)filterContext
                 return;
             }
             
-            BOOL isRight =[dataContorl isIncludeSpecialCharact:self.wifiSecFiled.text];
-            
-            if (!isRight) {
-                [self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"];
-                
-                return;
-            }
+//            BOOL isRight =[dataContorl isIncludeSpecialCharact:self.wifiSecFiled.text];
+//            
+//            if (!isRight) {
+//                [self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"];
+//                
+//                return;
+//            }
             
             
             if (!self.wifiName) {
@@ -1054,7 +1054,10 @@ withFilterContext:(id)filterContext
     self.sBtn.hidden = YES;
     self.nodImg.hidden = YES;
     self.redTipLable.hidden=YES;
-    
+    NSString *ssidName = [self.wifiName substringWithRange:NSMakeRange(self.wifiName.length-2, 2)];
+    if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
+        UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:@"", nil];
+    }
 }
 
 -(void)wifiviewkeyboardWillHide:(NSNotification *)notify{
diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
index 3024bc6..7ff104c 100644
--- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
+++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
@@ -253,6 +253,10 @@ extern BOOL isfromCameraView;
     self.shareButton.hidden = YES;
     self.nodImg.hidden = YES;
     self.redTextLable.hidden=YES;
+    NSString *ssidName = [_ssid substringWithRange:NSMakeRange(_ssid.length-2, 2)];
+    if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
+        UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:@"", nil];
+    }
 
 }
 
@@ -397,13 +401,13 @@ extern BOOL isfromCameraView;
     
     [_wifiTextFiled resignFirstResponder];
     
-    BOOL isRight =[dataContorl isIncludeSpecialCharact:_wifiTextFiled.text];
-    
-    if (!isRight) {
-        [self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"];
-        
-        return;
-    }
+//    BOOL isRight =[dataContorl isIncludeSpecialCharact:_wifiTextFiled.text];
+//
+//    if (!isRight) {
+//        [self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"];
+//
+//        return;
+//    }
     
     [self savePassw];
     [self tapConfirmForResults];
diff --git a/Ifish/controllers/leftcontrollers/SelectDeviceViewController.m b/Ifish/controllers/leftcontrollers/SelectDeviceViewController.m
index ead889a..3aab2a9 100644
--- a/Ifish/controllers/leftcontrollers/SelectDeviceViewController.m
+++ b/Ifish/controllers/leftcontrollers/SelectDeviceViewController.m
@@ -9,7 +9,6 @@
 #import "SelectDeviceViewController.h"
 #import "FirstConnectWifiController.h"
 #import "LeftViewController.h"
-#import "CenterViewController.h"
 #import "ICSDrawerController.h"
 #import "YooseConnectFirstViewController.h"
 #import "IfishMianTabViewController.h"
diff --git a/Ifish/controllers/leftcontrollers/SetViewController.m b/Ifish/controllers/leftcontrollers/SetViewController.m
index 7872edb..4b0401c 100644
--- a/Ifish/controllers/leftcontrollers/SetViewController.m
+++ b/Ifish/controllers/leftcontrollers/SetViewController.m
@@ -17,7 +17,6 @@
 #import "ChangeSecretCodeController.h"
 #import "AboutUsViewController.h"
 //#import "LeftViewController.h"
-//#import "CenterViewController.h"
 #import "RegistViewController.h"
 #import "AppDelegate.h"
 #import "LogInViewController.h"
diff --git a/Ifish/controllers/logAddRegistController/RegistViewController.mm b/Ifish/controllers/logAddRegistController/RegistViewController.mm
index 63a4231..8674645 100644
--- a/Ifish/controllers/logAddRegistController/RegistViewController.mm
+++ b/Ifish/controllers/logAddRegistController/RegistViewController.mm
@@ -13,7 +13,6 @@
 #import "AFNetworking.h"
 #import "MyMD5.h"
 #import "LeftViewController.h"
-#import "CenterViewController.h"
 #import "RightViewController.h"
 #import "AgreementViewController.h"
 #import "MyIntroductionViewController.h"