From d51b0c90cd47b0d223459026c4b9c67f6488e734 Mon Sep 17 00:00:00 2001
From: xuemh <xue_minghao@qq.com>
Date: Fri, 30 Mar 2018 21:39:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=BE=E6=8E=A5wifi=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E9=80=82=E9=85=8DiPhone=20X?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../YooseeNextConnectViewController.mm               | 11 ++++++++---
 .../leftcontrollers/SecondConnectWifiController.m    | 12 ++++++++++++
 .../introductionView/MyIntroductionViewController.m  |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
index 5fafbae..e7dd717 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
@@ -562,8 +562,13 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
     //967/1018/ 0.95
     
     CGFloat percentHbiW = 0.117 ;//5s 35/300
-    
-    self.nodImg= [[UIImageView alloc] initWithFrame:CGRectMake(5, 20 + 64,12, 12)];
+    CGFloat y;
+    if (is_iPhone_X) {
+        y = 20 + 88;
+    } else {
+        y = 20 + 64;
+    }
+    self.nodImg= [[UIImageView alloc] initWithFrame:CGRectMake(5, y,12, 12)];
     self.nodImg.image = [UIImage imageNamed:@"linkingdevice_point"];
     [self.view addSubview:self.nodImg];
     
@@ -587,7 +592,7 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
     CGFloat labelSizeW = [self widthForString:self.wifilabel.text fontSize:18 andHeight:10];
     CGFloat labelH= [self heightForString:self.wifilabel.text fontSize:18 andWidth:labelSizeW];
     
-    self.wifilabel.frame = CGRectMake(CGRectGetMaxX(self.nodImg.frame), 20 + 64, labelSizeW, labelH);
+    self.wifilabel.frame = CGRectMake(CGRectGetMaxX(self.nodImg.frame), y, labelSizeW, labelH);
     
     [self.view addSubview:self.wifilabel];
     //wifi 输入框
diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
index 0d3c8bd..75531d3 100644
--- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
+++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
@@ -96,6 +96,7 @@ extern BOOL isfromCameraView;
     self.view.backgroundColor=[UIColor whiteColor];
     _deviceArry  =[[NSMutableArray alloc]init];
     
+    [self updateUI];
     [self getSSid];
     //输入框在上面新UI  可去
     
@@ -136,6 +137,17 @@ extern BOOL isfromCameraView;
     [self creatConnectStateUI];
 }
 
+- (void)updateUI {
+    CGFloat yOffset = 0;
+    if (is_iPhone_X) {
+        yOffset = 20 + 88;
+    } else {
+        yOffset = 20 + 64;
+    }
+    self.nodImg.frame = CGRectMake(12, yOffset, 10, 10);
+    self.wifiNamelabel.frame = CGRectMake(23, yOffset - 18 + 5, 336, 36);
+}
+
 -(void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
     
diff --git a/Ifish/views/introductionView/MyIntroductionViewController.m b/Ifish/views/introductionView/MyIntroductionViewController.m
index 792145c..7478ccd 100644
--- a/Ifish/views/introductionView/MyIntroductionViewController.m
+++ b/Ifish/views/introductionView/MyIntroductionViewController.m
@@ -102,7 +102,7 @@ static MyIntroductionViewController * introduction = nil;
     for (int i=0; i<self.imageNames.count; i++) {
         UIImageView * imgV = [[UIImageView alloc]initWithImage:[UIImage imageNamed:self.imageNames[i]]];
         imgV.userInteractionEnabled=true;
-        imgV.contentMode = UIViewContentModeScaleAspectFill;
+        imgV.contentMode = UIViewContentModeScaleAspectFit;
         imgV.layer.masksToBounds = YES;
         CGFloat x = i * width;
         imgV.frame = CGRectMake(x, 0, width, height);