Skip to content

Commit

Permalink
发布1.8.5版本 修复一些样式细节
Browse files Browse the repository at this point in the history
  • Loading branch information
banchichen committed Jul 25, 2017
1 parent a1cc53d commit a1f5efa
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions TZImagePickerController/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.8.4</string>
<string>1.8.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand All @@ -37,7 +37,7 @@
<string>armv7</string>
</array>
<key>UIStatusBarHidden</key>
<false/>
<true/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by 谭真 on 15/12/24.
// Copyright © 2015年 谭真. All rights reserved.
// version 1.8.4 - 2017.07.22
// version 1.8.5 - 2017.07.25
// 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController

/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by 谭真 on 15/12/24.
// Copyright © 2015年 谭真. All rights reserved.
// version 1.8.4 - 2017.07.22
// version 1.8.5 - 2017.07.25
// 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController

#import "TZImagePickerController.h"
Expand Down Expand Up @@ -639,14 +639,13 @@ - (void)viewDidLayoutSubviews {
CGFloat top = 0;
CGFloat tableViewHeight = 0;
CGFloat naviBarHeight = self.navigationController.navigationBar.tz_height;
BOOL isStatusBarHidden = [UIApplication sharedApplication].isStatusBarHidden;
if (self.navigationController.navigationBar.isTranslucent) {
top = naviBarHeight;
if (iOS7Later && !TZ_isGlobalHideStatusBar) top += 20;
if (iOS7Later && !isStatusBarHidden) top += 20;
tableViewHeight = self.view.tz_height - top;
} else {
CGFloat navigationHeight = naviBarHeight;
if (iOS7Later && !TZ_isGlobalHideStatusBar) navigationHeight += 20;
tableViewHeight = self.view.tz_height - navigationHeight;
tableViewHeight = self.view.tz_height;
}
_tableView.frame = CGRectMake(0, top, self.view.tz_width, tableViewHeight);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,10 @@ - (void)viewDidLayoutSubviews {
CGFloat top = 0;
CGFloat collectionViewHeight = 0;
CGFloat naviBarHeight = self.navigationController.navigationBar.tz_height;
BOOL isStatusBarHidden = [UIApplication sharedApplication].isStatusBarHidden;
if (self.navigationController.navigationBar.isTranslucent) {
top = naviBarHeight;
if (iOS7Later && !TZ_isGlobalHideStatusBar) top += 20;
if (iOS7Later && !isStatusBarHidden) top += 20;
collectionViewHeight = tzImagePickerVc.showSelectBtn ? self.view.tz_height - 50 - top : self.view.tz_height - top;;
} else {
collectionViewHeight = tzImagePickerVc.showSelectBtn ? self.view.tz_height - 50 : self.view.tz_height;
Expand Down
2 changes: 2 additions & 0 deletions TZImagePickerController/ViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ - (void)viewDidLoad {
_selectedPhotos = [NSMutableArray array];
_selectedAssets = [NSMutableArray array];
[self configCollectionView];

[UIApplication sharedApplication].statusBarHidden = NO;
}

- (BOOL)prefersStatusBarHidden {
Expand Down

0 comments on commit a1f5efa

Please sign in to comment.