github/cordova-imagePicker
4
0
Fork 0
mirror of https://gitee.com/shuto/cordova-imagePicker.git synced 2026-04-16 00:02:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated to take correct parameters, allow for 0 in width/height to size to a specific dimension, and updated controller/delegate to work correctly with updated ELCPicker

Browse Source
This commit is contained in:
CSullivan102
2014-01-10 19:33:44 -05:00
parent 99c5688e9d
commit a30d6ea81f
5 changed files with 92 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ios/ELCImagePicker/ELCAlbumPickerController.h
View File

@@ -14,8 +14,8 @@
@property (nonatomic, weak) id<ELCAssetSelectionDelegate> parent;
@property (nonatomic, strong) NSMutableArray *assetGroups;
@property (nonatomic, weak) BOOL singleSelection;
@property (nonatomic, weak) BOOL immediateReturn;
@property (nonatomic, assign) BOOL singleSelection;
@property (nonatomic, assign) BOOL immediateReturn;
// optional, can be used to filter the assets displayed
@property (nonatomic, weak) id<ELCAssetPickerFilterDelegate> assetPickerFilterDelegate;

8
src/ios/SOSPicker.h
View File

@@ -10,13 +10,15 @@
#import "ELCAlbumPickerController.h"
#import "ELCImagePickerController.h"
@interface SOSPicker : CDVPlugin
@interface SOSPicker : CDVPlugin <ELCImagePickerControllerDelegate, UINavigationControllerDelegate, UIScrollViewDelegate>
@property (copy) NSString* callbackId;
- (void) getPictures:(CDVInvokedUrlCommand *)command;
- (void) elcImagePickerController:(ELCImagePickerController *)picker didFinishPickingMediaWithInfo:(NSArray *)info;
- (void) elcImagePickerControllerDidCancel:(ELCImagePickerController *)picker;
- (UIImage*)imageByScalingNotCroppingForSize:(UIImage*)anImage toSize:(CGSize)frameSize;
@property (nonatomic, assign) NSInteger width;
@property (nonatomic, assign) NSInteger height;
@property (nonatomic, assign) NSInteger quality;
@end

38
src/ios/SOSPicker.m
View File

@@ -19,12 +19,18 @@
@synthesize callbackId;
- (void) getPictures:(CDVInvokedUrlCommand *)command {
NSString* maxPhotos = [command.arguments objectAtIndex:0];
NSDictionary *options = [command.arguments objectAtIndex: 0];
bool returnsOriginalImage = [[options objectForKey:@"returnsOriginalImage"] boolValue];
NSInteger maximumImagesCount = [[options objectForKey:@"maximumImagesCount"] integerValue];
self.width = [[options objectForKey:@"width"] integerValue];
self.height = [[options objectForKey:@"height"] integerValue];
self.quality = [[options objectForKey:@"quality"] integerValue];
// Create the an album controller and image picker
ELCAlbumPickerController *albumController = [[ELCAlbumPickerController alloc] init];
int max = [maxPhotos intValue];
if (max == 1) {
if (maximumImagesCount == 1) {
albumController.immediateReturn = true;
albumController.singleSelection = true;
} else {
@@ -33,10 +39,11 @@
}
ELCImagePickerController *imagePicker = [[ELCImagePickerController alloc] initWithRootViewController:albumController];
imagePicker.maximumImagesCount = max;
[albumController setParent:imagePicker];
[imagePicker setDelegate:self];
imagePicker.maximumImagesCount = maximumImagesCount;
imagePicker.returnsOriginalImage = returnsOriginalImage;
imagePicker.imagePickerDelegate = self;
albumController.parent = imagePicker;
self.callbackId = command.callbackId;
// Present modally
[self.viewController presentViewController:imagePicker
@@ -54,11 +61,10 @@
UIImage* image = nil;
image = [dict objectForKey:UIImagePickerControllerOriginalImage];
//Hard code this for now...
CGSize targetSize = CGSizeMake(750,960);
CGSize targetSize = CGSizeMake(self.width, self.height);
UIImage* scaledImage = nil;
scaledImage = [self imageByScalingNotCroppingForSize:image toSize:targetSize];
NSData* data = UIImageJPEGRepresentation(scaledImage, 50/100.0f);
NSData* data = UIImageJPEGRepresentation(scaledImage, self.quality/100.0f);
NSString* docsPath = [NSTemporaryDirectory()stringByStandardizingPath];
NSError* err = nil;
@@ -72,12 +78,16 @@
if (![data writeToFile:filePath options:NSAtomicWrite error:&err]) {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_IO_EXCEPTION messageAsString:[err localizedDescription]];
break;
} else {
[resultStrings addObject:[[NSURL fileURLWithPath:filePath] absoluteString]];
}
}
if (nil == result) {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:resultStrings];
}
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:resultStrings];
[self.viewController dismissViewControllerAnimated:YES completion:nil];
[self.commandDelegate sendPluginResult:result callbackId:self.callbackId];
}
@@ -106,7 +116,11 @@
CGFloat heightFactor = targetHeight / height;
// opposite comparison to imageByScalingAndCroppingForSize in order to contain the image within the given bounds
if (widthFactor > heightFactor) {
if (widthFactor == 0.0) {
scaleFactor = heightFactor;
} else if (heightFactor == 0.0) {
scaleFactor = widthFactor;
} else if (widthFactor > heightFactor) {
scaleFactor = heightFactor; // scale to fit height
} else {
scaleFactor = widthFactor; // scale to fit width