diff --git a/.DS_Store b/.DS_Store
index 51d71bf..fee307e 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishNewLiveList/LoveFishLiveListBaseViewController.m b/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishNewLiveList/LoveFishLiveListBaseViewController.m
index aa64458..fee4aa1 100644
--- a/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishNewLiveList/LoveFishLiveListBaseViewController.m
+++ b/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishNewLiveList/LoveFishLiveListBaseViewController.m
@@ -80,9 +80,8 @@
     pageController.selectIndex = 0;
     //pageController.menuViewBottomSpace = 10;
     [self addChildViewController: pageController];
-    CGFloat height = [UIApplication sharedApplication].statusBarFrame.size.height + 44;
     //看看在tab中时
-    pageController.viewFrame = CGRectMake(0,height,self.view.frame.size.width, self.view.frame.size.height - height) ;
+    pageController.viewFrame = CGRectMake(0,0,self.view.frame.size.width, self.view.frame.size.height-49) ;
     self.pageController = pageController;
     [self.view addSubview: pageController.view];
     
diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
index b32c98f..3024bc6 100644
--- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
+++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
@@ -472,8 +472,10 @@ extern BOOL isfromCameraView;
     
     NSMutableAttributedString * attributedString = [[NSMutableAttributedString alloc] initWithString:msg];
 
-    
-    [attributedString addAttribute:NSForegroundColorAttributeName  value:[UIColor colorWithRed:0 green:170.0/255.0 blue:218.0/255.0 alpha:1] range:NSMakeRange(msg.length - 3 -_ssid.length,_ssid.length)];
+    NSMutableParagraphStyle *paraghStyle =[[NSMutableParagraphStyle alloc] init];
+    [paraghStyle setLineSpacing:4];
+    [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithRed:0 green:170.0/255.0 blue:218.0/255.0 alpha:1] range:NSMakeRange(msg.length - 3 -_ssid.length,_ssid.length)];
+    [attributedString addAttribute:NSParagraphStyleAttributeName value:paraghStyle range:NSMakeRange(0, msg.length)];
     
     [_wifiNamelabel setAttributedText:attributedString];
     _wifiTextFiled.secureTextEntry=NO;
diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib
index 9b080af..50b8808 100644
--- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib
+++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib
@@ -30,7 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="  请输入WiFi密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="pTf-KM-cQt">
-                    <rect key="frame" x="17" y="64" width="343" height="43"/>
+                    <rect key="frame" x="17" y="48.5" width="343" height="43"/>
                     <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="43" id="zNS-Ou-3gj"/>
@@ -39,13 +39,13 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="如果连接有问题，请尝试热点连接模式" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dwN-It-iak">
-                    <rect key="frame" x="16" y="136" width="209" height="15"/>
+                    <rect key="frame" x="16" y="120.5" width="208.5" height="14.5"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eDA-Ia-DAy">
-                    <rect key="frame" x="225" y="130" width="50" height="27"/>
+                    <rect key="frame" x="224.5" y="114.5" width="50" height="27"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <state key="normal" title="点击这里"/>
                     <connections>
@@ -69,26 +69,23 @@
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </view>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ssidLabel" lineBreakMode="tailTruncation" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dLX-z3-jjZ">
-                    <rect key="frame" x="24" y="18" width="336" height="36"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="36" id="Dw1-TT-raa"/>
-                    </constraints>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请连接" lineBreakMode="tailTruncation" numberOfLines="0" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dLX-z3-jjZ">
+                    <rect key="frame" x="24" y="18" width="336" height="20.5"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="linkingdevice_point.png" translatesAutoresizingMaskIntoConstraints="NO" id="ZVX-4y-CYu">
-                    <rect key="frame" x="13" y="31.5" width="9" height="9"/>
+                    <rect key="frame" x="13" y="24" width="9" height="9"/>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(暂不支持5G网络，请使用2.4G网络）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Djf-KM-um4">
-                    <rect key="frame" x="23" y="112" width="224" height="16"/>
+                    <rect key="frame" x="23" y="96.5" width="224" height="16"/>
                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                     <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pAw-UG-caT">
-                    <rect key="frame" x="267" y="64" width="93" height="44"/>
+                    <rect key="frame" x="267" y="48.5" width="93" height="44"/>
                     <state key="normal" title="确定" backgroundImage="linkingdevice_botton.png"/>
                     <connections>
                         <action selector="makeSureButton:" destination="-1" eventType="touchUpInside" id="MmM-3q-5Lu"/>
@@ -100,6 +97,7 @@
                 <constraint firstAttribute="trailing" secondItem="dLX-z3-jjZ" secondAttribute="trailing" constant="15" id="4y5-BD-vSU"/>
                 <constraint firstItem="dwN-It-iak" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="16" id="5KQ-lk-Bh2"/>
                 <constraint firstAttribute="trailing" secondItem="pTf-KM-cQt" secondAttribute="trailing" constant="15" id="9Lh-op-znd"/>
+                <constraint firstItem="ZVX-4y-CYu" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="24" id="DA6-JK-E8E"/>
                 <constraint firstItem="pAw-UG-caT" firstAttribute="top" secondItem="pTf-KM-cQt" secondAttribute="top" id="DIZ-dK-YeC"/>
                 <constraint firstItem="dLX-z3-jjZ" firstAttribute="leading" secondItem="ZVX-4y-CYu" secondAttribute="trailing" constant="2" id="DiL-E2-Ffv"/>
                 <constraint firstItem="pAw-UG-caT" firstAttribute="trailing" secondItem="pTf-KM-cQt" secondAttribute="trailing" id="F1u-S4-uOT"/>
@@ -110,7 +108,6 @@
                 <constraint firstItem="eDA-Ia-DAy" firstAttribute="leading" secondItem="dwN-It-iak" secondAttribute="trailing" id="UOq-SD-7bv"/>
                 <constraint firstItem="Djf-KM-um4" firstAttribute="top" secondItem="pTf-KM-cQt" secondAttribute="bottom" constant="5" id="ZI9-XL-QR0"/>
                 <constraint firstItem="pTf-KM-cQt" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="17" id="Zpq-5y-Mzb"/>
-                <constraint firstItem="ZVX-4y-CYu" firstAttribute="centerY" secondItem="dLX-z3-jjZ" secondAttribute="centerY" id="buo-fh-zXW"/>
                 <constraint firstItem="dLX-z3-jjZ" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="24" id="idB-iY-9tX"/>
                 <constraint firstItem="pTf-KM-cQt" firstAttribute="top" secondItem="dLX-z3-jjZ" secondAttribute="bottom" constant="10" id="kgi-vi-69m"/>
                 <constraint firstItem="dLX-z3-jjZ" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="18" id="vxM-7Q-dY3"/>