3840 提示语 & 私信对话框尺寸 & Gif 图片保存

wanghengheng · wanghengheng · commit fe7789ad5f4b · 2018-01-23T17:17:16.000+08:00
diff --git a/Coding_iOS/Controllers/FileViewController.m b/Coding_iOS/Controllers/FileViewController.m
@@ -440,18 +440,18 @@ - (void)openByOtherApp{
 }
 
 - (void)saveCurImg{
-    SEL selectorToCall = @selector(imageWasSavedSuccessfully:didFinishSavingWithError:contextInfo:);
-    
-    UIImage *image = [UIImage imageWithData:[NSData dataWithContentsOfURL:self.fileUrl]];
-    if (!image) {
-        [NSObject showHudTipStr:@"提取图片失败"];
-        return;
-    }
-    UIImageWriteToSavedPhotosAlbum(image, self, selectorToCall, NULL);
+    __weak typeof(self) weakSelf = self;
+    [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{
+        [[PHAssetCreationRequest creationRequestForAsset] addResourceWithType:PHAssetResourceTypePhoto fileURL:weakSelf.fileUrl options:nil];
+    } completionHandler:^(BOOL success, NSError * _Nullable error) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [weakSelf saveImageHappenedError:error];
+        });
+    }];
 }
 
-- (void) imageWasSavedSuccessfully:(UIImage *)paramImage didFinishSavingWithError:(NSError *)paramError contextInfo:(void *)paramContextInfo{
-    if (paramError == nil){
+- (void)saveImageHappenedError:(NSError *)error{
+    if (error == nil){
         [NSObject showHudTipStr:@"成功保存到相册"];
     } else {
         [NSObject showHudTipStr:@"保存失败"];
diff --git a/Coding_iOS/Vendor/MJPhotoBrowser/MJPhotoToolbar.m b/Coding_iOS/Vendor/MJPhotoBrowser/MJPhotoToolbar.m
@@ -55,16 +55,21 @@ - (void)setPhotos:(NSArray *)photos
     [self addSubview:_saveImageBtn];
 }
 
-- (void)saveImage
-{
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        MJPhoto *photo = _photos[_currentPhotoIndex];
-        UIImageWriteToSavedPhotosAlbum(photo.image, self, @selector(image:didFinishSavingWithError:contextInfo:), nil);
-    });
+- (void)saveImage{
+    MJPhoto *curP = _photos[_currentPhotoIndex];
+    NSString *dataP = [SDWebImageManager.sharedManager.imageCache defaultCachePathForKey:curP.url.absoluteString];
+    NSData *imageD = [NSData dataWithContentsOfFile:dataP];
+    __weak typeof(self) weakSelf = self;
+    [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{
+        [[PHAssetCreationRequest creationRequestForAsset] addResourceWithType:PHAssetResourceTypePhoto data:imageD options:nil];
+    } completionHandler:^(BOOL success, NSError * _Nullable error) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [weakSelf saveImageHappenedError:error];
+        });
+    }];
 }
 
-- (void)image:(UIImage *)image didFinishSavingWithError:(NSError *)error contextInfo:(void *)contextInfo
-{
+- (void)saveImageHappenedError:(NSError *)error{
     if (error) {
         [MBProgressHUD showSuccess:@"保存失败" toView:nil];
     } else {
