From 310a8f0230c3f984c71948707d9d0ded22921173 Mon Sep 17 00:00:00 2001 From: jiangxuefei718 Date: Thu, 14 Mar 2019 12:08:30 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=E7=88=B1=E9=B1=BC=E7=9C=8B=E7=9C=8B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 6148 bytes .../LoveFishLiveListBaseViewController.m | 3 +-- .../SecondConnectWifiController.m | 6 +++-- .../SecondConnectWifiController.xib | 21 ++++++++---------- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.DS_Store b/.DS_Store index 51d71bf5b6926bad48cdea80eba5ee6ecd5a79ba..fee307ee41cc668e9945d5ef8b20fdcea45c99a7 100644 GIT binary patch delta 13 UcmZoMXfc?uhv}vI#(i$$04HSylK=n! delta 13 UcmZoMXfc?uhv|OI#(i$$04OpAz5oCK 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 @@ - + @@ -39,13 +39,13 @@