diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj
index 092bc6b..6a9d305 100644
--- a/Ifish.xcodeproj/project.pbxproj
+++ b/Ifish.xcodeproj/project.pbxproj
@@ -2459,6 +2459,11 @@
 		E51D7D55208CE08D001FF053 /* CustomModeSetCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E51D7D53208CE08D001FF053 /* CustomModeSetCell.m */; };
 		E51D7D58208CE121001FF053 /* CustomModeSetCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E51D7D57208CE120001FF053 /* CustomModeSetCell.xib */; };
 		E51D7D5B208CF4E7001FF053 /* RuiMeiInputViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E51D7D5A208CF4E7001FF053 /* RuiMeiInputViewController.m */; };
+		E521222C21075C0D00BA24C5 /* tip.png in Resources */ = {isa = PBXBuildFile; fileRef = E521222B21075C0C00BA24C5 /* tip.png */; };
+		E52122302107609500BA24C5 /* RestartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E521222E2107609500BA24C5 /* RestartViewController.m */; };
+		E52122312107609500BA24C5 /* RestartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E521222F2107609500BA24C5 /* RestartViewController.xib */; };
+		E5212235210760A600BA24C5 /* SettingResetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E5212233210760A600BA24C5 /* SettingResetViewController.m */; };
+		E5212236210760A700BA24C5 /* SettingResetViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E5212234210760A600BA24C5 /* SettingResetViewController.xib */; };
 		E52B400521042ED2003BBA3E /* ConnectHotspotTipViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E52B400321042ED2003BBA3E /* ConnectHotspotTipViewController.m */; };
 		E52B400621042ED2003BBA3E /* ConnectHotspotTipViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E52B400421042ED2003BBA3E /* ConnectHotspotTipViewController.xib */; };
 		E547870B20728F390060C2C2 /* back_btn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E547870A20728F380060C2C2 /* back_btn@2x.png */; };
@@ -6242,6 +6247,13 @@
 		E51D7D57208CE120001FF053 /* CustomModeSetCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CustomModeSetCell.xib; sourceTree = "<group>"; };
 		E51D7D59208CF4E7001FF053 /* RuiMeiInputViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RuiMeiInputViewController.h; sourceTree = "<group>"; };
 		E51D7D5A208CF4E7001FF053 /* RuiMeiInputViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RuiMeiInputViewController.m; sourceTree = "<group>"; };
+		E521222B21075C0C00BA24C5 /* tip.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tip.png; sourceTree = "<group>"; };
+		E521222D2107609500BA24C5 /* RestartViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RestartViewController.h; sourceTree = "<group>"; };
+		E521222E2107609500BA24C5 /* RestartViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RestartViewController.m; sourceTree = "<group>"; };
+		E521222F2107609500BA24C5 /* RestartViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RestartViewController.xib; sourceTree = "<group>"; };
+		E5212232210760A600BA24C5 /* SettingResetViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SettingResetViewController.h; sourceTree = "<group>"; };
+		E5212233210760A600BA24C5 /* SettingResetViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SettingResetViewController.m; sourceTree = "<group>"; };
+		E5212234210760A600BA24C5 /* SettingResetViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SettingResetViewController.xib; sourceTree = "<group>"; };
 		E52B400221042ED2003BBA3E /* ConnectHotspotTipViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ConnectHotspotTipViewController.h; sourceTree = "<group>"; };
 		E52B400321042ED2003BBA3E /* ConnectHotspotTipViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ConnectHotspotTipViewController.m; sourceTree = "<group>"; };
 		E52B400421042ED2003BBA3E /* ConnectHotspotTipViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ConnectHotspotTipViewController.xib; sourceTree = "<group>"; };
@@ -9168,6 +9180,12 @@
 				883E76E91D48A5E50030E075 /* pushSetControllrs */,
 				88D0F27B1EA6F53E00286022 /* IfishSetViewController.h */,
 				88D0F27C1EA6F53E00286022 /* IfishSetViewController.m */,
+				E521222D2107609500BA24C5 /* RestartViewController.h */,
+				E521222E2107609500BA24C5 /* RestartViewController.m */,
+				E521222F2107609500BA24C5 /* RestartViewController.xib */,
+				E5212232210760A600BA24C5 /* SettingResetViewController.h */,
+				E5212233210760A600BA24C5 /* SettingResetViewController.m */,
+				E5212234210760A600BA24C5 /* SettingResetViewController.xib */,
 			);
 			path = mineControllers;
 			sourceTree = "<group>";
@@ -9607,6 +9625,7 @@
 				E56A746120FCDBFC000129C9 /* ConnectHotpotViewController.xib */,
 				E52B400221042ED2003BBA3E /* ConnectHotspotTipViewController.h */,
 				E52B400321042ED2003BBA3E /* ConnectHotspotTipViewController.m */,
+				E521222B21075C0C00BA24C5 /* tip.png */,
 				E52B400421042ED2003BBA3E /* ConnectHotspotTipViewController.xib */,
 			);
 			path = leftcontrollers;
@@ -14060,6 +14079,7 @@
 				8856B0F51DEE9FC7009D384A /* CameraBottomCollectionViewCell.xib in Resources */,
 				88C1B2201DCC5A1400C2C99A /* personal_iocn_switch.png in Resources */,
 				882956691DBDA3A200E9DDD7 /* minelook_buy.png in Resources */,
+				E5212236210760A700BA24C5 /* SettingResetViewController.xib in Resources */,
 				887492331E7A90D000CDA284 /* fishdoctor_iocn_default_fiftygold@2x.png in Resources */,
 				885979CE1E5293A1003D0E5C /* explore_iocn_optimization@2x.png in Resources */,
 				8871FADE1EBC58D70038E99A /* attestation_laststep_button@3x.png in Resources */,
@@ -14654,6 +14674,7 @@
 				882956BE1DBDA3A200E9DDD7 /* userIcon3.png in Resources */,
 				881671E01EA5DE2B00BEBF23 /* UMComUserTableViewCell.xib in Resources */,
 				882956FE1DBDA3A300E9DDD7 /* NewPiFu_beiyongoff.png in Resources */,
+				E52122312107609500BA24C5 /* RestartViewController.xib in Resources */,
 				88696FD51E9C8B4A005D4AFB /* MemberEditeViewLocationCell.xib in Resources */,
 				881A1D291DD2C31500BA1AF4 /* kankanlook_icon_attention.png in Resources */,
 				882956291DBDA3A200E9DDD7 /* neves0044.png in Resources */,
@@ -15089,6 +15110,7 @@
 				882956221DBDA3A100E9DDD7 /* neves0037.png in Resources */,
 				882956311DBDA3A200E9DDD7 /* neves0052.png in Resources */,
 				8814782C1E712A2700BFB79C /* task_shareCameraPicture@2x.png in Resources */,
+				E521222C21075C0D00BA24C5 /* tip.png in Resources */,
 				88C1B21B1DCC5A1400C2C99A /* personal_iocn_replace@2x.png in Resources */,
 				88602F541E12002600F3DB5D /* NTESContactViewController.xib in Resources */,
 				881478381E712E3A00BFB79C /* TaskKindViewCell.xib in Resources */,
@@ -15709,6 +15731,7 @@
 				88602F561E12002600F3DB5D /* NTESCustomNotificationObject.m in Sources */,
 				8853D99A1E24EED700776BF4 /* ShuoMingShuCell.m in Sources */,
 				8816721A1EA5DE2B00BEBF23 /* UMComCustomMenuViewController.m in Sources */,
+				E5212235210760A600BA24C5 /* SettingResetViewController.m in Sources */,
 				883E763A1D4897570030E075 /* heartModel.m in Sources */,
 				883E78971D48A5E50030E075 /* IfishMessageViewController.m in Sources */,
 				8860287F1E10BB1100F3DB5D /* CTAssetsGridSelectedView.m in Sources */,
@@ -16059,6 +16082,7 @@
 				885928C71E67C20600E0011E /* MineDengJi.m in Sources */,
 				881478371E712E3A00BFB79C /* TaskKindViewCell.m in Sources */,
 				8829582B1DC18CD100E9DDD7 /* AFNOHeaderHttpTool.m in Sources */,
+				E52122302107609500BA24C5 /* RestartViewController.m in Sources */,
 				886185CD1EF255F900459AD1 /* XuToControlNameViewController.m in Sources */,
 				881671FC1EA5DE2B00BEBF23 /* UMAssetsCollectionCheckMarkView.m in Sources */,
 				881477E61E71091300BFB79C /* IfishTaskModel.m in Sources */,
diff --git a/Ifish/Info.plist b/Ifish/Info.plist
index ca8dc54..f297380 100644
--- a/Ifish/Info.plist
+++ b/Ifish/Info.plist
@@ -70,7 +70,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>485</string>
+	<string>486</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m
index a4e761b..94ea041 100644
--- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m
+++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m
@@ -13,6 +13,9 @@
 #import "ChangeSecretCodeController.h"
 #define TUICHUAlertTAg 4100
 #import "IfishUserDefaultHelper.h"
+#import "RestartViewController.h"
+#import "SettingResetViewController.h"
+
 @interface IfishSetViewController ()<UITableViewDelegate,UITableViewDataSource,UIAlertViewDelegate>
 
 @property(nonatomic,strong)UITableView *tableView;
@@ -32,8 +35,8 @@ extern BOOL firstLogIn;
 }
 
 -(void)loadData{
-    self.titles=@[@[@"更换手机",@"修改密码"],@[@"切换账号"]];
-    self.imgs = @[@[@"personal_iocn_replace",@"replace_iocn_code"],@[@"personal_iocn_switch"]];
+    self.titles=@[@[@"更换手机",@"修改密码",@"设备重启",@"恢复出厂模式"],@[@"切换账号"]];
+    self.imgs = @[@[@"personal_iocn_replace",@"replace_iocn_code",@"replace_iocn_code",@"replace_iocn_code"],@[@"personal_iocn_switch"]];
     
 }
 -(void)creatTab{
@@ -61,16 +64,12 @@ extern BOOL firstLogIn;
 }
 
 -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
-    if (section==1) {
-        
-        return 1;
-    }
-    return 2;
+    return [self.titles[section] count];
 }
 
 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
     
-    return 2;
+    return self.titles.count;
     
 }
 
@@ -120,7 +119,17 @@ extern BOOL firstLogIn;
         ChangeSecretCodeController *secretVC=[[ChangeSecretCodeController alloc]init];
         [self.navigationController pushViewController:secretVC animated:YES];
         
-    }else if (indexPath.section==1&&indexPath.row==0){
+    } else if (indexPath.section == 0 && indexPath.row == 2) {
+        self.hidesBottomBarWhenPushed = YES;
+        RestartViewController *vc = [[RestartViewController alloc] initWithNibName:@"RestartViewController" bundle:nil];
+        vc.hidesBottomBarWhenPushed = YES;
+        [self.navigationController pushViewController:vc animated:YES];
+    } else if (indexPath.section == 0 && indexPath.row == 3) {
+        self.hidesBottomBarWhenPushed = YES;
+        SettingResetViewController *vc = [[SettingResetViewController alloc] initWithNibName:@"SettingResetViewController" bundle:nil];
+        vc.hidesBottomBarWhenPushed = YES;
+        [self.navigationController pushViewController:vc animated:YES];
+    } else if (indexPath.section==1&&indexPath.row==0){
         
         UIAlertView*alert=[[UIAlertView alloc]initWithTitle:@"提醒" message:@"确认切换账号并重新登录?" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确定", nil];
         alert.tag=TUICHUAlertTAg;
diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.h b/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.h
new file mode 100644
index 0000000..216ba44
--- /dev/null
+++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.h
@@ -0,0 +1,13 @@
+//
+//  RestartViewController.h
+//  Ifish
+//
+//  Created by Minghao Xue on 2018/7/24.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "BaseVIewContorller.h"
+
+@interface RestartViewController : BaseVIewContorller
+
+@end
diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.m
new file mode 100644
index 0000000..8f129ca
--- /dev/null
+++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.m
@@ -0,0 +1,37 @@
+//
+//  RestartViewController.m
+//  Ifish
+//
+//  Created by Minghao Xue on 2018/7/24.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "RestartViewController.h"
+
+@interface RestartViewController ()
+
+@end
+
+@implementation RestartViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.title = @"重启设备";
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end
diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.xib b/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.xib
new file mode 100644
index 0000000..9a5b22b
--- /dev/null
+++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.xib
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" 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="14088"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="RestartViewController">
+            <connections>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BWu-i5-5cz">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AUh-Mz-d0M">
+                            <rect key="frame" x="0.0" y="35" width="375" height="183"/>
+                            <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" image="hotspotconnect" translatesAutoresizingMaskIntoConstraints="NO" id="Jxl-Be-0Xs">
+                                    <rect key="frame" x="21" y="20" width="16" height="16"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="16" id="bgX-uM-xHh"/>
+                                        <constraint firstAttribute="width" constant="16" id="gIv-g4-dYs"/>
+                                    </constraints>
+                                </imageView>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="特别提醒" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z7A-1k-qZh">
+                                    <rect key="frame" x="50" y="18.5" width="69.5" height="20.5"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xee-7X-jVQ" customClass="UIImageView">
+                                    <rect key="frame" x="38" y="61" width="299" height="1"/>
+                                    <color key="backgroundColor" red="0.77127617390000003" green="0.77127617390000003" blue="0.77127617390000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="1" id="isE-Hc-pcb"/>
+                                    </constraints>
+                                </view>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1.请将手机连接至wifi:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Co-3E-wck">
+                                    <rect key="frame" x="50" y="78" width="145.5" height="18"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ifish-xxxx" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DGq-5e-qqU">
+                                    <rect key="frame" x="203" y="78" width="62" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2.设备重启后将会自动连接，若不能连接成功则可以采用断电重启的方式再进行重连" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KxN-8O-gKZ">
+                                    <rect key="frame" x="50" y="109" width="273" height="54"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b2e-0b-mNW">
+                                    <rect key="frame" x="269" y="71.5" width="62" height="30"/>
+                                    <color key="backgroundColor" red="0.08235294118" green="0.66274509800000003" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <state key="normal" title="点击连接">
+                                        <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    </state>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                            <integer key="value" value="8"/>
+                                        </userDefinedRuntimeAttribute>
+                                        <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                                    </userDefinedRuntimeAttributes>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstItem="KxN-8O-gKZ" firstAttribute="top" secondItem="7Co-3E-wck" secondAttribute="bottom" constant="13" id="AlC-Re-njC"/>
+                                <constraint firstItem="b2e-0b-mNW" firstAttribute="leading" secondItem="DGq-5e-qqU" secondAttribute="trailing" constant="4" id="CJn-O2-790"/>
+                                <constraint firstItem="DGq-5e-qqU" firstAttribute="centerY" secondItem="7Co-3E-wck" secondAttribute="centerY" id="DVw-Cu-qa2"/>
+                                <constraint firstAttribute="trailing" secondItem="xee-7X-jVQ" secondAttribute="trailing" constant="38" id="HUd-hO-GvJ"/>
+                                <constraint firstItem="KxN-8O-gKZ" firstAttribute="leading" secondItem="7Co-3E-wck" secondAttribute="leading" id="HdJ-13-Knr"/>
+                                <constraint firstItem="xee-7X-jVQ" firstAttribute="top" secondItem="Z7A-1k-qZh" secondAttribute="bottom" constant="22" id="Jrt-g4-wbO"/>
+                                <constraint firstItem="DGq-5e-qqU" firstAttribute="leading" secondItem="7Co-3E-wck" secondAttribute="trailing" constant="8" id="KtF-fP-YDI"/>
+                                <constraint firstItem="Jxl-Be-0Xs" firstAttribute="top" secondItem="AUh-Mz-d0M" secondAttribute="top" constant="20" id="Ppv-Eg-B2S"/>
+                                <constraint firstItem="7Co-3E-wck" firstAttribute="leading" secondItem="Z7A-1k-qZh" secondAttribute="leading" id="RXi-gk-QUk"/>
+                                <constraint firstAttribute="trailing" secondItem="KxN-8O-gKZ" secondAttribute="trailing" constant="52" id="bSS-Qo-bV5"/>
+                                <constraint firstItem="7Co-3E-wck" firstAttribute="top" secondItem="xee-7X-jVQ" secondAttribute="bottom" constant="16" id="bsV-RT-2jI"/>
+                                <constraint firstItem="xee-7X-jVQ" firstAttribute="leading" secondItem="AUh-Mz-d0M" secondAttribute="leading" constant="38" id="cb2-qt-VKu"/>
+                                <constraint firstAttribute="bottom" secondItem="KxN-8O-gKZ" secondAttribute="bottom" constant="20" id="dFN-2r-FVX"/>
+                                <constraint firstItem="b2e-0b-mNW" firstAttribute="centerY" secondItem="DGq-5e-qqU" secondAttribute="centerY" id="gus-rH-2HW"/>
+                                <constraint firstItem="Z7A-1k-qZh" firstAttribute="centerY" secondItem="Jxl-Be-0Xs" secondAttribute="centerY" id="pIy-tA-XHX"/>
+                                <constraint firstItem="Z7A-1k-qZh" firstAttribute="leading" secondItem="Jxl-Be-0Xs" secondAttribute="trailing" constant="13" id="rw3-lv-3Xk"/>
+                                <constraint firstItem="Jxl-Be-0Xs" firstAttribute="leading" secondItem="AUh-Mz-d0M" secondAttribute="leading" constant="21" id="u4n-vO-BI6"/>
+                            </constraints>
+                        </view>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oZt-aX-ebt">
+                            <rect key="frame" x="36" y="236" width="303" height="30"/>
+                            <color key="backgroundColor" red="0.08235294118" green="0.66274509800000003" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="bZX-oR-Uzz"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <state key="normal" title="确定重启"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                    <integer key="value" value="4"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                            </userDefinedRuntimeAttributes>
+                        </button>
+                    </subviews>
+                    <constraints>
+                        <constraint firstItem="oZt-aX-ebt" firstAttribute="leading" secondItem="BWu-i5-5cz" secondAttribute="leading" constant="36" id="3Sh-Ix-iyK"/>
+                        <constraint firstItem="AUh-Mz-d0M" firstAttribute="top" secondItem="BWu-i5-5cz" secondAttribute="top" constant="35" id="Chj-oJ-2tc"/>
+                        <constraint firstItem="oZt-aX-ebt" firstAttribute="top" secondItem="AUh-Mz-d0M" secondAttribute="bottom" constant="18" id="G01-zo-Gm4"/>
+                        <constraint firstItem="AUh-Mz-d0M" firstAttribute="leading" secondItem="BWu-i5-5cz" secondAttribute="leading" id="LTN-I3-JgD"/>
+                        <constraint firstItem="oZt-aX-ebt" firstAttribute="top" secondItem="AUh-Mz-d0M" secondAttribute="bottom" constant="18" id="PNM-xq-Lbb"/>
+                        <constraint firstItem="oZt-aX-ebt" firstAttribute="leading" secondItem="BWu-i5-5cz" secondAttribute="leading" constant="36" id="SIO-hO-czP"/>
+                        <constraint firstItem="oZt-aX-ebt" firstAttribute="centerX" secondItem="BWu-i5-5cz" secondAttribute="centerX" id="SpR-8W-y8Q"/>
+                        <constraint firstAttribute="bottom" secondItem="oZt-aX-ebt" secondAttribute="bottom" constant="20" id="Yhj-fM-aF9"/>
+                        <constraint firstAttribute="bottom" secondItem="oZt-aX-ebt" secondAttribute="bottom" constant="20" id="abp-AB-4qS"/>
+                        <constraint firstAttribute="trailing" secondItem="oZt-aX-ebt" secondAttribute="trailing" constant="36" id="bAW-di-XNz"/>
+                        <constraint firstAttribute="trailing" secondItem="oZt-aX-ebt" secondAttribute="trailing" constant="36" id="kG4-nu-KiQ"/>
+                        <constraint firstAttribute="trailing" secondItem="AUh-Mz-d0M" secondAttribute="trailing" id="sRc-WW-b3R"/>
+                    </constraints>
+                </scrollView>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="BWu-i5-5cz" secondAttribute="bottom" id="Iv9-Ud-DFi"/>
+                <constraint firstItem="BWu-i5-5cz" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="W44-WN-qL4"/>
+                <constraint firstItem="BWu-i5-5cz" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="djT-4V-2UP"/>
+                <constraint firstAttribute="trailing" secondItem="BWu-i5-5cz" secondAttribute="trailing" id="gmf-Ia-RbP"/>
+                <constraint firstItem="AUh-Mz-d0M" firstAttribute="width" secondItem="i5M-Pr-FkT" secondAttribute="width" id="yZI-6x-OTt"/>
+            </constraints>
+            <point key="canvasLocation" x="24.5" y="51.5"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="hotspotconnect" width="19" height="17"/>
+    </resources>
+</document>
diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.h b/Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.h
new file mode 100644
index 0000000..6975757
--- /dev/null
+++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.h
@@ -0,0 +1,13 @@
+//
+//  SettingResetViewController.h
+//  Ifish
+//
+//  Created by Minghao Xue on 2018/7/24.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "BaseVIewContorller.h"
+
+@interface SettingResetViewController : BaseVIewContorller
+
+@end
diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.m
new file mode 100644
index 0000000..c5e2b39
--- /dev/null
+++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.m
@@ -0,0 +1,38 @@
+//
+//  SettingResetViewController.m
+//  Ifish
+//
+//  Created by Minghao Xue on 2018/7/24.
+//  Copyright © 2018年 lianlian. All rights reserved.
+//
+
+#import "SettingResetViewController.h"
+
+@interface SettingResetViewController ()
+
+@end
+
+@implementation SettingResetViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.title = @"恢复出厂设置";
+
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end
diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.xib b/Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.xib
new file mode 100644
index 0000000..ed7c240
--- /dev/null
+++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.xib
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" 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="14088"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SettingResetViewController">
+            <connections>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nsq-Ll-ePn">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hmh-Qz-g3c">
+                            <rect key="frame" x="0.0" y="35" width="375" height="183"/>
+                            <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" image="hotspotconnect" translatesAutoresizingMaskIntoConstraints="NO" id="Y4O-50-CzP">
+                                    <rect key="frame" x="21" y="20" width="16" height="16"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="16" id="5pg-9H-7gX"/>
+                                        <constraint firstAttribute="width" constant="16" id="PqR-kc-gxk"/>
+                                    </constraints>
+                                </imageView>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="特别提醒" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iJA-np-ESy">
+                                    <rect key="frame" x="50" y="18.5" width="69.5" height="20.5"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DBF-b1-8Di" customClass="UIImageView">
+                                    <rect key="frame" x="38" y="61" width="299" height="1"/>
+                                    <color key="backgroundColor" red="0.77127617390000003" green="0.77127617390000003" blue="0.77127617390000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="1" id="scZ-MA-HWy"/>
+                                    </constraints>
+                                </view>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1.请将手机连接至wifi:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q2B-K0-R3L">
+                                    <rect key="frame" x="50" y="78" width="145.5" height="18"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ifish-xxxx" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GJv-hc-FLm">
+                                    <rect key="frame" x="203" y="78" width="62" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2.恢复出厂参数指令将清除内部保存参数，设备信息、路由器信息、服务器地址、故障记录信息全部被默认设置。" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PwC-sM-vwr">
+                                    <rect key="frame" x="50" y="109" width="273" height="54"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hmW-nS-fZt">
+                                    <rect key="frame" x="269" y="71.5" width="62" height="30"/>
+                                    <color key="backgroundColor" red="0.08235294118" green="0.66274509800000003" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <state key="normal" title="点击连接">
+                                        <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    </state>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                            <integer key="value" value="8"/>
+                                        </userDefinedRuntimeAttribute>
+                                        <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                                    </userDefinedRuntimeAttributes>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstItem="Y4O-50-CzP" firstAttribute="top" secondItem="Hmh-Qz-g3c" secondAttribute="top" constant="20" id="3w0-TD-w7v"/>
+                                <constraint firstItem="GJv-hc-FLm" firstAttribute="centerY" secondItem="q2B-K0-R3L" secondAttribute="centerY" id="6vx-5G-UE1"/>
+                                <constraint firstAttribute="trailing" secondItem="PwC-sM-vwr" secondAttribute="trailing" constant="52" id="AwE-CM-ElH"/>
+                                <constraint firstItem="Y4O-50-CzP" firstAttribute="leading" secondItem="Hmh-Qz-g3c" secondAttribute="leading" constant="21" id="EBe-Ri-fen"/>
+                                <constraint firstItem="hmW-nS-fZt" firstAttribute="leading" secondItem="GJv-hc-FLm" secondAttribute="trailing" constant="4" id="GaC-aT-yv6"/>
+                                <constraint firstItem="GJv-hc-FLm" firstAttribute="leading" secondItem="q2B-K0-R3L" secondAttribute="trailing" constant="8" id="IlM-PV-lN7"/>
+                                <constraint firstItem="DBF-b1-8Di" firstAttribute="leading" secondItem="Hmh-Qz-g3c" secondAttribute="leading" constant="38" id="Jdz-qN-yCS"/>
+                                <constraint firstItem="hmW-nS-fZt" firstAttribute="centerY" secondItem="GJv-hc-FLm" secondAttribute="centerY" id="Lf6-yl-bSc"/>
+                                <constraint firstItem="iJA-np-ESy" firstAttribute="leading" secondItem="Y4O-50-CzP" secondAttribute="trailing" constant="13" id="TeA-Cm-Ly5"/>
+                                <constraint firstItem="q2B-K0-R3L" firstAttribute="top" secondItem="DBF-b1-8Di" secondAttribute="bottom" constant="16" id="XPK-MM-gih"/>
+                                <constraint firstItem="DBF-b1-8Di" firstAttribute="top" secondItem="iJA-np-ESy" secondAttribute="bottom" constant="22" id="YQf-rv-UDW"/>
+                                <constraint firstItem="PwC-sM-vwr" firstAttribute="top" secondItem="q2B-K0-R3L" secondAttribute="bottom" constant="13" id="cRa-RL-IR2"/>
+                                <constraint firstItem="iJA-np-ESy" firstAttribute="centerY" secondItem="Y4O-50-CzP" secondAttribute="centerY" id="dPW-tR-lj7"/>
+                                <constraint firstAttribute="trailing" secondItem="DBF-b1-8Di" secondAttribute="trailing" constant="38" id="dfB-or-nzx"/>
+                                <constraint firstItem="PwC-sM-vwr" firstAttribute="leading" secondItem="q2B-K0-R3L" secondAttribute="leading" id="hhd-Bh-bNq"/>
+                                <constraint firstItem="q2B-K0-R3L" firstAttribute="leading" secondItem="iJA-np-ESy" secondAttribute="leading" id="mqw-CL-bpe"/>
+                                <constraint firstAttribute="bottom" secondItem="PwC-sM-vwr" secondAttribute="bottom" constant="20" id="rOm-yC-cCx"/>
+                            </constraints>
+                        </view>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aPp-g0-kA2">
+                            <rect key="frame" x="36" y="236" width="303" height="30"/>
+                            <color key="backgroundColor" red="0.08235294118" green="0.66274509800000003" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="0Fg-MZ-PZd"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <state key="normal" title="确定恢复出厂值"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                    <integer key="value" value="4"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                            </userDefinedRuntimeAttributes>
+                        </button>
+                    </subviews>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="aPp-g0-kA2" secondAttribute="bottom" constant="20" id="8jk-Mm-8jR"/>
+                        <constraint firstItem="aPp-g0-kA2" firstAttribute="leading" secondItem="Nsq-Ll-ePn" secondAttribute="leading" constant="36" id="8mq-HT-uEu"/>
+                        <constraint firstItem="aPp-g0-kA2" firstAttribute="centerX" secondItem="Nsq-Ll-ePn" secondAttribute="centerX" id="CDl-Ks-DXe"/>
+                        <constraint firstItem="aPp-g0-kA2" firstAttribute="top" secondItem="Hmh-Qz-g3c" secondAttribute="bottom" constant="18" id="O21-ss-uRr"/>
+                        <constraint firstItem="aPp-g0-kA2" firstAttribute="leading" secondItem="Nsq-Ll-ePn" secondAttribute="leading" constant="36" id="Qti-A3-6Ze"/>
+                        <constraint firstItem="aPp-g0-kA2" firstAttribute="top" secondItem="Hmh-Qz-g3c" secondAttribute="bottom" constant="18" id="agu-8W-TSh"/>
+                        <constraint firstAttribute="trailing" secondItem="aPp-g0-kA2" secondAttribute="trailing" constant="36" id="cU3-0e-6Zt"/>
+                        <constraint firstAttribute="bottom" secondItem="aPp-g0-kA2" secondAttribute="bottom" constant="20" id="ezh-1n-e2s"/>
+                        <constraint firstAttribute="trailing" secondItem="Hmh-Qz-g3c" secondAttribute="trailing" id="oTL-7I-zey"/>
+                        <constraint firstAttribute="trailing" secondItem="aPp-g0-kA2" secondAttribute="trailing" constant="36" id="s0h-5I-UEp"/>
+                        <constraint firstItem="Hmh-Qz-g3c" firstAttribute="top" secondItem="Nsq-Ll-ePn" secondAttribute="top" constant="35" id="svA-gP-NZU"/>
+                        <constraint firstItem="Hmh-Qz-g3c" firstAttribute="leading" secondItem="Nsq-Ll-ePn" secondAttribute="leading" id="utL-HY-TdK"/>
+                    </constraints>
+                </scrollView>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="Nsq-Ll-ePn" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="IVk-jR-n3v"/>
+                <constraint firstAttribute="bottom" secondItem="Nsq-Ll-ePn" secondAttribute="bottom" id="JCo-ME-iHx"/>
+                <constraint firstItem="Nsq-Ll-ePn" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="eqr-XM-Yop"/>
+                <constraint firstAttribute="trailing" secondItem="Nsq-Ll-ePn" secondAttribute="trailing" id="sea-0V-d5J"/>
+            </constraints>
+        </view>
+    </objects>
+    <resources>
+        <image name="hotspotconnect" width="19" height="17"/>
+    </resources>
+</document>
diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib
index 6b66456..e5d2fc8 100644
--- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib
+++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
diff --git a/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m
index 99998ae..ce19e6e 100644
--- a/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m
+++ b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m
@@ -20,19 +20,4 @@
 
 }
 
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
 @end
diff --git a/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.xib b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.xib
index aec9dc5..15ebe93 100644
--- a/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.xib
+++ b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.xib
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" 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="14088"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -16,57 +17,46 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="i5M-Pr-FkT">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="3174"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ga8-zb-3S0">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="3174"/>
                     <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Knt-KR-zUe">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                            <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1、请将新产品通电" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S5I-st-nTV">
-                                    <rect key="frame" x="20" y="28" width="335" height="21"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <nil key="textColor"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2、打开手机点击：设置-WIFI-选择ifish-xxxx的网络，输入密码12345678 连接好后返回爱鱼奇热点连接页面输入路由器名称和密码。" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ryL-3J-xoh">
-                                    <rect key="frame" x="20" y="57" width="335" height="81.5"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <nil key="textColor"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                            </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tip.png" translatesAutoresizingMaskIntoConstraints="NO" id="SwS-gb-wDb">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="1724.5"/>
                             <constraints>
-                                <constraint firstItem="S5I-st-nTV" firstAttribute="top" secondItem="Knt-KR-zUe" secondAttribute="top" constant="28" id="4BH-ol-r9i"/>
-                                <constraint firstAttribute="trailing" secondItem="S5I-st-nTV" secondAttribute="trailing" constant="20" id="9dI-Vp-P9a"/>
-                                <constraint firstAttribute="trailing" secondItem="ryL-3J-xoh" secondAttribute="trailing" constant="20" id="GUV-PY-RZx"/>
-                                <constraint firstItem="ryL-3J-xoh" firstAttribute="top" secondItem="S5I-st-nTV" secondAttribute="bottom" constant="8" id="LKb-oT-XwG"/>
-                                <constraint firstItem="ryL-3J-xoh" firstAttribute="leading" secondItem="Knt-KR-zUe" secondAttribute="leading" constant="20" id="QWr-LG-AW2"/>
-                                <constraint firstItem="S5I-st-nTV" firstAttribute="leading" secondItem="Knt-KR-zUe" secondAttribute="leading" constant="20" id="mGn-Pq-uHv"/>
+                                <constraint firstAttribute="width" secondItem="SwS-gb-wDb" secondAttribute="height" multiplier="750:3449" id="Tdv-hp-gEO"/>
+                                <constraint firstAttribute="height" constant="1724.5" id="TfU-XG-Yp1"/>
                             </constraints>
-                        </view>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                    <real key="value" value="0.0"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                        </imageView>
                     </subviews>
                     <constraints>
-                        <constraint firstAttribute="bottom" secondItem="Knt-KR-zUe" secondAttribute="bottom" id="GNV-vS-a72"/>
-                        <constraint firstAttribute="trailing" secondItem="Knt-KR-zUe" secondAttribute="trailing" id="rGa-Hq-4Rk"/>
-                        <constraint firstItem="Knt-KR-zUe" firstAttribute="top" secondItem="ga8-zb-3S0" secondAttribute="top" id="tpa-kN-pSx"/>
-                        <constraint firstItem="Knt-KR-zUe" firstAttribute="leading" secondItem="ga8-zb-3S0" secondAttribute="leading" id="wAj-iS-IDe"/>
+                        <constraint firstItem="SwS-gb-wDb" firstAttribute="leading" secondItem="ga8-zb-3S0" secondAttribute="leading" id="VnB-ze-GKK"/>
+                        <constraint firstItem="SwS-gb-wDb" firstAttribute="top" secondItem="ga8-zb-3S0" secondAttribute="top" id="iB9-V6-KAV"/>
+                        <constraint firstAttribute="bottom" secondItem="SwS-gb-wDb" secondAttribute="bottom" id="rZM-Vw-go1"/>
+                        <constraint firstAttribute="trailing" secondItem="SwS-gb-wDb" secondAttribute="trailing" id="s8q-gp-UwF"/>
                     </constraints>
                 </scrollView>
             </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
-                <constraint firstItem="Knt-KR-zUe" firstAttribute="height" secondItem="i5M-Pr-FkT" secondAttribute="height" id="L3t-S6-fSC"/>
-                <constraint firstItem="Knt-KR-zUe" firstAttribute="width" secondItem="i5M-Pr-FkT" secondAttribute="width" id="RKJ-Yu-txu"/>
-                <constraint firstItem="ga8-zb-3S0" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="X63-pt-sKA"/>
-                <constraint firstItem="ga8-zb-3S0" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="byF-Gh-KKV"/>
-                <constraint firstAttribute="bottom" secondItem="ga8-zb-3S0" secondAttribute="bottom" id="lza-8T-7t7"/>
-                <constraint firstAttribute="trailing" secondItem="ga8-zb-3S0" secondAttribute="trailing" id="xx5-Oj-iBR"/>
+                <constraint firstAttribute="bottom" secondItem="ga8-zb-3S0" secondAttribute="bottom" id="9vT-F2-9an"/>
+                <constraint firstAttribute="trailing" secondItem="ga8-zb-3S0" secondAttribute="trailing" id="CTc-eO-o8t"/>
+                <constraint firstItem="ga8-zb-3S0" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="KYp-hh-hve"/>
+                <constraint firstItem="SwS-gb-wDb" firstAttribute="width" secondItem="i5M-Pr-FkT" secondAttribute="width" id="OnW-ou-Y9w"/>
+                <constraint firstItem="ga8-zb-3S0" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="ey7-pu-en9"/>
             </constraints>
-            <point key="canvasLocation" x="32.5" y="76.5"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="32.5" y="1330"/>
         </view>
     </objects>
+    <resources>
+        <image name="tip.png" width="750" height="3449"/>
+    </resources>
 </document>
diff --git a/Ifish/controllers/leftcontrollers/tip.png b/Ifish/controllers/leftcontrollers/tip.png
new file mode 100644
index 0000000..2d7b3ca
Binary files /dev/null and b/Ifish/controllers/leftcontrollers/tip.png differ