From b871a24c4e02496ced0a4d2294955fcd19bce462 Mon Sep 17 00:00:00 2001
From: wbzhan_macbook <wbzhan@yeah.net>
Date: Thu, 29 Aug 2019 21:59:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=8A=A0=E7=83=AD=E5=99=A8?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=8Ctitle=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                                     | Bin 10244 -> 10244 bytes
 .../ConnectHotpotViewController.m             |  26 +++++++++---------
 .../ConnectHotpotViewController.xib           |   6 ++--
 .../ConnectHotspotTipViewController.m         |   2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index a6f91990bc6e3c1aa5a565422c627aeb1010cb19..39ef797c2abdb77613607f99aea4d723cc078f35 100644
GIT binary patch
delta 26
icmZn(XbIR*E5dXycJf9MrOBE?yi7_5Hg6CK5e5K;rwKj)

delta 26
icmZn(XbIR*E5fvC<K&GZN|QB(c$t(YY~COeA`AeC0|_<&

diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m
index a47df46..3e756d8 100644
--- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m
+++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m
@@ -52,8 +52,8 @@ Copy NSString *wifiName;//当前wifi名称
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.title = @"热点连接";
-    
+    [self addTitleViewWithTitle:@"热点连接"];
+
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keybordframeChanged:) name:UIKeyboardDidChangeFrameNotification object:nil];
     for (UIImageView *view in self.dashView) {
         view.backgroundColor = [UIColor clearColor];
@@ -64,17 +64,17 @@ Copy NSString *wifiName;//当前wifi名称
     fiveTapGesture.numberOfTapsRequired = 5;
     [self.containerView addGestureRecognizer:fiveTapGesture];
     
-    UIButton *back = [UIButton buttonWithType:UIButtonTypeCustom];
-    back.frame = CGRectMake(0,0,48,44);
-    [back setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
-    // [_bakbutton setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
-    back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
-    [back addTarget: self action: @selector(clickBack) forControlEvents: UIControlEventTouchUpInside];
-    [back setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)];
-    back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
-    UIBarButtonItem * backItem=[[UIBarButtonItem alloc] initWithCustomView:back];
-    
-    self.navigationItem.leftBarButtonItem=backItem;
+//    UIButton *back = [UIButton buttonWithType:UIButtonTypeCustom];
+//    back.frame = CGRectMake(0,0,48,44);
+//    [back setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
+//    // [_bakbutton setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
+//    back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
+//    [back addTarget: self action: @selector(clickBack) forControlEvents: UIControlEventTouchUpInside];
+//    [back setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)];
+//    back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
+//    UIBarButtonItem * backItem=[[UIBarButtonItem alloc] initWithCustomView:back];
+//    
+//    self.navigationItem.leftBarButtonItem=backItem;
     
     NSDictionary *wifiDic = [self fetchSSIDInfo];
     NSString *wifiName = [wifiDic objectForKey:@"SSID"];
diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib
index 9dae9b1..9388012 100644
--- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib
+++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib
@@ -30,7 +30,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Km-pH-09L">
-                            <rect key="frame" x="0.0" y="35" width="375" height="251"/>
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="251"/>
                             <subviews>
                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="YQa-dk-iMD">
                                     <rect key="frame" x="21" y="20" width="16" height="16"/>
@@ -156,7 +156,7 @@
                             </constraints>
                         </view>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mTK-j3-V77">
-                            <rect key="frame" x="36" y="304" width="303" height="30"/>
+                            <rect key="frame" x="36" y="269" width="303" height="30"/>
                             <color key="backgroundColor" red="0.082352941176470587" green="0.66274509803921566" blue="0.92156862745098034" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="30" id="8Ra-AW-7XB"/>
@@ -175,7 +175,7 @@
                         </button>
                     </subviews>
                     <constraints>
-                        <constraint firstItem="1Km-pH-09L" firstAttribute="top" secondItem="rVr-h5-uWd" secondAttribute="top" constant="35" id="3jw-tR-fsS"/>
+                        <constraint firstItem="1Km-pH-09L" firstAttribute="top" secondItem="rVr-h5-uWd" secondAttribute="top" id="3jw-tR-fsS"/>
                         <constraint firstItem="mTK-j3-V77" firstAttribute="centerX" secondItem="rVr-h5-uWd" secondAttribute="centerX" id="5wV-9b-X56"/>
                         <constraint firstAttribute="trailing" secondItem="mTK-j3-V77" secondAttribute="trailing" constant="36" id="H8Z-fV-gfn"/>
                         <constraint firstAttribute="trailing" secondItem="1Km-pH-09L" secondAttribute="trailing" id="O9f-Uo-1eB"/>
diff --git a/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m
index ce19e6e..a2bc39c 100644
--- a/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m
+++ b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m
@@ -16,7 +16,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.title = @"ifish7热点连接";
+    [self addTitleViewWithTitle:@"连接说明"];
 
 }