修复完善 <项目设置> - 修改图标

isaced · isaced · commit aead111bb01a · 2015-04-02T14:08:46.000+08:00
diff --git a/Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m b/Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m
@@ -34,6 +34,13 @@ @interface NProjectViewController ()<UITableViewDataSource, UITableViewDelegate>
 @end
 
 @implementation NProjectViewController
+
+-(void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    
+    [self.myTableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:0 inSection:0]] withRowAnimation:UITableViewRowAnimationAutomatic];
+}
+
 - (void)viewDidLoad{
     [super viewDidLoad];
     
diff --git a/Coding_iOS/Controllers/ProjectSetting/ProjectSettingViewController.m b/Coding_iOS/Controllers/ProjectSetting/ProjectSettingViewController.m
@@ -10,11 +10,14 @@
 #import "Projects.h"
 #import "UIImageView+WebCache.h"
 #import "Coding_NetAPIManager.h"
+#import "MBProgressHUD+Add.h"
+#import "JDStatusBarNotification.h"
 
 @interface ProjectSettingViewController ()<UITextViewDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate>
 
 @property (nonatomic, strong) UIBarButtonItem *submitButtonItem;
 @property (nonatomic, strong) UIImage *projectIconImage;
+@property (nonatomic, strong) MBProgressHUD *uploadHUD;
 
 @end
 
@@ -44,6 +47,10 @@ - (void)viewDidLoad {
     self.submitButtonItem.enabled = NO;
     self.navigationItem.rightBarButtonItem = self.submitButtonItem;
     
+    //HUD
+    self.uploadHUD = [[MBProgressHUD alloc] initWithView:self.view];
+    self.uploadHUD.mode = MBProgressHUDModeDeterminate;
+    [self.view addSubview:self.uploadHUD];
 }
 
 -(void)submit{
@@ -75,19 +82,41 @@ -(void)selectProjectImage{
         }else{
             avatarPicker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
         }
+        avatarPicker.allowsEditing = YES;
         [self presentViewController:avatarPicker animated:YES completion:nil];
     }] showInView:self.view];
 }
 
 -(void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info{
-    UIImage *image = [info objectForKey:UIImagePickerControllerOriginalImage];
+    UIImage *image = [info objectForKey:UIImagePickerControllerEditedImage];
+    
+    [self.view endEditing:YES];
     
     if (image) {
-        self.projectImageView.image = image;
-        self.projectIconImage = image;
+
+        self.uploadHUD.progress = 0;
+        [self.uploadHUD show:YES];
+        [[Coding_NetAPIManager sharedManager] request_UpdateProject_WithObj:self.project icon:image andBlock:^(id data, NSError *error) {
+            if (data) {
+                NSDictionary *dataDic = data[@"data"];
+                if (dataDic) {
+                    self.project.icon = dataDic[@"icon"];
+                    [[[SDWebImageManager sharedManager] imageCache] storeImage:image forKey:self.project.icon];
+                }
+                //
+                self.projectImageView.image = image;
+                self.projectIconImage = image;
+            }
+            [self.uploadHUD hide:YES];
+        } progerssBlock:^(CGFloat progressValue) {
+            self.uploadHUD.progress = progressValue;
+        }];
     }
     
-    [picker dismissViewControllerAnimated:YES completion:nil];
+    [picker dismissViewControllerAnimated:YES completion:^{
+        [JDStatusBarNotification showWithStatus:@"&#27491;&#22312;&#19978;&#20256;&#39033;&#30446;&#22270;&#26631;" styleName:JDStatusBarStyleSuccess];
+        [JDStatusBarNotification showActivityIndicator:YES indicatorStyle:UIActivityIndicatorViewStyleWhite];
+    }];
 }
 
 -(void)imagePickerControllerDidCancel:(UIImagePickerController *)picker{
diff --git a/Coding_iOS/Models/Projects.h b/Coding_iOS/Models/Projects.h
@@ -66,6 +66,8 @@ typedef NS_ENUM(NSInteger, ProjectsType)
 - (NSString *)toUpdatePath;
 - (NSDictionary *)toUpdateParams;
 
+- (NSString *)toUpdateIconPath;
+
 - (NSString *)toDeletePath;
 - (NSDictionary *)toDeleteParamsWithPassword:(NSString *)password;
 
diff --git a/Coding_iOS/Models/Projects.m b/Coding_iOS/Models/Projects.m
@@ -157,6 +157,10 @@ -(NSDictionary *)toUpdateParams{
              };
 }
 
+-(NSString *)toUpdateIconPath{
+    return [NSString stringWithFormat:@"api/project/%@/project_icon",self.id];
+}
+
 -(NSString *)toDeletePath{
     return [NSString stringWithFormat:@"api/project/%@",self.id];
 }
diff --git a/Coding_iOS/Util/Manager/CodingNetAPIClient.m b/Coding_iOS/Util/Manager/CodingNetAPIClient.m
@@ -129,7 +129,7 @@ -(void)requestJsonDataWithPath:(NSString *)aPath file:(NSDictionary *)file withP
         UIImage *image = file[@"image"];
         
         // &#32553;&#23567;&#21040;&#26368;&#22823; 800x800
-        image = [image scaledToMaxSize:CGSizeMake(799, 799)];
+//        image = [image scaledToMaxSize:CGSizeMake(500, 500)];
         
         // &#21387;&#32553;
         data = UIImageJPEGRepresentation(image, 1.0);
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.h b/Coding_iOS/Util/Manager/Coding_NetAPIManager.h
@@ -51,6 +51,7 @@
 
 - (void)request_NewProject_WithObj:(Project *)project image:(UIImage *)image andBlock:(void (^)(Project *data, NSError *error))block;
 - (void)request_UpdateProject_WithObj:(Project *)project andBlock:(void (^)(Project *data, NSError *error))block;
+- (void)request_UpdateProject_WithObj:(Project *)project icon:(UIImage *)icon andBlock:(void (^)(id data, NSError *error))block progerssBlock:(void (^)(CGFloat progressValue))progress;;
 - (void)request_DeleteProject_WithObj:(Project *)project password:(NSString *)password andBlock:(void (^)(Project *data, NSError *error))block;
 
 //File
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -278,6 +278,28 @@ -(void)request_UpdateProject_WithObj:(Project *)project andBlock:(void (^)(Proje
     }];
 }
 
+-(void)request_UpdateProject_WithObj:(Project *)project icon:(UIImage *)icon andBlock:(void (^)(id, NSError *))block progerssBlock:(void (^)(CGFloat))progress{
+    [MobClick event:kUmeng_Event_Request label:@"&#26356;&#26032;&#39033;&#30446;&#22270;&#26631;"];
+//    [self showStatusBarQueryStr:@"&#27491;&#22312;&#19978;&#20256;&#39033;&#30446;&#22270;&#26631;"];
+    
+    // &#32553;&#23567;&#21040;&#26368;&#22823; 500x500
+//    icon = [icon scaledToMaxSize:CGSizeMake(500, 500)];
+    
+    [[CodingNetAPIClient sharedJsonClient] uploadImage:icon path:[project toUpdateIconPath] name:@"file" successBlock:^(AFHTTPRequestOperation *operation, id responseObject) {
+        id error = [self handleResponse:responseObject];
+        if (error) {
+            block(nil, error);
+        }else{
+            block(responseObject, nil);
+            [self showStatusBarSuccessStr:@"&#26356;&#26032;&#39033;&#30446;&#22270;&#26631;&#25104;&#21151;"];
+        }
+        [self hideStatusBarProgress];
+    } failureBlock:^(AFHTTPRequestOperation *operation, NSError *error) {
+        block(nil, error);
+        [self showStatusBarError:error];
+    } progerssBlock:progress];
+}
+
 -(void)request_DeleteProject_WithObj:(Project *)project password:(NSString *)password andBlock:(void (^)(Project *, NSError *))block{
     [MobClick event:kUmeng_Event_Request label:@"&#21024;&#38500;&#39033;&#30446;"];
     [self showStatusBarQueryStr:@"&#27491;&#22312;&#21024;&#38500;&#39033;&#30446;"];

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,10 @@ -(NSDictionary *)toUpdateParams{`
`157`	`157`	`};`
`158`	`158`	`}`
`159`	`159`
	`160`	`+-(NSString *)toUpdateIconPath{`
	`161`	`+ return [NSString stringWithFormat:@"api/project/%@/project_icon",self.id];`
	`162`	`+}`
	`163`	`+`
`160`	`164`	`-(NSString *)toDeletePath{`
`161`	`165`	`return [NSString stringWithFormat:@"api/project/%@",self.id];`
`162`	`166`	`}`