Commit 68f2dc43 authored by 翟书觅's avatar 翟书觅

命名规范

parent 7e9114aa
...@@ -66,7 +66,6 @@ ...@@ -66,7 +66,6 @@
- (void)setModel:(TZAssetModel *)model { - (void)setModel:(TZAssetModel *)model {
[super setModel:model]; [super setModel:model];
_previewView.asset = model.asset;
_previewView.model = model; _previewView.model = model;
} }
...@@ -455,7 +454,7 @@ ...@@ -455,7 +454,7 @@
}]; }];
[[TZImageManager manager] getVideoWithAsset:self.model.asset completion:^(AVPlayerItem *playerItem, NSDictionary *info) { [[TZImageManager manager] getVideoWithAsset:self.model.asset completion:^(AVPlayerItem *playerItem, NSDictionary *info) {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
BOOL iCloudSyncFailed = !photo && [info[PHImageResultIsInCloudKey] boolValue]; BOOL iCloudSyncFailed = !playerItem && [info[PHImageResultIsInCloudKey] boolValue];
self.iCloudErrorLabel.hidden = !iCloudSyncFailed; self.iCloudErrorLabel.hidden = !iCloudSyncFailed;
self.iCloudErrorIcon.hidden = !iCloudSyncFailed; self.iCloudErrorIcon.hidden = !iCloudSyncFailed;
if (self.iCloudSyncFailedHandle) { if (self.iCloudSyncFailedHandle) {
......
...@@ -462,7 +462,7 @@ ...@@ -462,7 +462,7 @@
TZVideoPreviewCell *currentCell = (TZVideoPreviewCell *)cell; TZVideoPreviewCell *currentCell = (TZVideoPreviewCell *)cell;
currentCell.iCloudSyncFailedHandle = ^(id asset, BOOL isSyncFailed) { currentCell.iCloudSyncFailedHandle = ^(id asset, BOOL isSyncFailed) {
model.iCloudFailed = isSyncFailed; model.iCloudFailed = isSyncFailed;
[weakSelf refreshiCloudFailed:model]; [weakSelf didICloudSyncStatusChanged:model];
[weakSelf.models replaceObjectAtIndex:indexPath.item withObject:model]; [weakSelf.models replaceObjectAtIndex:indexPath.item withObject:model];
}; };
} else if (_tzImagePickerVc.allowPickingMultipleVideo && model.type == TZAssetModelMediaTypePhotoGif && _tzImagePickerVc.allowPickingGif) { } else if (_tzImagePickerVc.allowPickingMultipleVideo && model.type == TZAssetModelMediaTypePhotoGif && _tzImagePickerVc.allowPickingGif) {
...@@ -470,7 +470,7 @@ ...@@ -470,7 +470,7 @@
TZGifPreviewCell *currentCell = (TZGifPreviewCell *)cell; TZGifPreviewCell *currentCell = (TZGifPreviewCell *)cell;
currentCell.previewView.iCloudSyncFailedHandle = ^(id asset, BOOL isSyncFailed) { currentCell.previewView.iCloudSyncFailedHandle = ^(id asset, BOOL isSyncFailed) {
model.iCloudFailed = isSyncFailed; model.iCloudFailed = isSyncFailed;
[weakSelf refreshiCloudFailed:model]; [weakSelf didICloudSyncStatusChanged:model];
[weakSelf.models replaceObjectAtIndex:indexPath.item withObject:model]; [weakSelf.models replaceObjectAtIndex:indexPath.item withObject:model];
}; };
} else { } else {
...@@ -499,7 +499,7 @@ ...@@ -499,7 +499,7 @@
}]; }];
photoPreviewCell.previewView.iCloudSyncFailedHandle = ^(id asset, BOOL isSyncFailed) { photoPreviewCell.previewView.iCloudSyncFailedHandle = ^(id asset, BOOL isSyncFailed) {
model.iCloudFailed = isSyncFailed; model.iCloudFailed = isSyncFailed;
[weakSelf refreshiCloudFailed:model]; [weakSelf didICloudSyncStatusChanged:model];
[weakSelf.models replaceObjectAtIndex:indexPath.item withObject:model]; [weakSelf.models replaceObjectAtIndex:indexPath.item withObject:model];
}; };
} }
...@@ -580,8 +580,8 @@ ...@@ -580,8 +580,8 @@
_originalPhotoLabel.hidden = YES; _originalPhotoLabel.hidden = YES;
_doneButton.hidden = YES; _doneButton.hidden = YES;
} }
// iCLoud同步失败的UI刷新 // iCloud同步失败的UI刷新
[self refreshiCloudFailed:model]; [self didICloudSyncStatusChanged:model];
if (_tzImagePickerVc.photoPreviewPageDidRefreshStateBlock) { if (_tzImagePickerVc.photoPreviewPageDidRefreshStateBlock) {
_tzImagePickerVc.photoPreviewPageDidRefreshStateBlock(_collectionView, _naviBar, _backButton, _selectButton, _indexLabel, _toolBar, _originalPhotoButton, _originalPhotoLabel, _doneButton, _numberImageView, _numberLabel); _tzImagePickerVc.photoPreviewPageDidRefreshStateBlock(_collectionView, _naviBar, _backButton, _selectButton, _indexLabel, _toolBar, _originalPhotoButton, _originalPhotoLabel, _doneButton, _numberImageView, _numberLabel);
} }
...@@ -597,7 +597,7 @@ ...@@ -597,7 +597,7 @@
}); });
} }
- (void)refreshiCloudFailed:(TZAssetModel *)model{ - (void)didICloudSyncStatusChanged:(TZAssetModel *)model{
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
TZImagePickerController *_tzImagePickerVc = (TZImagePickerController *)self.navigationController; TZImagePickerController *_tzImagePickerVc = (TZImagePickerController *)self.navigationController;
// onlyReturnAsset为NO时,依赖TZ返回大图,所以需要有iCloud同步失败的提示,并且不能选择, // onlyReturnAsset为NO时,依赖TZ返回大图,所以需要有iCloud同步失败的提示,并且不能选择,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment