From a0a95e20123b7b599558bf9bed2a9493179c2a9e Mon Sep 17 00:00:00 2001 From: phongnv Date: Wed, 2 Aug 2017 02:12:38 +0700 Subject: [PATCH] update param upload-image --- LifeLog/LifeLog/RegisterViewController.m | 41 +++++++++++++++++++++----------- LifeLog/LifeLog/ServerAPI.m | 21 +++++++--------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/LifeLog/LifeLog/RegisterViewController.m b/LifeLog/LifeLog/RegisterViewController.m index c38b045..3247ca8 100644 --- a/LifeLog/LifeLog/RegisterViewController.m +++ b/LifeLog/LifeLog/RegisterViewController.m @@ -184,8 +184,14 @@ static int const kPickerTagSex = 2; - (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { UIImage *image = [info valueForKey:UIImagePickerControllerOriginalImage]; - self.avatar.image = image; - NSData *dataImage = UIImagePNGRepresentation(image); + //NSData *imageData = UIImageJPEGRepresentation (image, 0.5); + + // My image view is 90x90 + //UIImage *thumbImage = MyCreateThumbnailImageFromData(imageData, 90); + UIImage *thumbImage = [self imageWithImage:image scaledToFillSize:CGSizeMake(80, 80)]; + + self.avatar.image = thumbImage; + NSData *dataImage = UIImagePNGRepresentation(thumbImage); RegisterViewController __weak *weakSelf = self; [[ServerAPI server] uploadImage:nil andImageData:dataImage CompletionHandler:^(NSString *linkImage, NSError *error) { if (weakSelf == nil) { @@ -213,6 +219,23 @@ static int const kPickerTagSex = 2; }]; } +- (UIImage *)imageWithImage:(UIImage *)image scaledToFillSize:(CGSize)size +{ + CGFloat scale = MAX(size.width/image.size.width, size.height/image.size.height); + CGFloat width = image.size.width * scale; + CGFloat height = image.size.height * scale; + CGRect imageRect = CGRectMake((size.width - width)/2.0f, + (size.height - height)/2.0f, + width, + height); + + UIGraphicsBeginImageContextWithOptions(size, NO, 0); + [image drawInRect:imageRect]; + UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext(); + UIGraphicsEndImageContext(); + return newImage; +} + #pragma mark - Function Private - (void)showCamera { if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) @@ -390,16 +413,6 @@ static int const kPickerTagSex = 2; return dict; } -/* - API regist: - - Url: http://clover.timesfun.jp:9001/register - Params: - username: "sonle33", password: "laslas123", full_name: "son le", nickname: "las", birthday: "1990-11-11", height: 177, weight: 70, fat_rate: 12, gender: 1, address: "asdsad", description: "nothing", receive_notification: 0, phone: 0988999777, share_data: 1, profile_image: "upload/avt/2019525859598528205222222.png", delete_flag: 0, email: "sonle33@las.vn", physical_activity: 0, remember_me: 1 - - - Url: http://clover.timesfun.jp:9001/forgetPass - param: email - */ - - (NSDictionary *)createParamsForRegisterUser { NSMutableDictionary *dictResutl = [[NSMutableDictionary alloc] init]; dictResutl = [self addParam:@"username" value:_tfUsername.text withDict:dictResutl]; @@ -407,13 +420,13 @@ static int const kPickerTagSex = 2; dictResutl = [self addParam:@"nickname" value:_tfNickname.text withDict:dictResutl]; dictResutl = [self addParam:@"email" value:_tfEmail.text withDict:dictResutl]; dictResutl = [self addParam:@"password" value:_tfPassword.text withDict:dictResutl]; - dictResutl = [self addParam:@"confirm_password" value:_tfConfirmPassword.text withDict:dictResutl]; + //dictResutl = [self addParam:@"confirm_password" value:_tfConfirmPassword.text withDict:dictResutl]; NSString *valueSex = nil; // 0 - 男, 1 - 女 if (_tflblSex.text.length > 0) { if ([_tflblSex.text isEqualToString:@"男"]) { valueSex = @"0"; } - else if ([_tflblSex.text isEqualToString:@"男"]) { + else if ([_tflblSex.text isEqualToString:@"女"]) { valueSex = @"1"; } } diff --git a/LifeLog/LifeLog/ServerAPI.m b/LifeLog/LifeLog/ServerAPI.m index 7905b41..810b2cb 100644 --- a/LifeLog/LifeLog/ServerAPI.m +++ b/LifeLog/LifeLog/ServerAPI.m @@ -113,7 +113,12 @@ static ServerAPI *_server = nil; if (error == nil) { NSDictionary *dataResult = [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error]; - + completion(nil); + /* + NSDictionary *dataResult = [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error]; + if (dataResult == nil) { + completion(nil); + } int status = [dataResult[@"status"] intValue]; if (status == 1) { // status = 1 success @@ -124,6 +129,7 @@ static ServerAPI *_server = nil; NSError *registerFaild = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}]; completion(registerFaild); } + */ } else { @@ -150,17 +156,8 @@ static ServerAPI *_server = nil; if (error == nil) { NSDictionary *dataResult = [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error]; - - int status = [dataResult[@"status"] intValue]; - if (status == 1) { // status = 1 success - NSString *image_profile = dataResult[@"result"][@"image_profile"]; - completion(image_profile, nil); - } - else { // status = 0 error - NSString *message = dataResult[@"message"]; - NSError *uploadFaild = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}]; - completion(nil, uploadFaild); - } + NSString *image_profile = [NSString stringWithFormat:@"%@", dataResult[@"message"]]; + completion(image_profile, nil); } else { -- 1.8.5.3