From ab8b960ad8eba8387264eb721efa3fdae2e2925d Mon Sep 17 00:00:00 2001 From: hjandyz Date: Tue, 31 May 2016 17:01:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ios7=20=E5=8F=B3=E4=B8=8A=E8=A7=92=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ios7 右上角按钮显示 --- TZImagePickerController/TZImagePickerController/TZAssetCell.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TZImagePickerController/TZImagePickerController/TZAssetCell.m b/TZImagePickerController/TZImagePickerController/TZAssetCell.m index 20468313..2ac864e6 100644 --- a/TZImagePickerController/TZImagePickerController/TZAssetCell.m +++ b/TZImagePickerController/TZImagePickerController/TZAssetCell.m @@ -111,7 +111,7 @@ - (UIImageView *)imageView { imageView.frame = CGRectMake(0, 0, self.tz_width, self.tz_height); imageView.contentMode = UIViewContentModeScaleAspectFill; imageView.clipsToBounds = YES; - [self.contentView addSubview:imageView]; + [self.contentView insertSubview:imageView atIndex:0]; _imageView = imageView; } return _imageView; From d1f0255da791fafb6260ed8ea43f8be141c6b20e Mon Sep 17 00:00:00 2001 From: hjandyz Date: Fri, 10 Feb 2017 17:27:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?automaticallyAdjustsScrollViewInsets?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=E7=9A=84YES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TZImagePickerController/TZImagePickerController.m | 6 +----- .../TZImagePickerController/TZPhotoPickerController.m | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/TZImagePickerController/TZImagePickerController/TZImagePickerController.m b/TZImagePickerController/TZImagePickerController/TZImagePickerController.m index 28ded3ab..0ab2c22b 100644 --- a/TZImagePickerController/TZImagePickerController/TZImagePickerController.m +++ b/TZImagePickerController/TZImagePickerController/TZImagePickerController.m @@ -52,7 +52,6 @@ - (void)viewDidLoad { if (iOS7Later) { self.navigationBar.barTintColor = [UIColor colorWithRed:(34/255.0) green:(34/255.0) blue:(34/255.0) alpha:1.0]; self.navigationBar.tintColor = [UIColor whiteColor]; - self.automaticallyAdjustsScrollViewInsets = NO; } } @@ -457,7 +456,6 @@ - (void)settingBtnClick { } - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated { - if (iOS7Later) viewController.automaticallyAdjustsScrollViewInsets = NO; if (_timer) { [_timer invalidate]; _timer = nil;} [super pushViewController:viewController animated:animated]; } @@ -544,9 +542,7 @@ - (void)configTableView { CGFloat top = 0; CGFloat tableViewHeight = 0; if (self.navigationController.navigationBar.isTranslucent) { - top = 44; - if (iOS7Later) top += 20; - tableViewHeight = self.view.tz_height - top; + tableViewHeight = self.view.tz_height; } else { CGFloat navigationHeight = 44; if (iOS7Later) navigationHeight += 20; diff --git a/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m b/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m index fd1b95ac..d5235627 100644 --- a/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m +++ b/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m @@ -123,9 +123,7 @@ - (void)configCollectionView { CGFloat top = 0; CGFloat collectionViewHeight = 0; if (self.navigationController.navigationBar.isTranslucent) { - top = 44; - if (iOS7Later) top += 20; - collectionViewHeight = tzImagePickerVc.showSelectBtn ? self.view.tz_height - 50 - top : self.view.tz_height - top;; + collectionViewHeight = tzImagePickerVc.showSelectBtn ? self.view.tz_height - 50 : self.view.tz_height; } else { CGFloat navigationHeight = 44; if (iOS7Later) navigationHeight += 20; From d8ed3af6e27cc065f9c59005e63cfbf9ae0d5fb1 Mon Sep 17 00:00:00 2001 From: hjandyz Date: Fri, 10 Feb 2017 18:37:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"ios7=20=E5=8F=B3=E4=B8=8A?= =?UTF-8?q?=E8=A7=92=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ab8b960ad8eba8387264eb721efa3fdae2e2925d. --- TZImagePickerController/TZImagePickerController/TZAssetCell.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TZImagePickerController/TZImagePickerController/TZAssetCell.m b/TZImagePickerController/TZImagePickerController/TZAssetCell.m index f5877592..8615289f 100644 --- a/TZImagePickerController/TZImagePickerController/TZAssetCell.m +++ b/TZImagePickerController/TZImagePickerController/TZAssetCell.m @@ -164,7 +164,7 @@ - (UIImageView *)imageView { imageView.frame = CGRectMake(0, 0, self.tz_width, self.tz_height); imageView.contentMode = UIViewContentModeScaleAspectFill; imageView.clipsToBounds = YES; - [self.contentView insertSubview:imageView atIndex:0]; + [self.contentView addSubview:imageView]; _imageView = imageView; [self.contentView bringSubviewToFront:_selectImageView];