优化iCloud同步失败的判断

Author: banchichen

TZImagePickerController/TZImagePickerController/TZAssetCell.m

@@ -168,12 +168,11 @@ - (void)requestBigImage {
     }
 
     _bigImageRequestID = [[TZImageManager manager] requestImageDataForAsset:_model.asset completion:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
-        if (!imageData && [info[PHImageResultIsInCloudKey] boolValue]) {
-            self.model.iCloudFailed = YES;
-            if (self.didSelectPhotoBlock) {
-                self.didSelectPhotoBlock(YES);
-                self.selectImageView.image = self.photoDefImage;
-            }
+        BOOL iCloudSyncFailed = !imageData && [TZCommonTools isICloudSyncError:info[PHImageErrorKey]];
+        self.model.iCloudFailed = iCloudSyncFailed;
+        if (iCloudSyncFailed && self.didSelectPhotoBlock) {
+            self.didSelectPhotoBlock(YES);
+            self.selectImageView.image = self.photoDefImage;
         }
         [self hideProgressView];
     } progressHandler:^(double progress, NSError *error, BOOL *stop, NSDictionary *info) {
@@ -194,13 +193,12 @@ - (void)requestBigImage {
     }];
     if (_model.type == TZAssetCellTypeVideo) {
         [[TZImageManager manager] getVideoWithAsset:_model.asset completion:^(AVPlayerItem *playerItem, NSDictionary *info) {
-            if (!playerItem && [info[PHImageResultIsInCloudKey] boolValue]) {
+            BOOL iCloudSyncFailed = !playerItem && [TZCommonTools isICloudSyncError:info[PHImageErrorKey]];
+            self.model.iCloudFailed = iCloudSyncFailed;
+            if (iCloudSyncFailed && self.didSelectPhotoBlock) {
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    self->_model.iCloudFailed = YES;
-                    if (self->_didSelectPhotoBlock) {
-                        self->_didSelectPhotoBlock(YES);
-                        self->_selectImageView.image = self.photoDefImage;
-                    }
+                    self.didSelectPhotoBlock(YES);
+                    self.selectImageView.image = self.photoDefImage;
                 });
             }
         }];

TZImagePickerController/TZImagePickerController/TZImagePickerController.h

@@ -305,6 +305,7 @@
 + (NSDictionary *)tz_getInfoDictionary;
 + (BOOL)tz_isRightToLeftLayout;
 + (void)configBarButtonItem:(UIBarButtonItem *)item tzImagePickerVc:(TZImagePickerController *)tzImagePickerVc;
++ (BOOL)isICloudSyncError:(NSError *)error;
 @end
 
 

TZImagePickerController/TZImagePickerController/TZImagePickerController.m

@@ -913,6 +913,14 @@ + (void)configBarButtonItem:(UIBarButtonItem *)item tzImagePickerVc:(TZImagePick
     [item setTitleTextAttributes:textAttrs forState:UIControlStateNormal];
 }
 
++ (BOOL)isICloudSyncError:(NSError *)error {
+    if (!error) return NO;
+    if ([error.domain isEqualToString:@"CKErrorDomain"] || [error.domain isEqualToString:@"CloudPhotoLibraryErrorDomain"]) {
+        return YES;
+    }
+    return NO;
+}
+
 @end
 
 

TZImagePickerController/TZImagePickerController/TZPhotoPreviewCell.m

@@ -170,12 +170,6 @@ - (void)setModel:(TZAssetModel *)model {
     if (model.type == TZAssetModelMediaTypePhotoGif) {
         // 先显示缩略图
         [[TZImageManager manager] getPhotoWithAsset:model.asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
-            BOOL iCloudSyncFailed = !photo && [info[PHImageResultIsInCloudKey] boolValue];
-            self.iCloudErrorLabel.hidden = !iCloudSyncFailed;
-            self.iCloudErrorIcon.hidden = !iCloudSyncFailed;
-            if (self.iCloudSyncFailedHandle) {
-                self.iCloudSyncFailedHandle(model.asset, iCloudSyncFailed);
-            }
             if (photo) {
                 self.imageView.image = photo;
             }
@@ -188,6 +182,13 @@ - (void)setModel:(TZAssetModel *)model {
             [[TZImageManager manager] getOriginalPhotoDataWithAsset:model.asset progressHandler:^(double progress, NSError *error, BOOL *stop, NSDictionary *info) {
                 progress = progress > 0.02 ? progress : 0.02;
                 dispatch_async(dispatch_get_main_queue(), ^{
+                    BOOL iCloudSyncFailed = [TZCommonTools isICloudSyncError:error];
+                    self.iCloudErrorLabel.hidden = !iCloudSyncFailed;
+                    self.iCloudErrorIcon.hidden = !iCloudSyncFailed;
+                    if (self.iCloudSyncFailedHandle) {
+                        self.iCloudSyncFailedHandle(model.asset, iCloudSyncFailed);
+                    }
+                    
                     self.progressView.progress = progress;
                     if (progress >= 1) {
                         self.progressView.hidden = YES;
@@ -223,7 +224,7 @@ - (void)setAsset:(PHAsset *)asset {
 
     _asset = asset;
     self.imageRequestID = [[TZImageManager manager] getPhotoWithAsset:asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
-        BOOL iCloudSyncFailed = !photo && [info[PHImageResultIsInCloudKey] boolValue];
+        BOOL iCloudSyncFailed = !photo && [TZCommonTools isICloudSyncError:info[PHImageErrorKey]];
         self.iCloudErrorLabel.hidden = !iCloudSyncFailed;
         self.iCloudErrorIcon.hidden = !iCloudSyncFailed;
         if (self.iCloudSyncFailedHandle) {
@@ -442,7 +443,7 @@ - (void)configMoviePlayer {
 
     if (self.model && self.model.asset) {
         [[TZImageManager manager] getPhotoWithAsset:self.model.asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
-            BOOL iCloudSyncFailed = !photo && [info[PHImageResultIsInCloudKey] boolValue];
+            BOOL iCloudSyncFailed = !photo && [TZCommonTools isICloudSyncError:info[PHImageErrorKey]];
             self.iCloudErrorLabel.hidden = !iCloudSyncFailed;
             self.iCloudErrorIcon.hidden = !iCloudSyncFailed;
             if (self.iCloudSyncFailedHandle) {
@@ -454,7 +455,7 @@ - (void)configMoviePlayer {
         }];
         [[TZImageManager manager] getVideoWithAsset:self.model.asset completion:^(AVPlayerItem *playerItem, NSDictionary *info) {
             dispatch_async(dispatch_get_main_queue(), ^{
-                BOOL iCloudSyncFailed = !playerItem && [info[PHImageResultIsInCloudKey] boolValue];
+                BOOL iCloudSyncFailed = !playerItem && [TZCommonTools isICloudSyncError:info[PHImageErrorKey]];
                 self.iCloudErrorLabel.hidden = !iCloudSyncFailed;
                 self.iCloudErrorIcon.hidden = !iCloudSyncFailed;
                 if (self.iCloudSyncFailedHandle) {

TZImagePickerController/TZImagePickerController/TZVideoPlayerController.m

@@ -64,13 +64,11 @@ - (void)viewWillDisappear:(BOOL)animated {
 
 - (void)configMoviePlayer {
     [[TZImageManager manager] getPhotoWithAsset:_model.asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
-        if (!photo && [info[PHImageResultIsInCloudKey] boolValue]) {
-            self.iCloudErrorView.hidden = NO;
-        }
+        BOOL iCloudSyncFailed = !photo && [TZCommonTools isICloudSyncError:info[PHImageErrorKey]];
+        self.iCloudErrorView.hidden = !iCloudSyncFailed;
         if (!isDegraded && photo) {
             self->_cover = photo;
             self->_doneButton.enabled = YES;
-            self.iCloudErrorView.hidden = YES;
         }
     }];
     [[TZImageManager manager] getVideoWithAsset:_model.asset completion:^(AVPlayerItem *playerItem, NSDictionary *info) {