diff --git a/PhotoBrowser/ZLImageEditTools/ZLImageEditTool.h b/PhotoBrowser/ZLImageEditTools/ZLImageEditTool.h index 7263a603..a04679af 100644 --- a/PhotoBrowser/ZLImageEditTools/ZLImageEditTool.h +++ b/PhotoBrowser/ZLImageEditTools/ZLImageEditTool.h @@ -10,7 +10,7 @@ @class ZLPhotoConfiguration; -typedef NS_ENUM(NSUInteger, ZLImageEditType) { +typedef NS_OPTIONS(NSUInteger, ZLImageEditType) { ZLImageEditTypeClip = 1 << 1, ZLImageEditTypeRotate = 1 << 2, ZLImageEditTypeFilter = 1 << 3, diff --git a/PhotoBrowser/ZLPhotoActionSheet.h b/PhotoBrowser/ZLPhotoActionSheet.h index f7da41cb..c2465c6f 100644 --- a/PhotoBrowser/ZLPhotoActionSheet.h +++ b/PhotoBrowser/ZLPhotoActionSheet.h @@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN 选择照片回调,回调解析好的图片、对应的asset对象、是否原图 pod 2.2.6版本之后 统一通过selectImageBlock回调 */ -@property (nonatomic, copy) void (^selectImageBlock)(NSArray *__nullable images, NSArray *assets, BOOL isOriginal); +@property (nonatomic, copy) void (^selectImageBlock)(NSArray *_Nullable images, NSArray *assets, BOOL isOriginal); /** 取消选择回调 diff --git a/PhotoBrowser/ZLPhotoManager.m b/PhotoBrowser/ZLPhotoManager.m index 489dd16d..ac0df03c 100644 --- a/PhotoBrowser/ZLPhotoManager.m +++ b/PhotoBrowser/ZLPhotoManager.m @@ -623,9 +623,6 @@ + (NSString *)transformDataLength:(NSInteger)dataLength { + (void)markSelectModelInArr:(NSArray *)dataArr selArr:(NSArray *)selArr { - if (!selArr.count) { - return; - } NSMutableArray *selIdentifiers = [NSMutableArray array]; for (ZLPhotoModel *m in selArr) { [selIdentifiers addObject:m.asset.localIdentifier];