anyline-ocr-react-native-module 35.0.0 → 36.0.0

package/android/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="bin/default"/>
 </classpath>

package/android/build.gradle

@@ -65,7 +65,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'io.anyline:anylinesdk:35.0.0'
+    implementation 'io.anyline:anylinesdk:36.0.0'
     implementation "com.facebook.react:react-native:+"  // from node_modules
     implementation("com.google.android.material:material:1.4.0-rc01")
     implementation 'androidx.multidex:multidex:2.0.1'

package/android/src/main/java/com/anyline/reactnative/Anyline4Activity.java

@@ -36,10 +36,6 @@ import io.anyline.plugin.barcode.BarcodeScanPlugin;
 import io.anyline.plugin.barcode.BarcodeScanResult;
 import io.anyline.plugin.barcode.BarcodeScanViewPlugin;
 import io.anyline.plugin.barcode.PDF417;
-import io.anyline.plugin.id.DrivingLicenseConfig;
-import io.anyline.plugin.id.DrivingLicenseIdentification;
-import io.anyline.plugin.id.GermanIdFrontConfig;
-import io.anyline.plugin.id.GermanIdFrontIdentification;
 import io.anyline.plugin.id.ID;
 import io.anyline.plugin.id.IdScanPlugin;
 import io.anyline.plugin.id.IdScanViewPlugin;
@@ -71,11 +67,12 @@ public class Anyline4Activity extends AnylineBaseActivity {
     private String cropAndTransformError;
     private Boolean isFirstCameraOpen; // only if camera is opened the first time get coordinates of the cutout to avoid flickering when switching between analog and digital
     private RelativeLayout parentLayout;
+    private boolean defaultOrientationApplied;
+    private static final String KEY_DEFAULT_ORIENTATION_APPLIED = "default_orientation_applied";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         isFirstCameraOpen = true;
 
         // init the scan view
@@ -88,6 +85,10 @@ public class Anyline4Activity extends AnylineBaseActivity {
         parentLayout.addView(anylineScanView, layoutParams);
         setContentView(parentLayout, layoutParams);
 
+        if (savedInstanceState != null) {
+            defaultOrientationApplied = savedInstanceState.getBoolean(KEY_DEFAULT_ORIENTATION_APPLIED);
+        }
+
         try {
             // start initialize anyline
             initAnyline();
@@ -98,6 +99,12 @@ public class Anyline4Activity extends AnylineBaseActivity {
         setDebugListener();
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(KEY_DEFAULT_ORIENTATION_APPLIED, defaultOrientationApplied);
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -173,6 +180,8 @@ public class Anyline4Activity extends AnylineBaseActivity {
                 addRotateButtonToView(rotateButtonConfig);
             }
 
+            setDefaultOrientation(json);
+
             if (scanViewPlugin != null) {
                 //set nativeBarcodeMode
                 AnylinePluginHelper.setNativeBarcodeMode(json, anylineScanView);
@@ -212,27 +221,6 @@ public class Anyline4Activity extends AnylineBaseActivity {
                                         jsonIdResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, subResult,
                                                 jsonIdResult);
 
-                                        jsonResult.put(subResult.getPluginId(), jsonIdResult);
-                                    } catch (JSONException e) {
-                                        e.printStackTrace();
-                                    }
-                                } else if (subResult.getResult() instanceof DrivingLicenseIdentification) {
-                                    JSONObject jsonIdResult = ((DrivingLicenseIdentification) subResult.getResult())
-                                            .toJSONObject();
-                                    try {
-                                        jsonIdResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, subResult,
-                                                jsonIdResult);
-
-                                        jsonResult.put(subResult.getPluginId(), jsonIdResult);
-                                    } catch (JSONException e) {
-                                        e.printStackTrace();
-                                    }
-                                } else if (subResult.getResult() instanceof GermanIdFrontIdentification) {
-                                    JSONObject jsonIdResult = ((GermanIdFrontIdentification) subResult.getResult()).toJSONObject();
-                                    try {
-                                        jsonIdResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, subResult,
-                                                jsonIdResult);
-
                                         jsonResult.put(subResult.getPluginId(), jsonIdResult);
                                     } catch (JSONException e) {
                                         e.printStackTrace();
@@ -330,41 +318,6 @@ public class Anyline4Activity extends AnylineBaseActivity {
                             }
 
                         });
-                    } else if (((IdScanPlugin) ((IdScanViewPlugin) scanViewPlugin).getScanPlugin()).getIdConfig() instanceof DrivingLicenseConfig) {
-                        scanViewPlugin.addScanResultListener(new ScanResultListener<ScanResult<ID>>() {
-                            @Override
-                            public void onResult(ScanResult<ID> idScanResult) {
-                                JSONObject jsonResult = ((DrivingLicenseIdentification) idScanResult.getResult()).toJSONObject();
-
-                                try {
-                                    jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, idScanResult,
-                                            jsonResult);
-                                } catch (Exception e) {
-                                    Log.e(TAG, "Exception is: ", e);
-
-                                }
-
-                                setResult(scanViewPlugin, jsonResult);
-
-                            }
-
-                        });
-                    } else if (((IdScanPlugin) ((IdScanViewPlugin) scanViewPlugin).getScanPlugin()).getIdConfig() instanceof GermanIdFrontConfig) {
-                        scanViewPlugin.addScanResultListener(new ScanResultListener<ScanResult<ID>>() {
-                            @Override
-                            public void onResult(ScanResult<ID> idScanResult) {
-                                JSONObject jsonResult = ((GermanIdFrontIdentification) idScanResult.getResult()).toJSONObject();
-
-                                try {
-                                    jsonResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, idScanResult,
-                                            jsonResult);
-                                } catch (Exception e) {
-                                    Log.e(TAG, "Exception is: ", e);
-
-                                }
-                                setResult(scanViewPlugin, jsonResult);
-                            }
-                        });
                     } else if (((IdScanPlugin) ((IdScanViewPlugin) scanViewPlugin).getScanPlugin()).getIdConfig() instanceof UniversalIdConfig) {
                         scanViewPlugin.addScanResultListener(new ScanResultListener<ScanResult<ID>>() {
                             @Override
@@ -428,7 +381,7 @@ public class Anyline4Activity extends AnylineBaseActivity {
 
                                         PDF417 pdf417 = barcodeList.get(i).getParsedPDF417();
 
-                                        if(pdf417 != null) {
+                                        if (pdf417 != null) {
                                             barcode.put("parsedPDF417", pdf417.toJSONObject());
                                         }
                                         barcodeArray.put(barcode);
@@ -487,7 +440,17 @@ public class Anyline4Activity extends AnylineBaseActivity {
                     getString(getResources().getIdentifier("error_invalid_json_data", "string", getPackageName()))
                             + "\n" + e.getLocalizedMessage());
         }
+    }
+
+    private void setDefaultOrientation(JSONObject jsonObject) {
+        if (defaultOrientationApplied) return;
 
+        if (jsonObject.has("defaultOrientation")
+                && jsonObject.optString("defaultOrientation").equals("landscape")
+                && getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        }
+        defaultOrientationApplied = true;
     }
 
     private boolean shouldEnablePDF417(JSONObject jsonObject) {

package/ios/ALPluginHelper.m

@@ -423,46 +423,6 @@
         [dictResult setValue:[ALPluginHelper stringForDate:[scanResult.result dayOfBirthDateObject]] forKey:@"dateOfBirthObject"];
         [dictResult setValue:[ALPluginHelper stringForDate:[scanResult.result dateOfExpiryObject]] forKey:@"dateOfExpiryObject"];
         [dictResult setValue:confidences forKey:@"fieldConfidences"];
-    } else if ([scanResult.result isKindOfClass:[ALDrivingLicenseIdentification class]]) {
-        NSMutableArray<NSString *> *keys=[@[
-                                            @"surname",
-                                            @"givenNames",
-                                            @"dateOfBirth",
-                                            @"placeOfBirth",
-                                            @"dateOfIssue",
-                                            @"dateOfExpiry",
-                                            @"authority",
-                                            @"documentNumber",
-                                            @"categories",
-                                            @"drivingLicenseString"
-                                            ] mutableCopy];
-        dictResult = [[scanResult.result dictionaryWithValuesForKeys:keys] mutableCopy];
-        //we have field confidences for everything but drivingLicenseString
-        [keys removeObject:@"drivingLicenseString"];
-        [dictResult setValue:[[scanResult.result fieldConfidences] dictionaryWithValuesForKeys:keys] forKey:@"fieldConfidences"];
-        [dictResult setValue:[ALPluginHelper stringForDate:[scanResult.result dateOfBirthObject]] forKey:@"dateOfBirthObject"];
-        [dictResult setValue:[ALPluginHelper stringForDate:[scanResult.result dateOfIssueObject]] forKey:@"dateOfIssueObject"];
-        [dictResult setValue:[ALPluginHelper stringForDate:[scanResult.result dateOfExpiryObject]] forKey:@"dateOfExpiryObject"];
-        
-    } else if ([scanResult.result isKindOfClass:[ALGermanIDFrontIdentification class]]) {
-        ALGermanIDFrontIdentification *germanIDFrontIdentification = (ALGermanIDFrontIdentification *)scanResult.result;
-        NSMutableArray<NSString *> *keys=[@[
-                                            @"surname",
-                                            @"givenNames",
-                                            @"dateOfBirth",
-                                            @"nationality",
-                                            @"placeOfBirth",
-                                            @"dateOfExpiry",
-                                            @"documentNumber",
-                                            @"cardAccessNumber",
-                                            @"germanIdFrontString"
-                                            ] mutableCopy];
-        dictResult = [[germanIDFrontIdentification dictionaryWithValuesForKeys:keys] mutableCopy];
-        //we have field confidences for everything but germanIdFrontString
-        [keys removeObject:@"germanIdFrontString"];
-        [dictResult setValue:[[scanResult.result fieldConfidences] dictionaryWithValuesForKeys:keys] forKey:@"fieldConfidences"];
-        [dictResult setValue:[ALPluginHelper stringForDate:[scanResult.result dateOfBirthObject]] forKey:@"dateOfBirthObject"];
-        [dictResult setValue:[ALPluginHelper stringForDate:[scanResult.result dateOfExpiryObject]] forKey:@"dateOfExpiryObject"];
     }
     
     [dictResult setValue:imagePath forKey:@"imagePath"];
@@ -597,6 +557,7 @@
     //Create the result Object
     NSMutableDictionary *dictResult = [NSMutableDictionary dictionaryWithCapacity:5];
     [dictResult setValue:scanResult.country forKey:@"country"];
+    [dictResult setValue:scanResult.area forKey:@"area"];
     [dictResult setValue:scanResult.result forKey:@"licensePlate"];
     [dictResult setValue:[ALPluginHelper stringForOutline:outline] forKey:@"outline"];
     [dictResult setValue:@(scanResult.confidence) forKey:@"confidence"];

package/ios/AnylineReact.podspec

@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/Anyline/anyline-ocr-react-native-module.git", :tag => "#{s.version}" }
 
   s.source_files  = "*.{h,m}"
-  s.dependency "Anyline", "~> 35"
+  s.dependency "Anyline", "~> 36"
   s.dependency "React"
 end

package/ios/AnylineSDKPlugin.m

@@ -235,7 +235,7 @@ RCT_EXPORT_METHOD(getSDKVersion:(RCTPromiseResolveBlock)resolve rejecter:(RCTPro
 
 - (BOOL)scanModeIndex:(NSString *)scanMode{
 
-    NSArray *possibleScanModes = @[@"DOCUMENT", @"MRZ", @"BARCODE", @"LICENSE_PLATE", @"ANYLINE_OCR", @"ANALOG_METER", @"DIGITAL_METER", @"AUTO_ANALOG_DIGITAL_METER",
+    NSArray *possibleScanModes = @[@"DOCUMENT", @"MRZ", @"BARCODE", @"LICENSE_PLATE", @"LICENSE_PLATE_US", @"ANYLINE_OCR", @"ANALOG_METER", @"DIGITAL_METER", @"AUTO_ANALOG_DIGITAL_METER",
                                    @"DIAL_METER", @"SERIAL_NUMBER", @"HEAT_METER_4", @"HEAT_METER_5", @"HEAT_METER_6", @"DOT_MATRIX_METER"];
 
     return [possibleScanModes containsObject: [scanMode uppercaseString]];

package/package.json

@@ -1,6 +1,6 @@
 {
-  "_from": "anyline-ocr-react-native-module@^35.0.0",
-  "_id": "anyline-ocr-react-native-module@35.0.0",
+  "_from": "anyline-ocr-react-native-module@^36.0.0",
+  "_id": "anyline-ocr-react-native-module@36.0.0",
   "_inBundle": false,
   "_integrity": "sha512-BGi9zNkSsoxXywDBIqzgBRvKUBniQOJHDKBrozZubKthZNRBAj8Ry5tW0Me0yLXt/fauME//hbC0wsenfPJZqw==",
   "_location": "/anyline-ocr-react-native-module",
@@ -8,19 +8,19 @@
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "anyline-ocr-react-native-module@^35.0.0",
+    "raw": "anyline-ocr-react-native-module@^36.0.0",
     "name": "anyline-ocr-react-native-module",
     "escapedName": "anyline-ocr-react-native-module",
-    "rawSpec": "^35.0.0",
+    "rawSpec": "^36.0.0",
     "saveSpec": null,
-    "fetchSpec": "^35.0.0"
+    "fetchSpec": "^36.0.0"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-35.0.0.tgz",
+  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-36.0.0.tgz",
   "_shasum": "bacbcd260cc662244f59393ed81a6edba009b52c",
-  "_spec": "anyline-ocr-react-native-module@^35.0.0",
+  "_spec": "anyline-ocr-react-native-module@^36.0.0",
   "_where": "/Users/amiransari/Projects/anyline-ocr-react-native-module1/example/RNExampleApp",
   "bugs": {
     "url": "https://github.com/Anyline/anyline-ocr-react-native-module/issues"
@@ -47,5 +47,5 @@
     "type": "git",
     "url": "git+https://github.com/Anyline/anyline-ocr-react-native-module.git"
   },
-  "version": "35.0.0"
+  "version": "36.0.0"
 }