From 13d872579f4d9b0880891b6e9b16af11896c01d9 Mon Sep 17 00:00:00 2001 From: xuemh Date: Sun, 22 Jul 2018 11:12:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=83=AD=E7=82=B9=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E7=95=8C=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../4251531889028_.pic.jpg | Bin 0 -> 30900 bytes .../hotspotconnect.imageset/Contents.json | 21 ++++ .../ConnectHotpotViewController.m | 4 +- .../ConnectHotpotViewController.xib | 95 ++++++++++-------- 4 files changed, 74 insertions(+), 46 deletions(-) create mode 100644 Ifish/Assets.xcassets/hotspotconnect.imageset/4251531889028_.pic.jpg create mode 100644 Ifish/Assets.xcassets/hotspotconnect.imageset/Contents.json diff --git a/Ifish/Assets.xcassets/hotspotconnect.imageset/4251531889028_.pic.jpg b/Ifish/Assets.xcassets/hotspotconnect.imageset/4251531889028_.pic.jpg new file mode 100644 index 0000000000000000000000000000000000000000..810526a14f57b5fc6cfa29dc9713e0c239933147 GIT binary patch literal 30900 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 F{{Y>uw;%uj literal 0 HcmV?d00001 diff --git a/Ifish/Assets.xcassets/hotspotconnect.imageset/Contents.json b/Ifish/Assets.xcassets/hotspotconnect.imageset/Contents.json new file mode 100644 index 0000000..596bab8 --- /dev/null +++ b/Ifish/Assets.xcassets/hotspotconnect.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "4251531889028_.pic.jpg", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m index 61558bc..ea15206 100644 --- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m @@ -33,7 +33,7 @@ CGFloat width = size.width; UIGraphicsBeginImageContext(size); CGContextSetLineCap(UIGraphicsGetCurrentContext(), kCGLineCapRound); - CGFloat lengths[] = {10,5}; + CGFloat lengths[] = {2,2}; CGContextRef line = UIGraphicsGetCurrentContext(); CGContextSetStrokeColorWithColor(line, [UIColor colorWithRed:133/255.0 green:133/255.0 blue:133/255.0 alpha:1.0].CGColor); CGContextSetLineDash(line, 0, lengths, 1); @@ -55,7 +55,7 @@ // 键盘的frame CGRect keyboardF = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue]; - keyboardF = [self.view convertRect:keyboardF fromView:self.view]; + keyboardF = [self.view convertRect:keyboardF fromView:[UIApplication sharedApplication].keyWindow]; CGRect containerViewF = [self.view convertRect:self.containerView.frame fromView:self.scrollView]; CGFloat miniSpacing = 4; diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib index dc2349a..221cb98 100644 --- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib @@ -6,7 +6,6 @@ - @@ -29,73 +28,76 @@ - + - - - + + - - + + - + - + - - + + + + + + @@ -103,11 +105,12 @@ - - + + + - + @@ -115,44 +118,45 @@ - - + + + - - + + + + - - + + - - + + - - - - + + - + - - + + - + @@ -190,4 +194,7 @@ + + +