文件上传[NYXImagesKit]

wanghengheng · wanghengheng · commit da1d2eeaf510 · 2014-12-25T14:36:51.000+08:00
diff --git a/Coding_iOS/Util/Manager/Coding_FileManager.m b/Coding_iOS/Util/Manager/Coding_FileManager.m
@@ -143,14 +143,14 @@ - (Coding_DownloadTask *)addDownloadTaskForFile:(ProjectFile *)file completionHa
     NSURL *downloadURL = [NSURL URLWithString:file.downloadPath];
     NSURLRequest *request = [NSURLRequest requestWithURL:downloadURL];
     NSURLSessionDownloadTask *downloadTask = [self.af_manager downloadTaskWithRequest:request progress:&progress destination:^NSURL *(NSURL *targetPath, NSURLResponse *response) {
-        NSLog(@"destination------Path");
         NSURL *downloadUrl = [[Coding_FileManager sharedManager] urlForDownloadFolder];
         Coding_DownloadTask *cDownloadTask = [[Coding_FileManager sharedManager] cDownloadTaskForResponse:response];
         if (cDownloadTask) {
             downloadUrl = [downloadUrl URLByAppendingPathComponent:cDownloadTask.diskFileName];
         }else{
             downloadUrl = [downloadUrl URLByAppendingPathComponent:[response suggestedFilename]];
         }
+        NSLog(@"download_destinationPath------\n%@", downloadUrl.absoluteString);
         return downloadUrl;
     } completionHandler:^(NSURLResponse *response, NSURL *filePath, NSError *error) {
         if (error) {
@@ -251,6 +251,7 @@ - (Coding_UploadTask *)addUploadTaskWithFileName:(NSString *)fileName completion
             [[NSFileManager defaultManager] moveItemAtPath:block_filePath toPath:diskFilePath error:nil];
             [manager directoryDidChange:manager.docUploadWatcher];
             [manager directoryDidChange:manager.docDownloadWatcher];
+            NSLog(@"upload_fileName------\n%@", block_fileName);
 
             //&#31227;&#38500;&#20219;&#21153;
             [[Coding_FileManager sharedManager] removeCUploadTaskForFile:block_fileName hasError:(error != nil)];
@@ -265,7 +266,6 @@ - (Coding_UploadTask *)addUploadTaskWithFileName:(NSString *)fileName completion
     [uploadTask resume];
     Coding_UploadTask *cUploadTask = [Coding_UploadTask cUploadTaskWithTask:uploadTask progress:progress fileName:fileName];
     [self.uploadDict setObject:cUploadTask forKey:fileName];
-    NSLog(@"---\n%@-----\n%@", uploadUrl.absoluteString, self.uploadDict);
 
     return cUploadTask;
 }
diff --git a/Coding_iOS/Views/Cell/FileListUploadCell.m b/Coding_iOS/Views/Cell/FileListUploadCell.m
@@ -10,7 +10,7 @@
 #import "Coding_FileManager.h"
 #import "ASProgressPopUpView.h"
 #import <Masonry/Masonry.h>
-#import <SDWebImage/UIImageView+WebCache.h>
+#import <NYXImagesKit/NYXImagesKit.h>
 
 @interface FileListUploadCell ()<ASProgressPopUpViewDelegate>
 @property (strong, nonatomic) UIImageView *iconView;
@@ -76,13 +76,13 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
             make.width.greaterThanOrEqualTo(@120);
         }];
         [_reDoButton mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.size.mas_equalTo(CGSizeMake(22, 22));
+            make.size.mas_equalTo(CGSizeMake(42, 42));
             make.left.mas_greaterThanOrEqualTo(_nameLabel.mas_right);
         }];
         [_cancelButton mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.size.mas_equalTo(CGSizeMake(22, 22));
-            make.left.equalTo(_reDoButton.mas_right).with.offset(20);
-            make.right.equalTo(self.contentView.mas_right).with.offset(-20);
+            make.size.mas_equalTo(CGSizeMake(42, 42));
+            make.left.equalTo(_reDoButton.mas_right);
+            make.right.equalTo(self.contentView.mas_right);
         }];
     }
     return self;
@@ -133,7 +133,9 @@ - (void)setFileName:(NSString *)fileName{
     Coding_FileManager *manager = [Coding_FileManager sharedManager];
 
     NSURL *fileUrl = [manager diskUploadUrlForFile:_fileName];
-    [_iconView sd_setImageWithURL:fileUrl placeholderImage:nil];
+    UIImage *iconImage = [UIImage imageWithContentsOfFile:fileUrl.path];
+    iconImage = [iconImage scaleToSize:(CGSize){64, 64} usingMode:NYXResizeModeAspectFill];
+    _iconView.image = iconImage;
     
     NSArray *fileInfos = [_fileName componentsSeparatedByString:@"|||"];
     _nameLabel.text = [fileInfos lastObject];
diff --git a/Podfile b/Podfile
@@ -12,4 +12,5 @@ pod 'JDStatusBarNotification', '1.4.9'
 pod 'BlocksKit', '2.2.5'
 pod 'ReactiveCocoa', '2.3.1'
 pod 'MMMarkdown', '0.3'
-pod 'Masonry', '0.5.3'
+pod 'Masonry', '0.5.3'
+pod 'NYXImagesKit', '2.3'
diff --git a/Podfile.lock b/Podfile.lock
@@ -19,6 +19,7 @@ PODS:
   - Masonry (0.5.3)
   - MBProgressHUD (0.9)
   - MMMarkdown (0.3)
+  - NYXImagesKit (2.3)
   - ODRefreshControl (1.1.0)
   - ReactiveCocoa (2.3.1):
     - ReactiveCocoa/UI (= 2.3.1)
@@ -41,6 +42,7 @@ DEPENDENCIES:
   - Masonry (= 0.5.3)
   - MBProgressHUD (= 0.9)
   - MMMarkdown (= 0.3)
+  - NYXImagesKit (= 2.3)
   - ODRefreshControl (= 1.1.0)
   - ReactiveCocoa (= 2.3.1)
   - RegexKitLite (= 4.0)
@@ -55,6 +57,7 @@ SPEC CHECKSUMS:
   Masonry: 35368c2ca9577ca87722c12fc52c4bad9b1c1516
   MBProgressHUD: 2038dbcf3dce73215abed6001657043d53aa79a8
   MMMarkdown: 95af8920c647512d1efa2ac8ac1932baf3266e2c
+  NYXImagesKit: 1c9f228ae78fab475d267b3b3a1308e0fba11731
   ODRefreshControl: 7bc75258d9dba1f93c4e34654d1e4b5aa39529f0
   ReactiveCocoa: dca75777b9d18990c8714a3a6f2149f29b4d1462
   RegexKitLite: c0e4c12e6e7de0769f3a3ed679f0f61604170661
