changed Android Document Module Image location to Cache,

changed License
Anyline · Nov 7, 2017 · 3bd24e9 · 3bd24e9
1 parent 2d2d9a5
commit 3bd24e9
Show file tree

Hide file tree

Showing 15 changed files with 2,231 additions and 44 deletions.
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
@@ -225,6 +225,17 @@ Callback -> Stringified JSON
 }
 ```
 More information about the simultaneous barcode scanning [here](https://documentation.anyline.io/toc/modules/overview.html#anyline-modules-simultaneous-barcode-scanning).
+
 ### onError Function
 Callback -> String
 - String errorMessage
+
+## Images
+
+Keep in mind, all the images are saved in the cache directory of the app. For performance reasons, we only provide the 
+path as string, so we don't have to transfer the whole image through the bridge. Please be aware,  that you should not 
+use the images in the cache directory for persistent storage, but store the images in a location of your choice for persistence. 
+
+## License
+
+See LICENSE file.
diff --git a/android/src/main/java/com/anyline/reactnative/DocumentActivity.java b/android/src/main/java/com/anyline/reactnative/DocumentActivity.java
@@ -3,15 +3,11 @@
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.app.ProgressDialog;
-import android.graphics.Bitmap;
 import android.graphics.PointF;
 import android.os.Bundle;
-import android.os.Environment;
 import android.support.v4.content.ContextCompat;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
@@ -20,13 +16,13 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.UUID;
 
 import at.nineyards.anyline.camera.AnylineViewConfig;
 import at.nineyards.anyline.camera.CameraController;
@@ -35,6 +31,7 @@
 import at.nineyards.anyline.modules.document.DocumentResult;
 import at.nineyards.anyline.modules.document.DocumentResultListener;
 import at.nineyards.anyline.modules.document.DocumentScanView;
+import at.nineyards.anyline.util.TempFileUtil;
 
 /**
  * Example activity for the Anyline-Document-Detection-Module
@@ -51,7 +48,7 @@ public class DocumentActivity extends AnylineBaseActivity implements CameraOpenL
     private FrameLayout errorMessageLayout;
     private TextView errorMessage;
     private long lastErrorRecieved = 0;
-    private int compressionRatio = 100;
+    private int quality = 100;
 
     private android.os.Handler handler = new android.os.Handler();
 
@@ -106,7 +103,7 @@ protected void onCreate(Bundle savedInstanceState) {
         //get the destination resolution
         if (jsonObject.has("document")) {
             try {
-                this.compressionRatio = jsonObject.getJSONObject("document").getInt("compressionRatio");
+                this.quality = jsonObject.getJSONObject("document").getInt("quality");
             } catch (JSONException e) {
                 finishWithError(e.getMessage());
                 return;
@@ -166,41 +163,46 @@ public void onResult(DocumentResult documentResult) {
                  * for example
                  *
                  */
-                File outDir = new File(getExternalFilesDir(Environment.DIRECTORY_PICTURES), "ok");
+                File outDir = new File(getCacheDir(), "ok");
                 outDir.mkdir();
                 // change the file ending to png if you want a png
-                File outFile = new File(outDir, "transformed_" + System.currentTimeMillis() + ".jpg");
-                File outFileFull = new File(outDir, "full_" + System.currentTimeMillis() + ".jpg");
+                JSONObject jsonResult = new JSONObject();
                 try {
                     // convert the transformed image into a gray scaled image internally
                     // transformedImage.getGrayCvMat(false);
                     // get the transformed image as bitmap
                     // Bitmap bmp = transformedImage.getBitmap();
                     // save the image with quality 100 (only used for jpeg, ignored for png)
-                    transformedImage.save(outFile, compressionRatio);
-                    fullFrame.save(outFileFull, compressionRatio);
-                    showToast(getString(getResources().getIdentifier("document_image_saved_to", "string", getPackageName())) + " " + outFile.getAbsolutePath());
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
+                    File imageFile = TempFileUtil.createTempFileCheckCache(DocumentActivity.this,
+                            UUID.randomUUID().toString(), ".jpg");
+                    transformedImage.save(imageFile, quality);
+                    showToast(getString(getResources().getIdentifier("document_image_saved_to", "string", getPackageName())) + " " + imageFile.getAbsolutePath());
 
-                // release the images
-                transformedImage.release();
-                fullFrame.release();
+                    jsonResult.put("imagePath", imageFile.getAbsolutePath());
 
 
-                JSONObject jsonResult = new JSONObject();
-                try {
-                    jsonResult.put("imagePath", outFile.getAbsolutePath());
-                    jsonResult.put("fullImagePath", outFileFull.getAbsolutePath());
+                    // Save the Full Frame Image
+                    if (fullFrame != null) {
+                        imageFile = TempFileUtil.createTempFileCheckCache(DocumentActivity.this,
+                                UUID.randomUUID().toString(), ".jpg");
+                        fullFrame.save(imageFile, quality);
+                        jsonResult.put("fullImagePath", imageFile.getAbsolutePath());
+                    }
+                    // Put outline and conficence to result
                     jsonResult.put("outline", jsonForOutline(documentResult.getOutline()));
                     jsonResult.put("confidence", documentResult.getConfidence());
 
-                } catch (Exception jsonException) {
+                } catch (IOException e) {
+                    e.printStackTrace();
+                } catch (JSONException jsonException) {
                     //should not be possible
                     Log.e(TAG, "Error while putting image path to json.", jsonException);
                 }
 
+                // release the images
+                transformedImage.release();
+                fullFrame.release();
+
                 Boolean cancelOnResult = true;
 
                 JSONObject jsonObject;
@@ -251,11 +253,13 @@ public void onPictureProcessingFailure(DocumentScanView.DocumentError documentEr
                 AnylineImage image = documentScanView.getCurrentFullImage();
 
                 if (image != null) {
-                    File outDir = new File(getExternalFilesDir(Environment.DIRECTORY_PICTURES), "error");
+                    File outDir = new File(getCacheDir(), "error");
                     outDir.mkdir();
                     File outFile = new File(outDir, "" + System.currentTimeMillis() + documentError.name() + ".jpg");
                     try {
-                        image.save(outFile, 100);
+                        File imageFile = TempFileUtil.createTempFileCheckCache(DocumentActivity.this,
+                                UUID.randomUUID().toString(), ".jpg");
+                        image.save(imageFile, 100);
                         Log.d(TAG, "error image saved to " + outFile.getAbsolutePath());
                     } catch (IOException e) {
                         e.printStackTrace();

diff --git a/example/Anyline/config/AutoEnergyConfig.js b/example/Anyline/config/AutoEnergyConfig.js
@@ -17,7 +17,7 @@ export default {
   options: {
     "captureResolution": '1080p',
     "cutout": {
-      "style": 'rect',
+      "style": 'CONTOUR_RECT',
       "alignment": 'top',
       "offset": {
         'x': 0,

diff --git a/example/Anyline/config/DocumentConfig.js b/example/Anyline/config/DocumentConfig.js
@@ -52,7 +52,7 @@ export default {
     "blinkAnimationOnResult": true,
     "cancelOnResult": true,
     "document": {
-      "compressionRatio" : 90,
+      "quality" : 90,
     }
   }
 }
diff --git a/example/Anyline/config/EnergyConfig.js b/example/Anyline/config/EnergyConfig.js
@@ -16,7 +16,7 @@ export default {
   'b1NxUUJTL3ZFS3VYUHhhCjNnanZnS285M3lrSjJKQjVBZjZiSkE9PQo=', options: {
     captureResolution: '1080',
     cutout: {
-      style: 'rect',
+      style: 'CONTOUR_RECT',
       alignment: 'top',
       offset: {
         'x': 0,

diff --git a/example/Anyline/ios/Anyline.xcodeproj/project.pbxproj b/example/Anyline/ios/Anyline.xcodeproj/project.pbxproj
@@ -1019,7 +1019,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"$(SRCROOT)/Anyline\"",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1055,7 +1054,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"$(SRCROOT)/Anyline\"",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",

diff --git a/example/Anyline/ios/Anyline/Info.plist b/example/Anyline/ios/Anyline/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.17</string>
+	<string>3.18</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/example/Anyline/src/Overview.js b/example/Anyline/src/Overview.js
@@ -13,22 +13,22 @@ export default function Overview({openAnyline, checkCameraPermissionAndOpen, dis
 
         <Text style={styles.text}>ENERGY</Text>
         <View style={styles.buttons}>
-          <Button style={styles.buttons} title={'  Energy Auto Analog/Digital Meter Scanner'}
+          <Button style={styles.buttons} title={'  Auto Analog/Digital Meter Scanner'}
                   color="#0099FF"
                   disabled={disabled}
                   onPress={() => {
                     platformPermissionCheck('AUTO_ANALOG_DIGITAL_METER')
                   }}/>
         </View>
         <View style={styles.buttons}>
-          <Button style={styles.buttons} title={'  Energy Analog Meter Scanner'} color="#0099FF"
+          <Button style={styles.buttons} title={'  Analog Meter Scanner'} color="#0099FF"
                   disabled={disabled}
                   onPress={() => {
                     platformPermissionCheck('ANALOG_METER')
                   }}/>
         </View>
         <View style={styles.buttons}>
-          <Button style={styles.buttons} title={'  Energy Digital Meter Scanner'} color="#0099FF"
+          <Button style={styles.buttons} title={'  Digital Meter Scanner'} color="#0099FF"
                   disabled={disabled}
                   onPress={() => {
                     platformPermissionCheck('DIGITAL_METER')

diff --git a/ios/AnylineBarcodeScanViewController.m b/ios/AnylineBarcodeScanViewController.m
@@ -53,7 +53,7 @@ - (void)viewDidAppear:(BOOL)animated {
     self.label.hidden = NO;
 
 
-    self.moduleView.videoView.barcodeDelegate = nil;
+    self.moduleView.captureDeviceManager.barcodeDelegate = nil;
 }
 
 #pragma mark - AnylineBarcodeModuleDelegate method

diff --git a/ios/AnylineDocumentScanViewController.h b/ios/AnylineDocumentScanViewController.h
@@ -10,6 +10,6 @@
 
 @interface AnylineDocumentScanViewController : AnylineBaseScanViewController
 
-@property (nonatomic, assign) NSUInteger compressionRate;
+@property (nonatomic, assign) NSUInteger quality;
 
 @end
diff --git a/ios/AnylineDocumentScanViewController.m b/ios/AnylineDocumentScanViewController.m
@@ -62,7 +62,7 @@ - (void)anylineDocumentModuleView:(AnylineDocumentModuleView *)anylineDocumentMo
 
     NSMutableDictionary *dictResult = [NSMutableDictionary dictionaryWithCapacity:4];
 
-    CGFloat dividedCompRate = (CGFloat) self.compressionRate/100;
+    CGFloat dividedCompRate = (CGFloat) self.quality/100;
     NSString *imagePath = [self saveImageToFileSystem:transformedImage compressionQuality:dividedCompRate];
     NSString *fullImagePath = [self saveImageToFileSystem:fullFrame compressionQuality:dividedCompRate];
     NSString *outline = [self stringForOutline:corners];

diff --git a/ios/AnylineEnergyScanViewController.m b/ios/AnylineEnergyScanViewController.m
@@ -29,10 +29,10 @@ - (void)viewDidLoad {
     energyModuleView.currentConfiguration = self.conf;
 
     [energyModuleView setScanMode:self.scanMode error:nil];
-    [energyModuleView.videoView setBarcodeDelegate:self];
+    [energyModuleView.captureDeviceManager setBarcodeDelegate:self];
 
     if (self.nativeBarcodeEnabled) {
-        energyModuleView.videoView.barcodeDelegate = self;
+        energyModuleView.captureDeviceManager.barcodeDelegate = self;
     }
 
     self.moduleView = energyModuleView;
@@ -143,7 +143,7 @@ - (void)anylineEnergyModuleView:(AnylineEnergyModuleView *)anylineEnergyModuleVi
 
 
 #pragma mark - AnylineNativeBarcodeDelegate
-- (void)anylineVideoView:(AnylineVideoView *)videoView
+- (void)anylineVideoView:(AnylineVideoView *)captureDeviceManager
     didFindBarcodeResult:(NSString *)scanResult
                     type:(NSString *)barcodeType  {
 

diff --git a/ios/AnylineSDKPlugin.m b/ios/AnylineSDKPlugin.m
@@ -120,9 +120,9 @@ - (AnylineBaseScanViewController *)ViewControllerFromScanMode:(NSString *)scanMo
             NSDictionary *options = [self.jsonConfigDictionary valueForKey:@"options"];
             if ([options valueForKey:@"document"]) {
                 NSDictionary *docConfig = [options valueForKey:@"document"];
-                docVC.compressionRate = [[docConfig valueForKey:@"compressionRatio"] integerValue];
+                docVC.quality = [[docConfig valueForKey:@"quality"] integerValue];
             } else {
-                docVC.compressionRate = 100;
+                docVC.quality = 100;
             }
             return docVC;
         } else if ([[scanMode uppercaseString] isEqualToString:[@"MRZ" uppercaseString]]) {

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "3.18.0",
   "main": "index.js",
   "description": "A Plugin for connecting Anyline with React-Native",
-  "license": "MIT",
+  "license": "SEE LICENSE IN LICENSE",
   "repository": {
     "type": "git",
     "url": "https://github.com/Anyline/anyline-ocr-react-native-module"