From 83a090c3db367de3260f9db3b8d7d5482e900413 Mon Sep 17 00:00:00 2001 From: Arthur Date: Tue, 22 Mar 2016 11:24:06 +0800 Subject: [PATCH 1/6] default TabBar height use macro get default TabBar height --- LGHelper/LGHelper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LGHelper/LGHelper.h b/LGHelper/LGHelper.h index df19fd2..6357b15 100644 --- a/LGHelper/LGHelper.h +++ b/LGHelper/LGHelper.h @@ -183,7 +183,7 @@ else { dispatch_async(dispatch_get_main_queue(), block); }\ #define kNavBarHeight 44.f //self.navigationController.navigationBar.frame.size.height #define kStatusBarHeight 20.f //[UIApplication sharedApplication].statusBarFrame.size.height #define kStatusAndNavBarsHeight 64.f //([UIApplication sharedApplication].statusBarFrame.size.height+self.navigationController.navigationBar.frame.size.height) - +#define kTabBarHeight kSystemVersion >= 8.0 ? 49 : kSystemVersion >= 7.0 ? 56 : kSystemVersion >= 6.0 ? 49 : 0 // -------------------------------------------------- #pragma mark - Aspects From 6afdf73f13de6b2c2dec6d2c9e9154806a9365f2 Mon Sep 17 00:00:00 2001 From: smartdj Date: Fri, 20 May 2016 13:47:05 +0800 Subject: [PATCH 2/6] fix compile error if cocopods use "use_frameworks!" then compile project --- LGHelper/LGHelper.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LGHelper/LGHelper.h b/LGHelper/LGHelper.h index 6357b15..b730c16 100644 --- a/LGHelper/LGHelper.h +++ b/LGHelper/LGHelper.h @@ -374,9 +374,11 @@ else { dispatch_async(dispatch_get_main_queue(), block); }\ /** Need to send email and sms */ @import MessageUI; +#import /** Need to open addresses and coorinates on map */ @import MapKit; +#import typedef NS_ENUM(NSUInteger, LGImageScalingMode) { From e738123aa85c748fbcc1243253ba01012a1b844c Mon Sep 17 00:00:00 2001 From: smartdj Date: Fri, 20 May 2016 13:48:08 +0800 Subject: [PATCH 3/6] comment code --- LGHelper/LGHelper.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LGHelper/LGHelper.h b/LGHelper/LGHelper.h index b730c16..142fd39 100644 --- a/LGHelper/LGHelper.h +++ b/LGHelper/LGHelper.h @@ -373,11 +373,11 @@ else { dispatch_async(dispatch_get_main_queue(), block); }\ #import /** Need to send email and sms */ -@import MessageUI; +//@import MessageUI; #import /** Need to open addresses and coorinates on map */ -@import MapKit; +//@import MapKit; #import typedef NS_ENUM(NSUInteger, LGImageScalingMode) From 5e933aca89bbbdad6c5e43638a51b9d3a5c021b9 Mon Sep 17 00:00:00 2001 From: smartdj Date: Tue, 12 Jul 2016 11:11:50 +0800 Subject: [PATCH 4/6] Update LGHelper.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加屏幕宽高的宏定义 --- LGHelper/LGHelper.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/LGHelper/LGHelper.h b/LGHelper/LGHelper.h index 142fd39..d4d6560 100644 --- a/LGHelper/LGHelper.h +++ b/LGHelper/LGHelper.h @@ -52,6 +52,13 @@ #define kDeviceIsPad (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) #define kDeviceIsPhone (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) +#define kiPhone5ScreenWidth 320 +#define kiPhone5ScreenHeight 568 +#define kiPhone6ScreenWidth 375 +#define kiPhone6ScreenHeight 667 +#define kiPhone6PlusScreenWidth 414 +#define kiPhone6PlusScreenHeight 736 + #define kDeviceIsPhoneSmallerOrEqual35 (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone && MAX(UIScreen.mainScreen.bounds.size.width, UIScreen.mainScreen.bounds.size.height) <= 480.0) #define kDeviceIsPhoneSmallerOrEqual40 (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone && MAX(UIScreen.mainScreen.bounds.size.width, UIScreen.mainScreen.bounds.size.height) <= 568.0) #define kDeviceIsPhoneSmallerOrEqual47 (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone && MAX(UIScreen.mainScreen.bounds.size.width, UIScreen.mainScreen.bounds.size.height) <= 667.0) From 47d33ec1503f680ea3400ad7f0b3ef419e768220 Mon Sep 17 00:00:00 2001 From: smartdj Date: Tue, 12 Jul 2016 11:25:24 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0readme.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8ab7d4a..cef0ad8 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,14 @@ +本项目由 Friend-LGA/LGHelper fork 而来，又根据自己的需求增加了一些宏定义，并且没有合并到 Friend-LGA/LGHelper的项目当中。 + # LGHelper -iOS helper contains a lot of useful macrosses, methods and hints for every day. +iOS helper 包含了很多有用的宏和方法 -## Installation +## 安装 ### With source code -[Download repository](https://github.com/Friend-LGA/LGHelper/archive/master.zip), then add [LGHelper directory](https://github.com/Friend-LGA/LGHelper/blob/master/LGHelper/) to your project. +[Download repository](https://github.com/smartdj/LGHelper/archive/master.zip), then add [LGHelper directory](https://github.com/smartdj/LGHelper/blob/master/LGHelper/) to your project. ### With CocoaPods @@ -15,7 +17,7 @@ CocoaPods is a dependency manager for Objective-C, which automates and simplifie #### Podfile ```ruby platform :ios, '6.0' -pod 'LGHelper', '~> 1.1.0' +pod 'LGHelper', :git => 'https://github.com/smartdj/LGHelper.git' ``` ### With Carthage @@ -24,7 +26,7 @@ Carthage is a lightweight dependency manager for Swift and Objective-C. It lever #### Cartfile ``` -github "Friend-LGA/LGHelper" ~> 1.1.0 +github "smartdj/LGHelper" ~> 1.1.0 ``` ## Usage @@ -37,8 +39,8 @@ In the source files where you need to use the library, import the header file: ### More -For more details see [LGHelper.h](https://github.com/Friend-LGA/LGHelper/blob/master/LGHelper/LGHelper.h) +For more details see [LGHelper.h](https://github.com/smartdj/LGHelper/blob/master/LGHelper/LGHelper.h) ## License -LGHelper is released under the MIT license. See [LICENSE](https://raw.githubusercontent.com/Friend-LGA/LGHelper/master/LICENSE) for details. +LGHelper is released under the MIT license. See [LICENSE](https://raw.githubusercontent.com/smartdj/LGHelper/master/LICENSE) for details. From d9d7eea8e379669bbf2a648192161e8596768dc0 Mon Sep 17 00:00:00 2001 From: "arthur.wang" Date: Mon, 12 Sep 2016 19:36:53 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E7=9A=84=E6=97=B6=E5=80=99=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=A0=8F=E5=87=BA=E7=8E=B0=E9=BB=91=E8=89=B2=EF=BC=88=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E5=8F=AF=E8=83=BD=E6=98=AF=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E5=AF=BC=E8=88=AA=E6=A0=8F=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E8=89=B2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LGHelper/LGHelper.m | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/LGHelper/LGHelper.m b/LGHelper/LGHelper.m index 47f0255..70e8a0f 100644 --- a/LGHelper/LGHelper.m +++ b/LGHelper/LGHelper.m @@ -2649,6 +2649,14 @@ - (BOOL)imagePickerControllerShowWithSourceType:(UIImagePickerControllerSourceTy if (setupHandler) setupHandler(_imagePickerController); + + //必须加上这一句，否则可能会导致在关闭弹出窗口的时候状态栏出现黑色（原因可能是修改了全局导航栏背景色） + if ([[[UIDevice currentDevice] systemVersion] floatValue]>=8.0) { + _imagePickerController.modalPresentationStyle=UIModalPresentationOverCurrentContext; + }else{ + _imagePickerController.modalPresentationStyle=UIModalPresentationCurrentContext; + } + [viewController presentViewController:_imagePickerController animated:animated completion:presentCompletionHandler]; }