Skip to content

Commit 8a652a5

Browse files
committed
修复iOS13顶部留白的问题
1 parent aa51907 commit 8a652a5

4 files changed

Lines changed: 9 additions & 5 deletions

File tree

TZImagePickerController/TZImagePickerController/TZImagePickerController.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,9 +782,10 @@ - (void)viewDidLayoutSubviews {
782782
CGFloat tableViewHeight = 0;
783783
CGFloat naviBarHeight = self.navigationController.navigationBar.tz_height;
784784
BOOL isStatusBarHidden = [UIApplication sharedApplication].isStatusBarHidden;
785+
BOOL isFullScreen = self.view.tz_height == [UIScreen mainScreen].bounds.size.height;
785786
if (self.navigationController.navigationBar.isTranslucent) {
786787
top = naviBarHeight;
787-
if (!isStatusBarHidden) top += [TZCommonTools tz_statusBarHeight];
788+
if (!isStatusBarHidden && isFullScreen) top += [TZCommonTools tz_statusBarHeight];
788789
tableViewHeight = self.view.tz_height - top;
789790
} else {
790791
tableViewHeight = self.view.tz_height;

TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,11 @@ - (void)viewDidLayoutSubviews {
303303
CGFloat collectionViewHeight = 0;
304304
CGFloat naviBarHeight = self.navigationController.navigationBar.tz_height;
305305
BOOL isStatusBarHidden = [UIApplication sharedApplication].isStatusBarHidden;
306+
BOOL isFullScreen = self.view.tz_height == [UIScreen mainScreen].bounds.size.height;
306307
CGFloat toolBarHeight = [TZCommonTools tz_isIPhoneX] ? 50 + (83 - 49) : 50;
307308
if (self.navigationController.navigationBar.isTranslucent) {
308309
top = naviBarHeight;
309-
if (!isStatusBarHidden) top += [TZCommonTools tz_statusBarHeight];
310+
if (!isStatusBarHidden && isFullScreen) top += [TZCommonTools tz_statusBarHeight];
310311
collectionViewHeight = tzImagePickerVc.showSelectBtn ? self.view.tz_height - toolBarHeight - top : self.view.tz_height - top;;
311312
} else {
312313
collectionViewHeight = tzImagePickerVc.showSelectBtn ? self.view.tz_height - toolBarHeight : self.view.tz_height;

TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,9 @@ - (void)viewDidLayoutSubviews {
247247
[super viewDidLayoutSubviews];
248248
TZImagePickerController *_tzImagePickerVc = (TZImagePickerController *)self.navigationController;
249249

250-
CGFloat statusBarHeight = [TZCommonTools tz_statusBarHeight];
251-
CGFloat statusBarHeightInterval = statusBarHeight - 20;
250+
BOOL isFullScreen = self.view.tz_height == [UIScreen mainScreen].bounds.size.height;
251+
CGFloat statusBarHeight = isFullScreen ? [TZCommonTools tz_statusBarHeight] : 0;
252+
CGFloat statusBarHeightInterval = isFullScreen ? (statusBarHeight - 20) : 0;
252253
CGFloat naviBarHeight = statusBarHeight + _tzImagePickerVc.navigationBar.tz_height;
253254
_naviBar.frame = CGRectMake(0, 0, self.view.tz_width, naviBarHeight);
254255
_backButton.frame = CGRectMake(10, 10 + statusBarHeightInterval, 44, 44);

TZImagePickerController/TZImagePickerController/TZVideoPlayerController.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ - (UIStatusBarStyle)preferredStatusBarStyle {
140140
- (void)viewDidLayoutSubviews {
141141
[super viewDidLayoutSubviews];
142142

143-
CGFloat statusBarHeight = [TZCommonTools tz_statusBarHeight];
143+
BOOL isFullScreen = self.view.tz_height == [UIScreen mainScreen].bounds.size.height;
144+
CGFloat statusBarHeight = isFullScreen ? [TZCommonTools tz_statusBarHeight] : 0;
144145
CGFloat statusBarAndNaviBarHeight = statusBarHeight + self.navigationController.navigationBar.tz_height;
145146
_playerLayer.frame = self.view.bounds;
146147
CGFloat toolBarHeight = [TZCommonTools tz_isIPhoneX] ? 44 + (83 - 49) : 44;

0 commit comments

Comments
 (0)