Commit 10707fed authored by Wilson Yuan's avatar Wilson Yuan Committed by GitHub

Merge pull request #1 from devSC/feature-fixBug

Feature fix bug
parents 115f4046 9456dbbc
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
@property (nonatomic, strong) PHCachingImageManager *cachingImageManager; @property (nonatomic, strong) PHCachingImageManager *cachingImageManager;
+ (instancetype)manager; + (instancetype)manager NS_SWIFT_NAME(default());
@property (nonatomic, assign) BOOL shouldFixOrientation; @property (nonatomic, assign) BOOL shouldFixOrientation;
......
...@@ -516,8 +516,11 @@ ...@@ -516,8 +516,11 @@
albumModel.selectedModels = imagePickerVc.selectedModels; albumModel.selectedModels = imagePickerVc.selectedModels;
} }
if (!_tableView) { if (!_tableView) {
CGFloat top = 44; CGFloat top = 0;
if (iOS7Later) top += 20; if (self.navigationController.navigationBar.translucent) {
top = 44;
if (iOS7Later) top += 20;
}
_tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, top, self.view.tz_width, self.view.tz_height - top) style:UITableViewStylePlain]; _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, top, self.view.tz_width, self.view.tz_height - top) style:UITableViewStylePlain];
_tableView.rowHeight = 70; _tableView.rowHeight = 70;
_tableView.tableFooterView = [[UIView alloc] init]; _tableView.tableFooterView = [[UIView alloc] init];
......
...@@ -119,8 +119,12 @@ static CGSize AssetGridThumbnailSize; ...@@ -119,8 +119,12 @@ static CGSize AssetGridThumbnailSize;
layout.itemSize = CGSizeMake(itemWH, itemWH); layout.itemSize = CGSizeMake(itemWH, itemWH);
layout.minimumInteritemSpacing = margin; layout.minimumInteritemSpacing = margin;
layout.minimumLineSpacing = margin; layout.minimumLineSpacing = margin;
CGFloat top = 44;
if (iOS7Later) top += 20; CGFloat top = 0;
if (self.navigationController.navigationBar.translucent) {
top = 44;
if (iOS7Later) top += 20;
}
CGFloat collectionViewHeight = tzImagePickerVc.showSelectBtn ? self.view.tz_height - 50 - top : self.view.tz_height - top; CGFloat collectionViewHeight = tzImagePickerVc.showSelectBtn ? self.view.tz_height - 50 - top : self.view.tz_height - top;
_collectionView = [[TZCollectionView alloc] initWithFrame:CGRectMake(0, top, self.view.tz_width, collectionViewHeight) collectionViewLayout:layout]; _collectionView = [[TZCollectionView alloc] initWithFrame:CGRectMake(0, top, self.view.tz_width, collectionViewHeight) collectionViewLayout:layout];
_collectionView.backgroundColor = [UIColor whiteColor]; _collectionView.backgroundColor = [UIColor whiteColor];
......
...@@ -217,6 +217,7 @@ ...@@ -217,6 +217,7 @@
// imagePickerVc.navigationBar.barTintColor = [UIColor greenColor]; // imagePickerVc.navigationBar.barTintColor = [UIColor greenColor];
// imagePickerVc.oKButtonTitleColorDisabled = [UIColor lightGrayColor]; // imagePickerVc.oKButtonTitleColorDisabled = [UIColor lightGrayColor];
// imagePickerVc.oKButtonTitleColorNormal = [UIColor greenColor]; // imagePickerVc.oKButtonTitleColorNormal = [UIColor greenColor];
// imagePickerVc.navigationBar.translucent = NO;
// 3. Set allow picking video & photo & originalPhoto or not // 3. Set allow picking video & photo & originalPhoto or not
// 3. 设置是否可以选择视频/图片/原图 // 3. 设置是否可以选择视频/图片/原图
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment