cordova-plugin-mserviceinterface-2.0 1.0.48 → 1.0.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "This plugin establishes the connection to the native interface and performs the requested task.",
   "main": "index.js",
   "scripts": {

package/plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-plugin-mserviceinterface-2.0"
-    version="1.0.48">
+    version="1.0.49">
     <name>mserviceinterface-2.0</name>
     <description>This plugin establishes the connection to the native interface and performs the requested task.</description>
     <author>selfservit@gmail.com</author>

package/src/ios/mInterface.h

@@ -36,6 +36,8 @@
     NSString *clientUrl;
     NSString *deviceID;
     NSString *appInfoCaller;
+    NSString *imageAttachmentInd;
+    NSString *imageDestinationPath;
 @protected BOOL _isLocked;
     UIInterfaceOrientation _lastOrientation;
 }

package/src/ios/mInterface.m

@@ -1437,6 +1437,9 @@
 }
 
 - (void)CaptureImageFromCamera:(CDVInvokedUrlCommand*)command {
+    NSMutableDictionary *inputObject = [[command arguments] objectAtIndex:0];
+    imageAttachmentInd = inputObject[@"attachmentInd"];
+    imageDestinationPath = inputObject[@"destinationPath"];
     cameraOpen= [[UIImagePickerController alloc] init];
     if(![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]){
         return;
@@ -1455,6 +1458,9 @@
 }
 
 - (void)PickImageFromGallery:(CDVInvokedUrlCommand*)command {
+    NSMutableDictionary *inputObject = [[command arguments] objectAtIndex:0];
+    imageAttachmentInd = inputObject[@"attachmentInd"];
+    imageDestinationPath = inputObject[@"destinationPath"];
     imagePicker= [[UIImagePickerController alloc] init];
     /*if(![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]){
         return;
@@ -1991,7 +1997,7 @@
             }
             NSDate *now = [NSDate date];
             NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-            dateFormatter.dateFormat = @"yyyyMMdd_HHmm-ss";
+            dateFormatter.dateFormat = @"yyyyMMddHHmmss";
             [dateFormatter setTimeZone:[NSTimeZone systemTimeZone]];
             NSString *gmtTime = [dateFormatter stringFromDate:now];
             NSString *destination = [NSString stringWithFormat:@"%@/%@.jpg", dest, gmtTime];
@@ -2014,26 +2020,113 @@
         NSLog(@"refURL : %@", refURL);
         ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
         [assetslibrary assetForURL:refURL resultBlock:resultblock failureBlock:nil];
-    } else if ([picker isEqual: cameraOpen] || [picker isEqual:imagePicker]) {
-        //if(UI_USER_INTERFACE_IDIOM()==UIUserInterfaceIdiomPhone) {
+    } else if ([picker isEqual: cameraOpen]) {
+        if ([imageAttachmentInd isEqualToString:@"true"]) {
+            //if(UI_USER_INTERFACE_IDIOM()==UIUserInterfaceIdiomPhone) {
+                [picker dismissViewControllerAnimated:YES completion:nil];
+           // } else {
+           //     [popover dismissPopoverAnimated:YES];
+           // }
+            UIImageView *ivPickedImage = [[UIImageView alloc] init];
+            ivPickedImage.image = [info objectForKey:UIImagePickerControllerOriginalImage];
+            NSURL *refURL = (NSURL *)[info valueForKey:UIImagePickerControllerReferenceURL];
+            // define the block to call when we get the asset based on the url (below)
+            ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *imageAsset) {
+                UIImage *image = ivPickedImage.image;
+                NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+                NSString *directory = [paths objectAtIndex:0];
+                NSString* appRootPath = [directory stringByAppendingPathComponent:[self GetAppName]];
+                NSString *imagesFolderPath = [appRootPath stringByAppendingPathComponent:imageDestinationPath];
+                if (![[NSFileManager defaultManager] fileExistsAtPath:imagesFolderPath]){
+                    [[NSFileManager defaultManager] createDirectoryAtPath:imagesFolderPath withIntermediateDirectories:YES attributes:nil error:nil];
+                }
+                NSDateFormatter *dateFormatter = [self getCurrentDateTime];
+                [dateFormatter setDateFormat:@"yyyyMMddHHmmss"];
+                NSString *fileName = [NSString stringWithFormat:@"%@.png", [dateFormatter stringFromDate:[NSDate date]]];
+                NSString* imageSavedPath = [imagesFolderPath stringByAppendingPathComponent:fileName];
+                NSData* imageData = UIImageJPEGRepresentation(image, 0.3);
+                [imageData writeToFile:imageSavedPath atomically:YES];
+                long imgSize = imageData.length;
+                NSString *strImageSize = [NSString stringWithFormat:@"%ld", imgSize];
+                NSString *extension = [[NSString stringWithFormat:@".%@",[imageSavedPath pathExtension]] lowercaseString];
+                NSMutableDictionary * dict = [[NSMutableDictionary alloc] init];
+                [dict setValue:[imageSavedPath stringByDeletingLastPathComponent] forKey:@"filePath"];
+                [dict setValue:[imageSavedPath lastPathComponent] forKey:@"fileName"];
+                [dict setValue:strImageSize forKey:@"fileSize"];
+                [dict setValue:extension forKey:@"fileExtension"];
+                CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dict];
+                [self.commandDelegate sendPluginResult:result callbackId:self.callbackIdForImagePicker];
+            };
+            ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
+            [assetslibrary assetForURL:refURL resultBlock:resultblock failureBlock:nil];
+        } else {
             [picker dismissViewControllerAnimated:YES completion:nil];
-        // } else {
-         //   [popover dismissPopoverAnimated:YES];
-       // }
-        UIImageView *ivPickedImage = [[UIImageView alloc] init];
-        ivPickedImage.image = [info objectForKey:UIImagePickerControllerOriginalImage];
-        UIImage *finalImage = [self imageWithImage:ivPickedImage.image scaledToWidth:824.00];
-        NSURL *refURL = (NSURL *)[info valueForKey:UIImagePickerControllerReferenceURL];
-        // define the block to call when we get the asset based on the url (below)
-        ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *imageAsset)
-        {
-            NSData *imageData = UIImageJPEGRepresentation(finalImage, 0.1);
-            NSString * base64String = [imageData base64EncodedStringWithOptions:0];
-            CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:base64String];
-            [self.commandDelegate sendPluginResult:result callbackId:self.callbackIdForImagePicker];
-        };
-        ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
-        [assetslibrary assetForURL:refURL resultBlock:resultblock failureBlock:nil];
+            UIImageView *ivPickedImage = [[UIImageView alloc] init];
+            ivPickedImage.image = [info objectForKey:UIImagePickerControllerOriginalImage];
+            UIImage *finalImage = [self imageWithImage:ivPickedImage.image scaledToWidth:824.00];
+            NSURL *refURL = (NSURL *)[info valueForKey:UIImagePickerControllerReferenceURL];
+            ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *imageAsset)
+            {
+                NSData *imageData = UIImageJPEGRepresentation(finalImage, 0.1);
+                NSString * base64String = [imageData base64EncodedStringWithOptions:0];
+                CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:base64String];
+                [self.commandDelegate sendPluginResult:result callbackId:self.callbackIdForImagePicker];
+            };
+            ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
+            [assetslibrary assetForURL:refURL resultBlock:resultblock failureBlock:nil];
+        }
+    } else if ([picker isEqual:imagePicker]) {
+        if ([imageAttachmentInd isEqualToString:@"true"]) {
+            UIImageView *ivPickedImage = [[UIImageView alloc] init];
+            ivPickedImage.image = [info objectForKey:UIImagePickerControllerOriginalImage];
+            NSURL *refURL = (NSURL *)[info valueForKey:UIImagePickerControllerReferenceURL];
+            // define the block to call when we get the asset based on the url (below)
+            ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *imageAsset) {
+                UIImage *image = ivPickedImage.image;
+                NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+                NSString *directory = [paths objectAtIndex:0];
+                NSString* appRootPath = [directory stringByAppendingPathComponent:[self GetAppName]];
+                NSString *imagesFolderPath = [appRootPath stringByAppendingPathComponent:imageDestinationPath];
+                if (![[NSFileManager defaultManager] fileExistsAtPath:imagesFolderPath]){
+                    [[NSFileManager defaultManager] createDirectoryAtPath:imagesFolderPath withIntermediateDirectories:YES attributes:nil error:nil];
+                }
+                NSDateFormatter *dateFormatter = [self getCurrentDateTime];
+                [dateFormatter setDateFormat:@"yyyyMMddHHmmss"];
+                NSString *fileName = [NSString stringWithFormat:@"%@.png", [dateFormatter stringFromDate:[NSDate date]]];
+                NSString* imageSavedPath = [imagesFolderPath stringByAppendingPathComponent:fileName];
+                NSData* imageData = UIImageJPEGRepresentation(image, 0.3);
+                [imageData writeToFile:imageSavedPath atomically:YES];
+                long imgSize = imageData.length;
+                NSString *strImageSize = [NSString stringWithFormat:@"%ld", imgSize];
+                NSString *extension = [[NSString stringWithFormat:@".%@",[imageSavedPath pathExtension]] lowercaseString];
+                NSMutableDictionary * dict = [[NSMutableDictionary alloc] init];
+                [dict setValue:[imageSavedPath stringByDeletingLastPathComponent] forKey:@"filePath"];
+                [dict setValue:[imageSavedPath lastPathComponent] forKey:@"fileName"];
+                [dict setValue:strImageSize forKey:@"fileSize"];
+                [dict setValue:extension forKey:@"fileExtension"];
+                CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dict];
+                [self.commandDelegate sendPluginResult:result callbackId:self.callbackIdForImagePicker];
+             };
+             // get the asset library and fetch the asset based on the ref url (pass in block above)
+             NSLog(@"refURL : %@", refURL);
+             ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
+             [assetslibrary assetForURL:refURL resultBlock:resultblock failureBlock:nil];
+        } else {
+            [picker dismissViewControllerAnimated:YES completion:nil];
+            UIImageView *ivPickedImage = [[UIImageView alloc] init];
+            ivPickedImage.image = [info objectForKey:UIImagePickerControllerOriginalImage];
+            UIImage *finalImage = [self imageWithImage:ivPickedImage.image scaledToWidth:824.00];
+            NSURL *refURL = (NSURL *)[info valueForKey:UIImagePickerControllerReferenceURL];
+            ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *imageAsset)
+            {
+                NSData *imageData = UIImageJPEGRepresentation(finalImage, 0.1);
+                NSString * base64String = [imageData base64EncodedStringWithOptions:0];
+                CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:base64String];
+                [self.commandDelegate sendPluginResult:result callbackId:self.callbackIdForImagePicker];
+            };
+            ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
+            [assetslibrary assetForURL:refURL resultBlock:resultblock failureBlock:nil];
+        }
     } else if ([picker isEqual:liveCamera]) {
         //if(UI_USER_INTERFACE_IDIOM()==UIUserInterfaceIdiomPhone) {
             [picker dismissViewControllerAnimated:YES completion:nil];