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
ab8bf15b
Commit
ab8bf15b
authored
Dec 03, 2020
by
ztsyyb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asset是否显示废弃标识和能否选中方法名修改
parent
ab12cafe
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
23 additions
and
18 deletions
+23
-18
README.md
README.md
+1
-1
TZImagePickerController.xcodeproj/project.pbxproj
TZImagePickerController.xcodeproj/project.pbxproj
+5
-5
TZImagePickerController/TZImagePickerController/TZImageManager.h
...PickerController/TZImagePickerController/TZImageManager.h
+1
-1
TZImagePickerController/TZImagePickerController/TZImageManager.m
...PickerController/TZImagePickerController/TZImageManager.m
+7
-3
TZImagePickerController/TZImagePickerController/TZImagePickerController.h
...troller/TZImagePickerController/TZImagePickerController.h
+2
-1
TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m
...troller/TZImagePickerController/TZPhotoPickerController.m
+2
-2
TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.m
...roller/TZImagePickerController/TZPhotoPreviewController.m
+3
-3
TZImagePickerController/TZImagePickerController/TZVideoPlayerController.m
...troller/TZImagePickerController/TZVideoPlayerController.m
+1
-1
TZImagePickerController/ViewController.m
TZImagePickerController/ViewController.m
+1
-1
No files found.
README.md
View file @
ab8bf15b
...
@@ -87,7 +87,7 @@ A:请参考 https://github.com/banchichen/TZImagePickerController/issues/443
...
@@ -87,7 +87,7 @@ A:请参考 https://github.com/banchichen/TZImagePickerController/issues/443
A:3.0.1版本已支持,需新接一个库:
[
TZImagePreviewController
](
https://github.com/banchichen/TZImagePreviewController
)
,请参考里面的Demo使用。
A:3.0.1版本已支持,需新接一个库:
[
TZImagePreviewController
](
https://github.com/banchichen/TZImagePreviewController
)
,请参考里面的Demo使用。
**Q:设置可选视频的最大/最小时长?照片的最小/最大尺寸?不符合要求的不显示**
**Q:设置可选视频的最大/最小时长?照片的最小/最大尺寸?不符合要求的不显示**
A:可以的,参照Demo的isAssetCan
Select
方法实现。我会返回asset出来,显示与否你来决定,注意这个是一个同步方法,对于需要根据asset去异步获取的信息如视频的大小、视频是否存在iCloud里来过滤的,无法做到。如果真要这样做,相册打开速度会变慢,你需要改我源码。
A:可以的,参照Demo的isAssetCan
BeDisplayed
方法实现。我会返回asset出来,显示与否你来决定,注意这个是一个同步方法,对于需要根据asset去异步获取的信息如视频的大小、视频是否存在iCloud里来过滤的,无法做到。如果真要这样做,相册打开速度会变慢,你需要改我源码。
**Q:预览页面出现了导航栏?**
**Q:预览页面出现了导航栏?**
A:https://github.com/banchichen/TZImagePickerController/issues/652
A:https://github.com/banchichen/TZImagePickerController/issues/652
...
...
TZImagePickerController.xcodeproj/project.pbxproj
View file @
ab8bf15b
...
@@ -487,7 +487,7 @@
...
@@ -487,7 +487,7 @@
TargetAttributes
=
{
TargetAttributes
=
{
900E657B1C2BB8D5003D9A9E
=
{
900E657B1C2BB8D5003D9A9E
=
{
CreatedOnToolsVersion
=
7.2
;
CreatedOnToolsVersion
=
7.2
;
DevelopmentTeam
=
LTFQDC2QVX
;
DevelopmentTeam
=
BBY5TNVYNE
;
ProvisioningStyle
=
Automatic
;
ProvisioningStyle
=
Automatic
;
};
};
900E65941C2BB8D5003D9A9E
=
{
900E65941C2BB8D5003D9A9E
=
{
...
@@ -799,7 +799,7 @@
...
@@ -799,7 +799,7 @@
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
CODE_SIGN_STYLE
=
Automatic
;
CODE_SIGN_STYLE
=
Automatic
;
DEVELOPMENT_TEAM
=
LTFQDC2QVX
;
DEVELOPMENT_TEAM
=
BBY5TNVYNE
;
FRAMEWORK_SEARCH_PATHS
=
(
FRAMEWORK_SEARCH_PATHS
=
(
"$(inherited)"
,
"$(inherited)"
,
"$(PROJECT_DIR)/TZImagePickerController"
,
"$(PROJECT_DIR)/TZImagePickerController"
,
...
@@ -808,7 +808,7 @@
...
@@ -808,7 +808,7 @@
IPHONEOS_DEPLOYMENT_TARGET
=
8.0
;
IPHONEOS_DEPLOYMENT_TARGET
=
8.0
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
MARKETING_VERSION
=
3.5.5
;
MARKETING_VERSION
=
3.5.5
;
PRODUCT_BUNDLE_IDENTIFIER
=
tanzhenios2021.TZImagePickerController.www
;
PRODUCT_BUNDLE_IDENTIFIER
=
tanzhenios2021.TZImagePickerController.www
.yyb
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
""
;
PROVISIONING_PROFILE
=
""
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
...
@@ -823,7 +823,7 @@
...
@@ -823,7 +823,7 @@
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
CODE_SIGN_STYLE
=
Automatic
;
CODE_SIGN_STYLE
=
Automatic
;
DEVELOPMENT_TEAM
=
LTFQDC2QVX
;
DEVELOPMENT_TEAM
=
BBY5TNVYNE
;
FRAMEWORK_SEARCH_PATHS
=
(
FRAMEWORK_SEARCH_PATHS
=
(
"$(inherited)"
,
"$(inherited)"
,
"$(PROJECT_DIR)/TZImagePickerController"
,
"$(PROJECT_DIR)/TZImagePickerController"
,
...
@@ -832,7 +832,7 @@
...
@@ -832,7 +832,7 @@
IPHONEOS_DEPLOYMENT_TARGET
=
8.0
;
IPHONEOS_DEPLOYMENT_TARGET
=
8.0
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
MARKETING_VERSION
=
3.5.5
;
MARKETING_VERSION
=
3.5.5
;
PRODUCT_BUNDLE_IDENTIFIER
=
tanzhenios2021.TZImagePickerController.www
;
PRODUCT_BUNDLE_IDENTIFIER
=
tanzhenios2021.TZImagePickerController.www
.yyb
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
""
;
PROVISIONING_PROFILE
=
""
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
...
...
TZImagePickerController/TZImagePickerController/TZImageManager.h
View file @
ab8bf15b
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
-
(
BOOL
)
isPhotoSelectableWithAsset
:(
PHAsset
*
)
asset
;
-
(
BOOL
)
isPhotoSelectableWithAsset
:(
PHAsset
*
)
asset
;
/// 检查照片能否被选中
/// 检查照片能否被选中
-
(
BOOL
)
checkAssetCan
BeSelected
:(
PHAsset
*
)
asset
;
-
(
BOOL
)
isAssetCannot
BeSelected
:(
PHAsset
*
)
asset
;
/// 修正图片转向
/// 修正图片转向
-
(
UIImage
*
)
fixOrientation
:(
UIImage
*
)
aImage
;
-
(
UIImage
*
)
fixOrientation
:(
UIImage
*
)
aImage
;
...
...
TZImagePickerController/TZImagePickerController/TZImageManager.m
View file @
ab8bf15b
...
@@ -236,6 +236,10 @@ static dispatch_once_t onceToken;
...
@@ -236,6 +236,10 @@ static dispatch_once_t onceToken;
if
([
self
.
pickerDelegate
respondsToSelector
:
@selector
(
isAssetCanSelect
:)])
{
if
([
self
.
pickerDelegate
respondsToSelector
:
@selector
(
isAssetCanSelect
:)])
{
canSelect
=
[
self
.
pickerDelegate
isAssetCanSelect
:
asset
];
canSelect
=
[
self
.
pickerDelegate
isAssetCanSelect
:
asset
];
}
}
if
([
self
.
pickerDelegate
respondsToSelector
:
@selector
(
isAssetCanBeDisplayed
:)]){
canSelect
=
[
self
.
pickerDelegate
isAssetCanBeDisplayed
:
asset
];
}
if
(
!
canSelect
)
return
nil
;
if
(
!
canSelect
)
return
nil
;
TZAssetModel
*
model
;
TZAssetModel
*
model
;
...
@@ -806,12 +810,12 @@ static dispatch_once_t onceToken;
...
@@ -806,12 +810,12 @@ static dispatch_once_t onceToken;
}
}
/// 检查照片能否被选中
/// 检查照片能否被选中
-
(
BOOL
)
checkAssetCan
BeSelected
:(
PHAsset
*
)
asset
{
-
(
BOOL
)
isAssetCannot
BeSelected
:(
PHAsset
*
)
asset
{
if
([
self
.
pickerDelegate
respondsToSelector
:
@selector
(
isAssetCanBeSelected
:)])
{
if
([
self
.
pickerDelegate
respondsToSelector
:
@selector
(
isAssetCanBeSelected
:)])
{
BOOL
canSelectAsset
=
[
self
.
pickerDelegate
isAssetCanBeSelected
:
asset
];
BOOL
canSelectAsset
=
[
self
.
pickerDelegate
isAssetCanBeSelected
:
asset
];
return
canSelectAsset
;
return
!
canSelectAsset
;
}
}
return
YES
;
return
NO
;
}
}
#pragma mark - Private Method
#pragma mark - Private Method
...
...
TZImagePickerController/TZImagePickerController/TZImagePickerController.h
View file @
ab8bf15b
...
@@ -287,7 +287,8 @@
...
@@ -287,7 +287,8 @@
// Decide asset show or not't
// Decide asset show or not't
// 决定照片显示与否
// 决定照片显示与否
-
(
BOOL
)
isAssetCanSelect
:(
PHAsset
*
)
asset
;
-
(
BOOL
)
isAssetCanSelect
:(
PHAsset
*
)
asset
__attribute__
((
deprecated
(
"Use -isAssetCanBeDisplayed."
)));
-
(
BOOL
)
isAssetCanBeDisplayed
:(
PHAsset
*
)
asset
;
// Decide asset can be selected
// Decide asset can be selected
// 决定照片能否被选中
// 决定照片能否被选中
...
...
TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m
View file @
ab8bf15b
...
@@ -627,7 +627,7 @@ static CGFloat itemMargin = 5;
...
@@ -627,7 +627,7 @@ static CGFloat itemMargin = 5;
}
else
{
}
else
{
// 2. select:check if over the maxImagesCount / 选择照片,检查是否超过了最大个数的限制
// 2. select:check if over the maxImagesCount / 选择照片,检查是否超过了最大个数的限制
if
(
tzImagePickerVc
.
selectedModels
.
count
<
tzImagePickerVc
.
maxImagesCount
)
{
if
(
tzImagePickerVc
.
selectedModels
.
count
<
tzImagePickerVc
.
maxImagesCount
)
{
if
(
!
[[
TZImageManager
manager
]
checkAssetCan
BeSelected
:
model
.
asset
])
{
if
(
[[
TZImageManager
manager
]
isAssetCannot
BeSelected
:
model
.
asset
])
{
return
;
return
;
}
}
if
(
!
tzImagePickerVc
.
allowPreview
)
{
if
(
!
tzImagePickerVc
.
allowPreview
)
{
...
@@ -944,7 +944,7 @@ static CGFloat itemMargin = 5;
...
@@ -944,7 +944,7 @@ static CGFloat itemMargin = 5;
if
(
assetModel
.
type
==
TZAssetModelMediaTypeVideo
&&
!
tzImagePickerVc
.
allowPickingMultipleVideo
)
{
if
(
assetModel
.
type
==
TZAssetModelMediaTypeVideo
&&
!
tzImagePickerVc
.
allowPickingMultipleVideo
)
{
// 不能多选视频的情况下,不选中拍摄的视频
// 不能多选视频的情况下,不选中拍摄的视频
}
else
{
}
else
{
if
(
!
[[
TZImageManager
manager
]
checkAssetCan
BeSelected
:
assetModel
.
asset
])
{
if
(
[[
TZImageManager
manager
]
isAssetCannot
BeSelected
:
assetModel
.
asset
])
{
return
;
return
;
}
}
assetModel
.
isSelected
=
YES
;
assetModel
.
isSelected
=
YES
;
...
...
TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.m
View file @
ab8bf15b
...
@@ -314,7 +314,7 @@
...
@@ -314,7 +314,7 @@
return
;
return
;
// 2. if not over the maxImagesCount / 如果没有超过最大个数限制
// 2. if not over the maxImagesCount / 如果没有超过最大个数限制
}
else
{
}
else
{
if
(
!
[[
TZImageManager
manager
]
checkAssetCan
BeSelected
:
model
.
asset
])
{
if
(
[[
TZImageManager
manager
]
isAssetCannot
BeSelected
:
model
.
asset
])
{
return
;
return
;
}
}
[
_tzImagePickerVc
addSelectedModel
:
model
];
[
_tzImagePickerVc
addSelectedModel
:
model
];
...
@@ -393,7 +393,7 @@
...
@@ -393,7 +393,7 @@
// 如果没有选中过照片 点击确定时选中当前预览的照片
// 如果没有选中过照片 点击确定时选中当前预览的照片
if
(
_tzImagePickerVc
.
selectedModels
.
count
==
0
&&
_tzImagePickerVc
.
minImagesCount
<=
0
&&
_tzImagePickerVc
.
autoSelectCurrentWhenDone
)
{
if
(
_tzImagePickerVc
.
selectedModels
.
count
==
0
&&
_tzImagePickerVc
.
minImagesCount
<=
0
&&
_tzImagePickerVc
.
autoSelectCurrentWhenDone
)
{
TZAssetModel
*
model
=
_models
[
self
.
currentIndex
];
TZAssetModel
*
model
=
_models
[
self
.
currentIndex
];
if
(
!
[[
TZImageManager
manager
]
checkAssetCan
BeSelected
:
model
.
asset
])
{
if
(
[[
TZImageManager
manager
]
isAssetCannot
BeSelected
:
model
.
asset
])
{
return
;
return
;
}
}
[
self
select
:
_selectButton
];
[
self
select
:
_selectButton
];
...
@@ -423,7 +423,7 @@
...
@@ -423,7 +423,7 @@
-
(
void
)
originalPhotoButtonClick
{
-
(
void
)
originalPhotoButtonClick
{
TZAssetModel
*
model
=
_models
[
self
.
currentIndex
];
TZAssetModel
*
model
=
_models
[
self
.
currentIndex
];
if
(
!
[[
TZImageManager
manager
]
checkAssetCan
BeSelected
:
model
.
asset
])
{
if
(
[[
TZImageManager
manager
]
isAssetCannot
BeSelected
:
model
.
asset
])
{
return
;
return
;
}
}
_originalPhotoButton
.
selected
=
!
_originalPhotoButton
.
isSelected
;
_originalPhotoButton
.
selected
=
!
_originalPhotoButton
.
isSelected
;
...
...
TZImagePickerController/TZImagePickerController/TZVideoPlayerController.m
View file @
ab8bf15b
...
@@ -183,7 +183,7 @@
...
@@ -183,7 +183,7 @@
}
}
-
(
void
)
doneButtonClick
{
-
(
void
)
doneButtonClick
{
if
(
!
[[
TZImageManager
manager
]
checkAssetCan
BeSelected
:
_model
.
asset
])
{
if
(
[[
TZImageManager
manager
]
isAssetCannot
BeSelected
:
_model
.
asset
])
{
return
;
return
;
}
}
if
(
self
.
navigationController
)
{
if
(
self
.
navigationController
)
{
...
...
TZImagePickerController/ViewController.m
View file @
ab8bf15b
...
@@ -632,7 +632,7 @@
...
@@ -632,7 +632,7 @@
// Decide asset show or not't
// Decide asset show or not't
// 决定asset显示与否
// 决定asset显示与否
-
(
BOOL
)
isAssetCan
Select
:(
PHAsset
*
)
asset
{
-
(
BOOL
)
isAssetCan
BeDisplayed
:(
PHAsset
*
)
asset
{
/*
/*
switch (asset.mediaType) {
switch (asset.mediaType) {
case PHAssetMediaTypeVideo: {
case PHAssetMediaTypeVideo: {
...
...
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