luozhiping

# 增加自定义参数 动态配置UI

... ... @@ -217,21 +217,28 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
SWIFT_CLASS("_TtC13HHPhotoPicker18HHPhotoConfigModel")
@interface HHPhotoConfigModel : NSObject
- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
@end
SWIFT_CLASS("_TtC13HHPhotoPicker20HHPhotoPickerManager")
@interface HHPhotoPickerManager : NSObject
- (nonnull instancetype)init SWIFT_UNAVAILABLE;
+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
@end
@class UIColor;
SWIFT_CLASS("_TtC13HHPhotoPicker20HHPhotoUIConfigModel")
@interface HHPhotoUIConfigModel : NSObject
@property (nonatomic, strong) UIColor * _Nonnull indexLabelBgColor;
- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
@end
@class UIEvent;
@class NSNumber;
@interface UIControl (SWIFT_EXTENSION(HHPhotoPicker))
- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent * _Nullable)event SWIFT_WARN_UNUSED_RESULT;
@end
... ... @@ -299,6 +306,7 @@ typedef SWIFT_ENUM(NSInteger, VideoExportType, closed) {
@class UIImage;
@class NSURL;
@class NSNumber;
@class NSCoder;
@class CAAnimation;
@class NSString;
... ... @@ -313,6 +321,7 @@ SWIFT_CLASS("_TtC13HHPhotoPicker14ZLCustomCamera")
- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder OBJC_DESIGNATED_INITIALIZER;
- (void)viewDidLoad;
- (void)viewWillAppear:(BOOL)animated;
- (void)viewDidAppear:(BOOL)animated;
- (void)viewWillDisappear:(BOOL)animated;
- (void)viewDidDisappear:(BOOL)animated;
... ... @@ -351,7 +360,6 @@ SWIFT_CLASS("_TtC13HHPhotoPicker10ZLDrawPath")
+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
@end
@class UIColor;
@class ZLImageClipRatio;
@class ZLFilter;
@class UIView;
... ... @@ -410,9 +418,10 @@ SWIFT_CLASS("_TtC13HHPhotoPicker16ZLEditImageModel")
+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
@end
@class UIButton;
@class ZLEnlargeButton;
@class UIScrollView;
@class CAGradientLayer;
@class UIButton;
@class UIImageView;
SWIFT_CLASS("_TtC13HHPhotoPicker25ZLEditImageViewController")
... ... @@ -421,7 +430,7 @@ SWIFT_CLASS("_TtC13HHPhotoPicker25ZLEditImageViewController")
@property (nonatomic) CGFloat filterColViewH;
@property (nonatomic) CGFloat adjustColViewH;
@property (nonatomic, strong) UIColor * _Nonnull ashbinNormalBgColor;
@property (nonatomic, strong) UIButton * _Nonnull cancelBtn;
@property (nonatomic, strong) ZLEnlargeButton * _Nonnull cancelBtn;
@property (nonatomic, strong) UIScrollView * _Nonnull mainScrollView;
@property (nonatomic, strong) UIView * _Nonnull topShadowView;
@property (nonatomic, strong) CAGradientLayer * _Nonnull topShadowLayer;
... ... @@ -509,6 +518,15 @@ SWIFT_CLASS("_TtC13HHPhotoPicker25ZLEditVideoViewController")
- (void)collectionView:(UICollectionView * _Nonnull)collectionView willDisplayCell:(UICollectionViewCell * _Nonnull)cell forItemAtIndexPath:(NSIndexPath * _Nonnull)indexPath;
@end
@class UIEvent;
SWIFT_CLASS("_TtC13HHPhotoPicker15ZLEnlargeButton")
@interface ZLEnlargeButton : UIButton
- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent * _Nullable)event SWIFT_WARN_UNUSED_RESULT;
- (nonnull instancetype)initWithFrame:(CGRect)frame OBJC_DESIGNATED_INITIALIZER;
- (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder OBJC_DESIGNATED_INITIALIZER;
@end
enum ZLFilterType : NSInteger;
SWIFT_CLASS("_TtC13HHPhotoPicker8ZLFilter")
... ... @@ -651,6 +669,8 @@ SWIFT_CLASS("_TtC13HHPhotoPicker24ZLImagePreviewController")
@end
/// Provide an image sticker container view that conform to this protocol must be a subclass of UIView
/// 必须是UIView的子类遵循这个协议
SWIFT_PROTOCOL("_TtP13HHPhotoPicker31ZLImageStickerContainerDelegate_")
@protocol ZLImageStickerContainerDelegate
@property (nonatomic, copy) void (^ _Nullable selectImageBlock)(UIImage * _Nonnull);
... ... @@ -704,7 +724,6 @@ typedef SWIFT_ENUM(NSInteger, ZLPhotoBrowserStyle, closed) {
ZLPhotoBrowserStyleExternalAlbumList = 1,
};
enum CancelButtonStyle : NSInteger;
enum HUDStyle : NSInteger;
@class PHAsset;
... ... @@ -712,11 +731,6 @@ SWIFT_CLASS("_TtC13HHPhotoPicker20ZLPhotoConfiguration")
@interface ZLPhotoConfiguration : NSObject
+ (ZLPhotoConfiguration * _Nonnull)default SWIFT_WARN_UNUSED_RESULT;
+ (void)resetConfiguration;
/// Framework style.
@property (nonatomic) enum ZLPhotoBrowserStyle style;
@property (nonatomic) UIStatusBarStyle statusBarStyle;
/// text: Cancel. image: ‘x’. Default to text.
@property (nonatomic) enum CancelButtonStyle navCancelButtonStyle;
/// Photo sorting method, the preview interface is not affected by this parameter. Defaults to true.
@property (nonatomic) BOOL sortAscending;
/// Anything superior than 1 will enable the multiple selection feature. Defaults to 9.
... ... @@ -781,8 +795,6 @@ SWIFT_CLASS("_TtC13HHPhotoPicker20ZLPhotoConfiguration")
@property (nonatomic) BOOL allowSelectOriginal;
/// Allow access to the preview large image interface (That is, whether to allow access to the large image interface after clicking the thumbnail image). Defaults to true.
@property (nonatomic) BOOL allowPreviewPhotos;
/// Whether to show the status bar when previewing photos. Defaults to false.
@property (nonatomic) BOOL showStatusBarInPreviewInterface;
/// Whether to show the preview button (i.e. the preview button in the lower left corner of the thumbnail interface). Defaults to true.
@property (nonatomic) BOOL showPreviewButtonInAlbum;
/// Whether to display the selected count on the button. Defaults to true.
... ... @@ -803,13 +815,6 @@ SWIFT_CLASS("_TtC13HHPhotoPicker20ZLPhotoConfiguration")
@property (nonatomic) NSInteger minSelectVideoDuration;
/// Image editor configuration.
@property (nonatomic, strong) ZLEditImageConfiguration * _Nonnull editImageConfiguration;
@property (nonatomic, copy) NSArray<UIColor *> * _Nonnull editImageDrawColors SWIFT_DEPRECATED_MSG("Use editImageConfiguration, this property will be removed");
@property (nonatomic, strong) UIColor * _Nonnull editImageDefaultDrawColor SWIFT_DEPRECATED_MSG("Use editImageConfiguration, this property will be removed");
@property (nonatomic, copy) NSArray<ZLImageClipRatio *> * _Nonnull editImageClipRatios SWIFT_DEPRECATED_MSG("Use editImageConfiguration, this property will be removed");
@property (nonatomic, copy) NSArray<UIColor *> * _Nonnull textStickerTextColors SWIFT_DEPRECATED_MSG("Use editImageConfiguration, this property will be removed");
@property (nonatomic, strong) UIColor * _Nonnull textStickerDefaultTextColor SWIFT_DEPRECATED_MSG("Use editImageConfiguration, this property will be removed");
@property (nonatomic, copy) NSArray<ZLFilter *> * _Nonnull filters SWIFT_DEPRECATED_MSG("Use editImageConfiguration, this property will be removed");
@property (nonatomic, strong) UIView <ZLImageStickerContainerDelegate> * _Nullable imageStickerContainerView SWIFT_DEPRECATED_MSG("Use editImageConfiguration, this property will be removed");
/// Show the image captured by the camera is displayed on the camera button inside the album. Defaults to false.
@property (nonatomic) BOOL showCaptureImageOnTakePhotoBtn;
/// In single selection mode, whether to display the selection button. Defaults to false.
... ... @@ -868,11 +873,6 @@ SWIFT_CLASS("_TtC13HHPhotoPicker20ZLPhotoConfiguration")
- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
@end
typedef SWIFT_ENUM(NSInteger, CancelButtonStyle, closed) {
CancelButtonStyleText = 0,
CancelButtonStyleImage = 1,
};
@interface ZLPhotoConfiguration (SWIFT_EXTENSION(HHPhotoPicker))
- (ZLPhotoConfiguration * _Nonnull)allowSelectVideo:(BOOL)value;
... ... @@ -969,17 +969,17 @@ SWIFT_CLASS("_TtC13HHPhotoPicker19ZLPhotoPreviewSheet")
- (void)previewAssetsWithSender:(UIViewController * _Nonnull)sender assets:(NSArray<PHAsset *> * _Nonnull)assets index:(NSInteger)index isOriginal:(BOOL)isOriginal showBottomViewAndSelectBtn:(BOOL)showBottomViewAndSelectBtn;
@end
@interface ZLPhotoPreviewSheet (SWIFT_EXTENSION(HHPhotoPicker)) <UIGestureRecognizerDelegate>
- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer * _Nonnull)gestureRecognizer SWIFT_WARN_UNUSED_RESULT;
@end
@class PHChange;
@interface ZLPhotoPreviewSheet (SWIFT_EXTENSION(HHPhotoPicker)) <PHPhotoLibraryChangeObserver>
- (void)photoLibraryDidChange:(PHChange * _Nonnull)changeInstance;
@end
@interface ZLPhotoPreviewSheet (SWIFT_EXTENSION(HHPhotoPicker)) <UIGestureRecognizerDelegate>
- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer * _Nonnull)gestureRecognizer SWIFT_WARN_UNUSED_RESULT;
@end
@class UIImagePickerController;
@interface ZLPhotoPreviewSheet (SWIFT_EXTENSION(HHPhotoPicker)) <UIImagePickerControllerDelegate, UINavigationControllerDelegate>
... ... @@ -995,6 +995,7 @@ SWIFT_CLASS("_TtC13HHPhotoPicker19ZLPhotoPreviewSheet")
- (void)collectionView:(UICollectionView * _Nonnull)collectionView didSelectItemAtIndexPath:(NSIndexPath * _Nonnull)indexPath;
@end
enum CancelButtonStyle : NSInteger;
@class UIBlurEffect;
/// Custom UI configuration (include colors, images, text, font)
... ... @@ -1002,6 +1003,12 @@ SWIFT_CLASS("_TtC13HHPhotoPicker22ZLPhotoUIConfiguration")
@interface ZLPhotoUIConfiguration : NSObject
+ (ZLPhotoUIConfiguration * _Nonnull)default SWIFT_WARN_UNUSED_RESULT;
+ (void)resetConfiguration;
@property (nonatomic) enum ZLPhotoBrowserStyle style;
@property (nonatomic) UIStatusBarStyle statusBarStyle;
/// text: Cancel. image: ‘x’. Default to image.
@property (nonatomic) enum CancelButtonStyle navCancelButtonStyle;
/// Whether to show the status bar when previewing photos. Defaults to false.
@property (nonatomic) BOOL showStatusBarInPreviewInterface;
/// The blur effect of the navigation bar in the album list
@property (nonatomic, strong) UIBlurEffect * _Nullable navViewBlurEffectOfAlbumList;
/// The blur effect of the navigation bar in the preview interface
... ... @@ -1162,6 +1169,11 @@ SWIFT_CLASS("_TtC13HHPhotoPicker22ZLPhotoUIConfiguration")
- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
@end
typedef SWIFT_ENUM(NSInteger, CancelButtonStyle, closed) {
CancelButtonStyleText = 0,
CancelButtonStyleImage = 1,
};
SWIFT_CLASS("_TtC13HHPhotoPicker13ZLProgressHUD")
... ...
... ... @@ -10,7 +10,6 @@
#endif
#endif
//#import "ZLPhotoBrowser.h"
FOUNDATION_EXPORT double HHPhotoPickerVersionNumber;
FOUNDATION_EXPORT const unsigned char HHPhotoPickerVersionString[];
... ...
... ... @@ -12,7 +12,7 @@ Pod::Spec.new do |s|
# s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'hh_client@hh-medic.com' => 'luozhiping@hh-medic.com' }
s.source = { :git => 'https://code.hh-medic.com/hh_public/HHPhotoPickerPro', :branch => 'develop' }
s.source = { :git => 'https://code.hh-medic.com/hh_public/HHPhotoPickerPro', :tag => s.version.to_s }
# s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
s.source_files = 'HHPhotoPicker.framework/Headers/*.*'
... ...