Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
dz_TZImagePickerController
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
shuijing
dz_TZImagePickerController
Commits
10707fed
Commit
10707fed
authored
Dec 22, 2016
by
Wilson Yuan
Committed by
GitHub
Dec 22, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1 from devSC/feature-fixBug
Feature fix bug
parents
115f4046
9456dbbc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
5 deletions
+13
-5
TZImagePickerController/TZImagePickerController/TZImageManager.h
...PickerController/TZImagePickerController/TZImageManager.h
+1
-1
TZImagePickerController/TZImagePickerController/TZImagePickerController.m
...troller/TZImagePickerController/TZImagePickerController.m
+5
-2
TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m
...troller/TZImagePickerController/TZPhotoPickerController.m
+6
-2
TZImagePickerController/ViewController.m
TZImagePickerController/ViewController.m
+1
-0
No files found.
TZImagePickerController/TZImagePickerController/TZImageManager.h
View file @
10707fed
...
...
@@ -16,7 +16,7 @@
@property
(
nonatomic
,
strong
)
PHCachingImageManager
*
cachingImageManager
;
+
(
instancetype
)
manager
;
+
(
instancetype
)
manager
NS_SWIFT_NAME
(
default
())
;
@property
(
nonatomic
,
assign
)
BOOL
shouldFixOrientation
;
...
...
TZImagePickerController/TZImagePickerController/TZImagePickerController.m
View file @
10707fed
...
...
@@ -516,8 +516,11 @@
albumModel
.
selectedModels
=
imagePickerVc
.
selectedModels
;
}
if
(
!
_tableView
)
{
CGFloat
top
=
44
;
if
(
iOS7Later
)
top
+=
20
;
CGFloat
top
=
0
;
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
.
rowHeight
=
70
;
_tableView
.
tableFooterView
=
[[
UIView
alloc
]
init
];
...
...
TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m
View file @
10707fed
...
...
@@ -119,8 +119,12 @@ static CGSize AssetGridThumbnailSize;
layout
.
itemSize
=
CGSizeMake
(
itemWH
,
itemWH
);
layout
.
minimumInteritemSpacing
=
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
;
_collectionView
=
[[
TZCollectionView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
top
,
self
.
view
.
tz_width
,
collectionViewHeight
)
collectionViewLayout
:
layout
];
_collectionView
.
backgroundColor
=
[
UIColor
whiteColor
];
...
...
TZImagePickerController/ViewController.m
View file @
10707fed
...
...
@@ -217,6 +217,7 @@
// imagePickerVc.navigationBar.barTintColor = [UIColor greenColor];
// imagePickerVc.oKButtonTitleColorDisabled = [UIColor lightGrayColor];
// imagePickerVc.oKButtonTitleColorNormal = [UIColor greenColor];
// imagePickerVc.navigationBar.translucent = NO;
// 3. Set allow picking video & photo & originalPhoto or not
// 3. 设置是否可以选择视频/图片/原图
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment