iCloud无法同步逻辑优化

TZImagePickerController.xcodeproj/project.pbxproj

@@ -488,7 +488,7 @@
 					900E657B1C2BB8D5003D9A9E = {
 						CreatedOnToolsVersion = 7.2;
                         DevelopmentTeam = LTFQDC2QVX;
-                        ProvisioningStyle = Automatic;
+						ProvisioningStyle = Automatic;
 					};
 					900E65941C2BB8D5003D9A9E = {
 						CreatedOnToolsVersion = 7.2;
@@ -823,7 +823,7 @@
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = LTFQDC2QVX;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/TZImagePickerController",

TZImagePickerController/TZImagePickerController/TZAssetCell.m

@@ -169,10 +169,14 @@
     
     _bigImageRequestID = [[TZImageManager manager] requestImageDataForAsset:_model.asset completion:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
         if (!imageData && [info[PHImageResultIsInCloudKey] boolValue]) {
-            self.model.iCloudFaile = YES;
-            if (self.didSelectPhotoBlock) {
-                self.didSelectPhotoBlock(YES);
-                self.selectImageView.image = self.photoDefImage;
+            if (self.model.type == TZAssetModelMediaTypeVideo ||
+                self.model.type == TZAssetCellTypePhotoGif ||
+                self.model.type == TZAssetModelMediaTypeLivePhoto) {
+                self.model.iCloudFailed = YES;
+                if (self.didSelectPhotoBlock) {
+                    self.didSelectPhotoBlock(YES);
+                    self.selectImageView.image = self.photoDefImage;
+                }
             }
         }
         [self hideProgressView];

TZImagePickerController/TZImagePickerController/TZAssetModel.h

@@ -24,7 +24,7 @@ typedef enum : NSUInteger {
 @property (nonatomic, assign) BOOL isSelected;      ///< The select status of a photo, default is No
 @property (nonatomic, assign) TZAssetModelMediaType type;
 @property (nonatomic, copy) NSString *timeLength;
-@property (nonatomic, assign) BOOL iCloudFaile;
+@property (nonatomic, assign) BOOL iCloudFailed;
 
 /// Init a photo dataModel With a PHAsset
 /// 用一个PHAsset实例，初始化一个照片模型

TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m

@@ -566,10 +566,14 @@ static CGFloat itemMargin = 5;
                 [[NSNotificationCenter defaultCenter] postNotificationName:@"TZ_PHOTO_PICKER_RELOAD_NOTIFICATION" object:strongSelf.navigationController];
             }
             [UIView showOscillatoryAnimationWithLayer:strongLayer type:TZOscillatoryAnimationToSmaller];
-            if (strongCell.model.iCloudFaile) {
-                [strongSelf->_models replaceObjectAtIndex:indexPath.item withObject:strongCell.model];
-                NSString *title = [NSBundle tz_localizedStringForKey:@"iCloud sync failed"];
-                [tzImagePickerVc showAlertWithTitle:title];
+            if (strongCell.model.type == TZAssetModelMediaTypeLivePhoto ||
+                strongCell.model.type == TZAssetModelMediaTypePhotoGif ||
+                strongCell.model.type == TZAssetModelMediaTypeVideo) {
+                if (strongCell.model.iCloudFailed) {
+                    [strongSelf->_models replaceObjectAtIndex:indexPath.item withObject:strongCell.model];
+                    NSString *title = [NSBundle tz_localizedStringForKey:@"iCloud sync failed"];
+                    [tzImagePickerVc showAlertWithTitle:title];
+                }
             }
         } else {
             // 2. select:check if over the maxImagesCount / 选择照片,检查是否超过了最大个数的限制

TZImagePickerController/TZImagePickerController/TZPhotoPreviewCell.h

@@ -40,6 +40,7 @@
 @property (nonatomic, strong) TZProgressView *progressView;
 @property (nonatomic, strong) UIImageView *icloudErrorIcon;
 @property (nonatomic, strong) UILabel *icloudErrorLB;
+@property (nonatomic, copy) void (^iCloudSyncFailed)(id asset, BOOL isSyncFailed);
 
 
 @property (nonatomic, assign) BOOL allowCrop;
@@ -65,6 +66,7 @@
 @property (nonatomic, strong) NSURL *videoURL;
 @property (nonatomic, strong) UIImageView *icloudErrorIcon;
 @property (nonatomic, strong) UILabel *icloudErrorLB;
+@property (nonatomic, copy) void (^iCloudSyncFailed)(id asset, BOOL isSyncFailed);
 - (void)pausePlayerAndShowNaviBar;
 @end
 

TZImagePickerController/TZImagePickerController/TZPhotoPreviewCell.m

@@ -67,6 +67,7 @@
 - (void)setModel:(TZAssetModel *)model {
     [super setModel:model];
     _previewView.asset = model.asset;
+    _previewView.model = model;
 }
 
 - (void)recoverSubviews {
@@ -177,7 +178,12 @@
                 self->_icloudErrorLB.hidden = YES;
                 self->_icloudErrorIcon.hidden = YES;
             }
-            self.imageView.image = photo;
+            if (self.iCloudSyncFailed) {
+                self.iCloudSyncFailed(model.asset, !self->_icloudErrorLB.hidden);
+            }
+            if (photo) {
+                self.imageView.image = photo;
+            }
             [self resizeSubviews];
             if (self.isRequestingGIF) {
                 return;
@@ -222,15 +228,24 @@
     
     _asset = asset;
     self.imageRequestID = [[TZImageManager manager] getPhotoWithAsset:asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
-        if (!photo && [info[PHImageResultIsInCloudKey] boolValue]) {
-            self->_icloudErrorLB.hidden = NO;
-            self->_icloudErrorIcon.hidden = NO;
-        } else {
-            self->_icloudErrorLB.hidden = YES;
-            self->_icloudErrorIcon.hidden = YES;
+        if (self.model.type == TZAssetModelMediaTypeVideo   ||
+            self.model.type ==TZAssetModelMediaTypePhotoGif ||
+            self.model.type == TZAssetModelMediaTypeLivePhoto) {
+            if (!photo && [info[PHImageResultIsInCloudKey] boolValue]) {
+                self->_icloudErrorLB.hidden = NO;
+                self->_icloudErrorIcon.hidden = NO;
+            } else {
+                self->_icloudErrorLB.hidden = YES;
+                self->_icloudErrorIcon.hidden = YES;
+            }
+            if (self.iCloudSyncFailed) {
+                self.iCloudSyncFailed(asset, !self->_icloudErrorLB.hidden);
+            }
         }
         if (![asset isEqual:self->_asset]) return;
-        self.imageView.image = photo;
+        if (photo) {
+            self.imageView.image = photo;
+        }
         [self resizeSubviews];
         if (self.imageView.tz_height && self.allowCrop) {
             CGFloat scale = MAX(self.cropRect.size.width / self.imageView.tz_width, self.cropRect.size.height / self.imageView.tz_height);
@@ -447,7 +462,12 @@
                 self->_icloudErrorLB.hidden = YES;
                 self->_icloudErrorIcon.hidden = YES;
             }
-            self.cover = photo;
+            if (self.iCloudSyncFailed) {
+                self.iCloudSyncFailed(self.model.asset, !self->_icloudErrorLB.hidden);
+            }
+            if (photo) {
+                self.cover = photo;
+            }
         }];
         [[TZImageManager manager] getVideoWithAsset:self.model.asset completion:^(AVPlayerItem *playerItem, NSDictionary *info) {
             dispatch_async(dispatch_get_main_queue(), ^{

TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.m

@@ -459,8 +459,18 @@
     __weak typeof(self) weakSelf = self;
     if (_tzImagePickerVc.allowPickingMultipleVideo && model.type == TZAssetModelMediaTypeVideo) {
         cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"TZVideoPreviewCell" forIndexPath:indexPath];
+        TZVideoPreviewCell *currentCell = (TZVideoPreviewCell *)cell;
+        currentCell.iCloudSyncFailed = ^(id asset, BOOL isSyncFailed) {
+            model.iCloudFailed = isSyncFailed;
+            [weakSelf.models replaceObjectAtIndex:indexPath.item withObject:model];
+        };
     } else if (_tzImagePickerVc.allowPickingMultipleVideo && model.type == TZAssetModelMediaTypePhotoGif && _tzImagePickerVc.allowPickingGif) {
         cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"TZGifPreviewCell" forIndexPath:indexPath];
+        TZGifPreviewCell *currentCell = (TZGifPreviewCell *)cell;
+        currentCell.previewView.iCloudSyncFailed = ^(id asset, BOOL isSyncFailed) {
+            model.iCloudFailed = isSyncFailed;
+            [weakSelf.models replaceObjectAtIndex:indexPath.item withObject:model];
+        };
     } else {
         cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"TZPhotoPreviewCell" forIndexPath:indexPath];
         TZPhotoPreviewCell *photoPreviewCell = (TZPhotoPreviewCell *)cell;
@@ -485,6 +495,10 @@
                 }
             }
         }];
+        photoPreviewCell.previewView.iCloudSyncFailed = ^(id asset, BOOL isSyncFailed) {
+            model.iCloudFailed = isSyncFailed;
+            [weakSelf.models replaceObjectAtIndex:indexPath.item withObject:model];
+        };
     }
     
     cell.model = model;
@@ -563,38 +577,12 @@
         _originalPhotoLabel.hidden = YES;
         _doneButton.hidden = YES;
     }
-    NSIndexPath *indexPath = [NSIndexPath indexPathForItem:self.currentIndex inSection:0];
-       UICollectionViewCell *cell = [_collectionView cellForItemAtIndexPath:indexPath];
-       if ([cell isKindOfClass:[TZPhotoPreviewCell class]]) {
-           TZPhotoPreviewCell *currentCell = (TZPhotoPreviewCell *)cell;
-           if (_tzImagePickerVc.selectedModels.count <= 0) {
-               _doneButton.enabled = currentCell.previewView.icloudErrorLB.hidden;
-           } else {
-               _doneButton.enabled = YES;
-           }
-           _selectButton.hidden = !currentCell.previewView.icloudErrorLB.hidden;
-       } else if([cell isKindOfClass:[TZVideoPreviewCell class]]){
-           TZVideoPreviewCell *currentCell = (TZVideoPreviewCell *)cell;
-           if (_tzImagePickerVc.selectedModels.count <= 0) {
-               _doneButton.enabled = currentCell.icloudErrorLB.hidden;
-           } else {
-               _doneButton.enabled = YES;
-           }
-           _selectButton.hidden = !currentCell.icloudErrorLB.hidden;
-       } else if ([cell isKindOfClass:[TZGifPreviewCell class]]){
-           TZGifPreviewCell *currentCell = (TZGifPreviewCell *)cell;
-           if (_tzImagePickerVc.selectedModels.count <= 0) {
-               _doneButton.enabled = currentCell.previewView.icloudErrorLB.hidden;
-           } else {
-               _doneButton.enabled = YES;
-           }
-           _selectButton.hidden = !currentCell.previewView.icloudErrorLB.hidden;
-       }
-    if (model.iCloudFaile) {
-        _selectButton.hidden = YES;
-        _doneButton.enabled = NO;
+   // iCLoud同步失败的UI刷新
+    if (model.type ==  TZAssetModelMediaTypePhotoGif ||
+        model.type == TZAssetModelMediaTypeLivePhoto ||
+        model.type == TZAssetModelMediaTypeVideo) {
+        [self refreshiCloudFailed:model];
     }
-    
     if (_tzImagePickerVc.photoPreviewPageDidRefreshStateBlock) {
         _tzImagePickerVc.photoPreviewPageDidRefreshStateBlock(_collectionView, _naviBar, _backButton, _selectButton, _indexLabel, _toolBar, _originalPhotoButton, _originalPhotoLabel, _doneButton, _numberImageView, _numberLabel);
     }
@@ -610,6 +598,60 @@
     });
 }
 
+- (void)refreshiCloudFailed:(TZAssetModel *)model{
+    TZImagePickerController *_tzImagePickerVc = (TZImagePickerController *)self.navigationController;
+    if (model.iCloudFailed) {
+        _selectButton.hidden = YES;
+        _originalPhotoButton.hidden = YES;
+        _originalPhotoLabel.hidden = YES;
+        if (_tzImagePickerVc.selectedModels.count <= 0) {
+            _doneButton.enabled = !model.iCloudFailed;
+        }else{
+            _doneButton.enabled = YES;
+        }
+    }else{
+        NSIndexPath *indexPath = [NSIndexPath indexPathForItem:self.currentIndex inSection:0];
+        UICollectionViewCell *cell = [_collectionView cellForItemAtIndexPath:indexPath];
+        if ([cell isKindOfClass:[TZPhotoPreviewCell class]]) {
+            TZPhotoPreviewCell *currentCell = (TZPhotoPreviewCell *)cell;
+            currentCell.previewView.iCloudSyncFailed = ^(id asset, BOOL isSyncFailed) {
+                if ([asset isEqual:model.asset]) {
+                    if (_tzImagePickerVc.selectedModels.count <= 0) {
+                        self->_doneButton.enabled = !isSyncFailed;
+                    } else {
+                        self->_doneButton.enabled = YES;
+                    }
+                    self->_selectButton.hidden = isSyncFailed;
+                }
+            };
+        } else if([cell isKindOfClass:[TZVideoPreviewCell class]]){
+            TZVideoPreviewCell *currentCell = (TZVideoPreviewCell *)cell;
+            currentCell.iCloudSyncFailed = ^(id asset, BOOL isSyncFailed) {
+                if ([asset isEqual:model.asset]) {
+                    if (_tzImagePickerVc.selectedModels.count <= 0) {
+                        self->_doneButton.enabled = !isSyncFailed;
+                    } else {
+                        self->_doneButton.enabled = YES;
+                    }
+                    self->_selectButton.hidden = isSyncFailed;
+                }
+            };
+        } else if ([cell isKindOfClass:[TZGifPreviewCell class]]){
+            TZGifPreviewCell *currentCell = (TZGifPreviewCell *)cell;
+            currentCell.previewView.iCloudSyncFailed = ^(id asset, BOOL isSyncFailed) {
+                if ([asset isEqual:model.asset]) {
+                    if (_tzImagePickerVc.selectedModels.count <= 0) {
+                        self->_doneButton.enabled = !isSyncFailed;
+                    } else {
+                        self->_doneButton.enabled = YES;
+                    }
+                    self->_selectButton.hidden = isSyncFailed;
+                }
+            };
+        }
+    }
+}
+
 - (void)showPhotoBytes {
     [[TZImageManager manager] getPhotosBytesWithArray:@[_models[self.currentIndex]] completion:^(NSString *totalBytes) {
         self->_originalPhotoLabel.text = [NSString stringWithFormat:@"(%@)",totalBytes];