协议增加当前对应的数据模型

QuintGao · QuintGao · commit 300ec4f165e2 · 2024-12-20T18:42:16.000+08:00
diff --git a/GKPhotoBrowser/Core/Browser/GKPhotoBrowser.m b/GKPhotoBrowser/Core/Browser/GKPhotoBrowser.m
@@ -404,6 +404,9 @@ - (void)setupVideoPlayerProtocol:(id<GKVideoPlayerProtocol>)protocol {
         }
         
         if ([self.progress respondsToSelector:@selector(updatePlayStatus:)]) {
+            if ([self.progress respondsToSelector:@selector(setPhoto:)]) {
+                self.progress.photo = self.curPhotoView.photo;
+            }
             [self.progress updatePlayStatus:status];
         }
         
@@ -509,6 +512,9 @@ - (void)updateCoverViews {
         self.progressView.hidden = YES;
     }
     if (self.cover && [self.cover respondsToSelector:@selector(updateCoverWithPhoto:)]) {
+        if ([self.cover respondsToSelector:@selector(setPhoto:)]) {
+            self.cover.photo = photo;
+        }
         [self.cover updateCoverWithPhoto:photo];
     }
 }
diff --git a/GKPhotoBrowser/Core/Category/UIImage+GKPhotoBrowser.h b/GKPhotoBrowser/Core/Category/UIImage+GKPhotoBrowser.h
@@ -11,8 +11,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface UIImage (GKPhotoBrowser)
 
+/// 获取bundle图片
 + (UIImage *)gkbrowser_imageNamed:(NSString *)name;
 
+/// 获取gif图片
 + (UIImage *)gkbrowser_imageWithData:(NSData *)data;
 
 @end
diff --git a/GKPhotoBrowser/Core/PhotoView/GKPhoto.m b/GKPhotoBrowser/Core/PhotoView/GKPhoto.m
@@ -28,6 +28,13 @@ - (BOOL)isVideo {
     return !self.isLivePhoto && (self.videoUrl || self.videoAsset);
 }
 
+- (BOOL)isLivePhoto {
+    if (self.imageAsset) {
+        return self.imageAsset.mediaSubtypes & PHAssetMediaSubtypePhotoLive;
+    }
+    return _isLivePhoto;
+}
+
 - (void)getImage:(void (^)(NSData * _Nullable, UIImage * _Nullable, NSError * _Nullable))completion {
     if (!self.imageAsset) {
         NSError *error = [NSError errorWithDomain:@"com.browser.error" code:-1 userInfo:@{NSLocalizedDescriptionKey: @"没有图片资源"}];
@@ -99,13 +106,6 @@ - (void)getVideo:(void (^)(NSURL * _Nullable, NSError * _Nullable))completion {
     }
 }
 
-- (BOOL)isLivePhoto {
-    if (self.imageAsset) {
-        return self.imageAsset.mediaSubtypes & PHAssetMediaSubtypePhotoLive;
-    }
-    return _isLivePhoto;
-}
-
 #pragma mark - Private
 - (PHImageRequestID)loadImageDataWithAsset:(PHAsset *)asset completion:(void(^)(NSData *, NSError *))completion {
     PHImageRequestOptions *options = [[PHImageRequestOptions alloc] init];
diff --git a/GKPhotoBrowser/Core/PhotoView/GKPhotoView+Image.m b/GKPhotoBrowser/Core/PhotoView/GKPhotoView+Image.m
@@ -234,6 +234,10 @@ - (void)loadWebImageWithPhoto:(GKPhoto *)photo isOrigin:(BOOL)isOrigin placehold
                 }
             });
         };
+        
+        if ([self.imager respondsToSelector:@selector(setPhoto:)]) {
+            self.imager.photo = photo;
+        }
         [self.imager setImageForImageView:self.imageView url:url placeholderImage:placeholderImage progress:progressBlock completion:completionBlock];
     }else {
         if (self.imageView.image) {
@@ -342,8 +346,6 @@ - (void)adjustImageFrame {
         }
     }
     
-    
-    
     self.loadingView.frame = self.bounds;
     self.videoLoadingView.frame = self.bounds;
     self.liveLoadingView.frame = self.bounds;
diff --git a/GKPhotoBrowser/Core/PhotoView/GKPhotoView+LivePhoto.m b/GKPhotoBrowser/Core/PhotoView/GKPhotoView+LivePhoto.m
@@ -96,6 +96,9 @@ - (void)liveDidScrollAppear {
     if (!self.livePhoto.photo || self.livePhoto.photo != self.photo) {
         [self showLoading];
         __weak __typeof(self) weakSelf = self;
+        if ([self.livePhoto respondsToSelector:@selector(setPhoto:)]) {
+            self.livePhoto.photo = self.photo;
+        }
         [self.livePhoto loadLivePhotoWithPhoto:self.photo targetSize:self.configure.liveTargetSize progressBlock:^(float progress) {
             __strong __typeof(weakSelf) self = weakSelf;
             dispatch_async(dispatch_get_main_queue(), ^{
diff --git a/GKPhotoBrowser/Core/PhotoView/GKPhotoView+Video.m b/GKPhotoBrowser/Core/PhotoView/GKPhotoView+Video.m
@@ -69,6 +69,9 @@ - (void)videoDidScrollAppear {
     // 如果没有设置，则设置播放内容
     if (!self.player.assetURL || self.player.assetURL != self.photo.videoUrl) {
         __weak __typeof(self) weakSelf = self;
+        if ([self.player respondsToSelector:@selector(setPhoto:)]) {
+            self.player.photo = self.photo;
+        }
         [self.photo getVideo:^(NSURL * _Nullable url, NSError * _Nullable error) {
             __strong __typeof(weakSelf) self = weakSelf;
             if (!self) return;
diff --git a/GKPhotoBrowser/Core/Protocol/GKCoverViewProtocol.h b/GKPhotoBrowser/Core/Protocol/GKCoverViewProtocol.h
@@ -21,6 +21,9 @@
 
 @optional
 
+/// 当前对应的数据模型
+@property (nonatomic, weak, nullable) GKPhoto *photo;
+
 /// 更新索引
 - (void)updateCoverWithCount:(NSInteger)count index:(NSInteger)index;
 
diff --git a/GKPhotoBrowser/Core/Protocol/GKLivePhotoProtocol.h b/GKPhotoBrowser/Core/Protocol/GKLivePhotoProtocol.h
@@ -10,8 +10,7 @@
 #import <Photos/Photos.h>
 #import <PhotosUI/PhotosUI.h>
 
-@class GKPhoto;
-@class GKPhotoBrowser;
+@class GKPhotoBrowser, GKPhoto;
 
 typedef NS_ENUM(NSUInteger, GKLivePlayStatus) {
     GKLivePlayStatusBegin,
@@ -24,8 +23,6 @@ typedef NS_ENUM(NSUInteger, GKLivePlayStatus) {
 
 @property (nonatomic, strong, nullable) PHLivePhotoView *livePhotoView;
 
-@property (nonatomic, strong, nullable) GKPhoto *photo;
-
 @property (nonatomic, assign) BOOL isPlaying;
 
 @property (nonatomic, copy, nullable) void(^liveStatusChanged)(id<GKLivePhotoProtocol> _Nonnull mgr, GKLivePlayStatus status);
@@ -46,6 +43,10 @@ typedef NS_ENUM(NSUInteger, GKLivePlayStatus) {
 - (void)gk_setMute:(BOOL)mute;
 
 @optional
+
+/// 当前对应的数据模型
+@property (nonatomic, weak, nullable) GKPhoto *photo;
+
 // 清除下载的文件
 - (void)gk_clear;
 
diff --git a/GKPhotoBrowser/Core/Protocol/GKProgressViewProtocol.h b/GKPhotoBrowser/Core/Protocol/GKProgressViewProtocol.h
@@ -11,7 +11,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class GKPhotoBrowser;
+@class GKPhotoBrowser, GKPhoto;
 
 @protocol GKProgressViewProtocol <NSObject>
 
@@ -20,6 +20,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, nullable) UIView *progressView;
 
 @optional
+
+// 当前对应的数据模型
+@property (nonatomic, weak, nullable) GKPhoto *photo;
+
 // 更新状态
 - (void)updatePlayStatus:(GKVideoPlayerStatus)status;
 
diff --git a/GKPhotoBrowser/Core/Protocol/GKVideoPlayerProtocol.h b/GKPhotoBrowser/Core/Protocol/GKVideoPlayerProtocol.h
@@ -19,7 +19,7 @@ typedef NS_ENUM(NSUInteger, GKVideoPlayerStatus) {
     GKVideoPlayerStatusFailed      // 播放失败
 };
 
-@class GKPhotoBrowser;
+@class GKPhotoBrowser, GKPhoto;
 
 @protocol GKVideoPlayerProtocol <NSObject>
 
@@ -71,6 +71,10 @@ typedef NS_ENUM(NSUInteger, GKVideoPlayerStatus) {
 // 静音
 - (void)gk_setMute:(BOOL)mute;
 
+@optional
+/// 当前对应的数据模型
+@property (nonatomic, weak, nullable) GKPhoto *photo;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/GKPhotoBrowser/Core/Protocol/GKWebImageProtocol.h b/GKPhotoBrowser/Core/Protocol/GKWebImageProtocol.h
@@ -12,7 +12,7 @@ typedef void (^GKWebImageProgressBlock)(NSInteger receivedSize, NSInteger expect
 
 typedef void (^GKWebImageCompletionBlock)(UIImage * _Nullable image, NSURL * _Nullable url, BOOL finished, NSError * _Nullable error);
 
-@class GKPhotoBrowser;
+@class GKPhotoBrowser, GKPhoto;
 
 @protocol GKWebImageProtocol<NSObject>
 
@@ -42,6 +42,10 @@ typedef void (^GKWebImageCompletionBlock)(UIImage * _Nullable image, NSURL * _Nu
 - (UIImage *_Nullable)imageFromMemoryForURL:(nullable NSURL *)url;
 
 @optional
+
+/// 当前对应的数据模型
+@property (nonatomic, weak, nullable) GKPhoto *photo;
+
 /// 可选实现，主要用于加载相册图片资源PHAsset
 /// 根据data获取image对象
 /// @param data 图片数据

Original file line number	Diff line number	Diff line change
`@@ -404,6 +404,9 @@ - (void)setupVideoPlayerProtocol:(id<GKVideoPlayerProtocol>)protocol {`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`if ([self.progress respondsToSelector:@selector(updatePlayStatus:)]) {`
	`407`	`+ if ([self.progress respondsToSelector:@selector(setPhoto:)]) {`
	`408`	`+ self.progress.photo = self.curPhotoView.photo;`
	`409`	`+ }`
`407`	`410`	`[self.progress updatePlayStatus:status];`
`408`	`411`	`}`
`409`	`412`
`@@ -509,6 +512,9 @@ - (void)updateCoverViews {`
`509`	`512`	`self.progressView.hidden = YES;`
`510`	`513`	`}`
`511`	`514`	`if (self.cover && [self.cover respondsToSelector:@selector(updateCoverWithPhoto:)]) {`
	`515`	`+ if ([self.cover respondsToSelector:@selector(setPhoto:)]) {`
	`516`	`+ self.cover.photo = photo;`
	`517`	`+ }`
`512`	`518`	`[self.cover updateCoverWithPhoto:photo];`
`513`	`519`	`}`
`514`	`520`	`}`
Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,10 @@ - (void)loadWebImageWithPhoto:(GKPhoto *)photo isOrigin:(BOOL)isOrigin placehold`
`234`	`234`	`}`
`235`	`235`	`});`
`236`	`236`	`};`
	`237`	`+`
	`238`	`+ if ([self.imager respondsToSelector:@selector(setPhoto:)]) {`
	`239`	`+ self.imager.photo = photo;`
	`240`	`+ }`
`237`	`241`	`[self.imager setImageForImageView:self.imageView url:url placeholderImage:placeholderImage progress:progressBlock completion:completionBlock];`
`238`	`242`	`}else {`
`239`	`243`	`if (self.imageView.image) {`
`@@ -342,8 +346,6 @@ - (void)adjustImageFrame {`
`342`	`346`	`}`
`343`	`347`	`}`
`344`	`348`
`345`		`-`
`346`		`-`
`347`	`349`	`self.loadingView.frame = self.bounds;`
`348`	`350`	`self.videoLoadingView.frame = self.bounds;`
`349`	`351`	`self.liveLoadingView.frame = self.bounds;`