发冒泡时，对 iCloud 图片的下载处理

Author: wanghengheng

Coding_iOS/Coding_iOS-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.9.5</string>
+	<string>4.9.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -37,7 +37,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4.9.5.201712281800</string>
+	<string>4.9.8.201801041500</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

Coding_iOS/Controllers/TweetSendViewController.m

@@ -322,6 +322,12 @@ - (BOOL)isEmptyTweet{
 }
 
 - (void)sendTweet{
+    for (TweetImage *tImg in _curTweet.tweetImages) {
+        if (tImg.downloadState == TweetImageDownloadStateIng) {
+            [NSObject showHudTipStr:@"iCloud 图片尚未下载完毕"];
+            return;
+        }
+    }
     _curTweet.tweetContent = [_curTweet.tweetContent aliasedString];
     if (_sendNextTweet) {
         _sendNextTweet(_curTweet);

Coding_iOS/Models/Tweet.h

@@ -95,10 +95,19 @@ typedef NS_ENUM(NSInteger, TweetImageUploadState)
     TweetImageUploadStateFail
 };
 
+typedef NS_ENUM(NSInteger, TweetImageDownloadState)
+{
+    TweetImageDownloadStateInit = 0,
+    TweetImageDownloadStateIng,
+    TweetImageDownloadStateSuccess,
+    TweetImageDownloadStateFail
+};
+
 @interface TweetImage : NSObject
 @property (readwrite, nonatomic, strong) UIImage *image, *thumbnailImage;
 @property (strong, nonatomic) NSString *assetLocalIdentifier;
 @property (assign, nonatomic) TweetImageUploadState uploadState;
+@property (assign, nonatomic) TweetImageDownloadState downloadState;
 @property (readwrite, nonatomic, strong) NSString *imageStr;
 + (instancetype)tweetImageWithAssetLocalIdentifier:(NSString *)localIdentifier;
 + (instancetype)tweetImageWithAssetLocalIdentifier:(NSString *)localIdentifier andImage:(UIImage *)image;

Coding_iOS/Models/Tweet.m

@@ -196,11 +196,11 @@ - (void)saveSendData{
     NSMutableDictionary *tweetImagesDict = [NSMutableDictionary new];
     for (int i = 0; i < [self.tweetImages count]; i++) {
         TweetImage *tImg = [self.tweetImages objectAtIndex:i];
-        if (tImg.image) {
-            NSString *imgNameStr = [NSString stringWithFormat:@"%@_%d.jpg", dataPath, i];
-            if (tImg.assetLocalIdentifier) {
-                [tweetImagesDict setObject:tImg.assetLocalIdentifier forKey:imgNameStr];
-            }
+        NSString *imgNameStr = [NSString stringWithFormat:@"%@_%d.jpg", dataPath, i];
+        if (tImg.assetLocalIdentifier) {
+            [tweetImagesDict setObject:tImg.assetLocalIdentifier forKey:imgNameStr];
+        }
+        if (tImg.downloadState == TweetImageDownloadStateSuccess) {
             [NSObject saveImage:tImg.image imageName:imgNameStr inFolder:dataPath];
         }
     }
@@ -223,13 +223,15 @@ - (void)loadSendData{
     _tweetImages = [NSMutableArray new];
     _selectedAssetLocalIdentifiers = [NSMutableArray new];
     [tweetImagesDict enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *obj, BOOL *stop) {
-        NSURL *assetURL = [NSURL URLWithString:obj];
         NSData *imageData = [NSObject loadImageDataWithName:key inFolder:dataPath];
+        TweetImage *tImg;
         if (imageData) {
-            TweetImage *tImg = [TweetImage tweetImageWithAssetLocalIdentifier:obj andImage:[UIImage imageWithData:imageData]];
-            [self.tweetImages addObject:tImg];
-            [self.selectedAssetLocalIdentifiers addObject:assetURL];
+            tImg = [TweetImage tweetImageWithAssetLocalIdentifier:obj andImage:[UIImage imageWithData:imageData]];
+        }else{
+            tImg = [TweetImage tweetImageWithAssetLocalIdentifier:obj];
         }
+        [self.tweetImages addObject:tImg];
+        [self.selectedAssetLocalIdentifiers addObject:obj];
     }];
 }
 
@@ -380,26 +382,35 @@ + (instancetype)tweetImageWithAssetLocalIdentifier:(NSString *)localIdentifier{
     if (!localIdentifier) {
         return nil;
     }
-    PHAsset *asset = [PHAsset fetchAssetsWithLocalIdentifiers:@[localIdentifier] options:nil].firstObject;
+    PHAsset *asset = [PHAsset assetWithLocalIdentifier:localIdentifier];
     if (!asset) {
         return nil;
     }
     TweetImage *tweetImg = [[TweetImage alloc] init];
     tweetImg.uploadState = TweetImageUploadStateInit;
     tweetImg.assetLocalIdentifier = localIdentifier;
-    tweetImg.image = [PHAsset loadImageWithLocalIdentifier:localIdentifier];
-    tweetImg.thumbnailImage = [tweetImg.image scaledToSize:CGSizeMake(kScaleFrom_iPhone5_Desgin(70), kScaleFrom_iPhone5_Desgin(70)) highQuality:YES];
+    tweetImg.thumbnailImage = asset.loadThumbnailImage;
+    tweetImg.downloadState = TweetImageDownloadStateIng;
+    [asset loadImageWithProgressHandler:nil resultHandler:^(UIImage *result, NSDictionary *info) {
+        DebugLog(@"\n----------\nresultHandler: %@", info);
+        tweetImg.image = result;
+        tweetImg.downloadState = result? TweetImageDownloadStateSuccess: TweetImageDownloadStateFail;
+    }];
     return tweetImg;
 }
 
 + (instancetype)tweetImageWithAssetLocalIdentifier:(NSString *)localIdentifier andImage:(UIImage *)image{
     TweetImage *tweetImg = [[TweetImage alloc] init];
     tweetImg.uploadState = TweetImageUploadStateInit;
+    tweetImg.downloadState = TweetImageUploadStateSuccess;
     tweetImg.assetLocalIdentifier = localIdentifier;
     tweetImg.image = image;
     tweetImg.thumbnailImage = [image scaledToSize:CGSizeMake(kScaleFrom_iPhone5_Desgin(70), kScaleFrom_iPhone5_Desgin(70)) highQuality:YES];
     return tweetImg;
 }
 
+- (UIImage *)image{
+    return _image ?: _thumbnailImage;
+}
 
 @end

Coding_iOS/Util/OC_Category/PHAsset+Common.h

@@ -13,8 +13,10 @@
 + (PHAsset *)assetWithLocalIdentifier:(NSString *)localIdentifier;
 + (UIImage *)loadImageWithLocalIdentifier:(NSString *)localIdentifier;
 
+- (UIImage *)loadThumbnailImage;
 - (UIImage *)loadImage;
 - (NSData *)loadImageData;
 - (NSString *)fileName;
 
+- (void)loadImageWithProgressHandler:(PHAssetImageProgressHandler)progressHandler resultHandler:(void (^)(UIImage *result, NSDictionary *info))resultHandler;
 @end

Coding_iOS/Util/OC_Category/PHAsset+Common.m

@@ -19,11 +19,29 @@ + (UIImage *)loadImageWithLocalIdentifier:(NSString *)localIdentifier{
     return [self assetWithLocalIdentifier:localIdentifier].loadImage;
 }
 
+- (UIImage *)loadThumbnailImage{
+    PHImageRequestOptions *imageOptions = [[PHImageRequestOptions alloc] init];
+    imageOptions.synchronous = YES;
+    imageOptions.deliveryMode = PHImageRequestOptionsDeliveryModeHighQualityFormat;
+    imageOptions.resizeMode = PHImageRequestOptionsResizeModeFast;
+    imageOptions.networkAccessAllowed = YES;
+    PHImageManager *imageManager = [PHImageManager defaultManager];
+    CGFloat width = ((kScreen_Width - 15*2- 10*3)/4) * [UIScreen mainScreen].scale;
+    CGSize targetSize =CGSizeMake(width, width);
+    __block UIImage *assetImage;
+    [imageManager requestImageForAsset:self targetSize:targetSize contentMode:PHImageContentModeAspectFill options:imageOptions resultHandler:^(UIImage * _Nullable result, NSDictionary * _Nullable info) {
+        assetImage = result;
+    }];
+    return assetImage;
+}
+
+
 - (UIImage *)loadImage{
     PHImageRequestOptions *imageOptions = [[PHImageRequestOptions alloc] init];
     imageOptions.synchronous = YES;
     imageOptions.deliveryMode = PHImageRequestOptionsDeliveryModeHighQualityFormat;
     imageOptions.resizeMode = PHImageRequestOptionsResizeModeExact;
+    imageOptions.networkAccessAllowed = YES;
     PHImageManager *imageManager = [PHImageManager defaultManager];
     __block UIImage *assetImage;
     [imageManager requestImageForAsset:self targetSize:PHImageManagerMaximumSize contentMode:PHImageContentModeDefault options:imageOptions resultHandler:^(UIImage * _Nullable result, NSDictionary * _Nullable info) {
@@ -37,6 +55,7 @@ - (NSData *)loadImageData{
     imageOptions.synchronous = YES;
     imageOptions.deliveryMode = PHImageRequestOptionsDeliveryModeHighQualityFormat;
     imageOptions.resizeMode = PHImageRequestOptionsResizeModeExact;
+    imageOptions.networkAccessAllowed = YES;
     PHImageManager *imageManager = [PHImageManager defaultManager];
     __block NSData *assetData;
     [imageManager requestImageDataForAsset:self options:imageOptions resultHandler:^(NSData * _Nullable imageData, NSString * _Nullable dataUTI, UIImageOrientation orientation, NSDictionary * _Nullable info) {
@@ -55,5 +74,15 @@ - (NSString *)fileName{
     return fileName;
 }
 
+- (void)loadImageWithProgressHandler:(PHAssetImageProgressHandler)progressHandler resultHandler:(void (^)(UIImage *result, NSDictionary *info))resultHandler{
+    PHImageRequestOptions *imageOptions = [[PHImageRequestOptions alloc] init];
+    imageOptions.synchronous = NO;
+    imageOptions.deliveryMode = PHImageRequestOptionsDeliveryModeHighQualityFormat;
+    imageOptions.resizeMode = PHImageRequestOptionsResizeModeExact;
+    imageOptions.networkAccessAllowed = YES;
+    imageOptions.progressHandler = progressHandler;
+    PHImageManager *imageManager = [PHImageManager defaultManager];
+    [imageManager requestImageForAsset:self targetSize:PHImageManagerMaximumSize contentMode:PHImageContentModeDefault options:imageOptions resultHandler:resultHandler];
+}
 
 @end

Coding_iOS/Views/CCell/TweetSendImageCCell.h

@@ -12,6 +12,7 @@
 #import "Tweets.h"
 
 @interface TweetSendImageCCell : UICollectionViewCell
+@property (strong, nonatomic) UIActivityIndicatorView *activityIndicator;
 @property (strong, nonatomic) UIImageView *imgView;
 @property (strong, nonatomic) UIButton *deleteBtn;
 @property (strong, nonatomic) TweetImage *curTweetImg;

Coding_iOS/Views/CCell/TweetSendImageCCell.m

@@ -50,7 +50,23 @@ - (void)setCurTweetImg:(TweetImage *)curTweetImg{
             [_deleteBtn addTarget:self action:@selector(deleteBtnClicked:) forControlEvents:UIControlEventTouchUpInside];
             [self.contentView addSubview:_deleteBtn];
         }
+        if (!_activityIndicator) {
+            _activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
+            _activityIndicator.hidesWhenStopped = YES;
+            [self.contentView addSubview:_activityIndicator];
+            [_activityIndicator mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.center.equalTo(self.contentView);
+            }];
+        }
         RAC(self.imgView, image) = [RACObserve(self.curTweetImg, thumbnailImage) takeUntil:self.rac_prepareForReuseSignal];
+        __weak typeof(self) weakSelf = self;
+        [[RACObserve(self.curTweetImg, downloadState) takeUntil:self.rac_prepareForReuseSignal] subscribeNext:^(NSNumber *x) {
+            if (x.integerValue == TweetImageDownloadStateIng) {
+                [weakSelf.activityIndicator startAnimating];
+            }else{
+                [weakSelf.activityIndicator stopAnimating];
+            }
+        }];
         _deleteBtn.hidden = NO;
     }else{
         _imgView.image = [UIImage imageNamed:@"addPictureBgImage"];