anyline-ocr-react-native-module 54.5.1 → 54.6.0

package/android/build.gradle

@@ -61,7 +61,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'io.anyline:anylinesdk:54.5.1'
+    implementation 'io.anyline:anylinesdk:54.6.0'
     implementation "com.facebook.react:react-native:+"
     implementation("com.google.android.material:material:1.9.0")
     implementation 'androidx.multidex:multidex:2.0.1'

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

@@ -34,6 +34,7 @@ import java.util.TimerTask;
 import io.anyline.plugin.config.ScanViewInitializationParameters;
 import io.anyline2.ScanResult;
 import io.anyline2.view.ScanView;
+import io.anyline2.view.ScanViewLoadResult;
 import io.anyline2.viewplugin.ScanViewPlugin;
 import io.anyline2.viewplugin.ViewPluginBase;
 
@@ -87,63 +88,68 @@ public class ScanActivity extends AppCompatActivity {
         orientation = this.getResources().getConfiguration().orientation;
 
         scanView = binding.scanView;
+        scanView.setOnScanViewLoaded(scanViewLoadResult -> {
+            if (scanViewLoadResult instanceof ScanViewLoadResult.Succeeded) {
+                if (getIntent().hasExtra(EXTRA_CONFIG_JSON)) {
+                    try {
+                        JSONObject configJSON = new JSONObject(getIntent().getStringExtra(EXTRA_CONFIG_JSON));
+
+                        applyDefaultOrientation(configJSON);
+                        setupChangeOrientationButton(configJSON);
+                        setupCustomUIFeedback(configJSON);
+
+                        String initializationParametersString = getIntent().getStringExtra(EXTRA_SCANVIEW_INITIALIZATION_PARAMETERS);
+                        if (initializationParametersString != null) {
+                            ScanViewInitializationParameters scanViewInitializationParameters =
+                                    getScanViewInitializationParametersFromJsonObject(
+                                            this,
+                                            new JSONObject(initializationParametersString));
+                            scanView.init(configJSON, scanViewInitializationParameters);
+                        } else {
+                            scanView.init(configJSON);
+                        }
+                        scanView.start();
+
+                        ViewPluginBase viewPluginBase = scanView.getScanViewPlugin();
+
+                        observeUIFeedbackEvents(viewPluginBase);
+
+                        viewPluginBase.resultReceived = scanResult -> {
+                            setResult(AnylineSDKPlugin.RESULT_OK);
+                            JSONObject resultObject = getResultWithImagePath(scanResult);
+                            ResultReporter.onResult(resultObject.toString(), true);
+                            finish();
+                        };
+
+                        viewPluginBase.resultsReceived = scanResults -> {
+                            JSONArray resultJSONArray = new JSONArray();
+
+                            for (ScanResult scanResult : scanResults) {
+                                JSONObject resultObject = getResultWithImagePath(scanResult);
+                                resultJSONArray.put(resultObject);
+                            }
+                            setResult(AnylineSDKPlugin.RESULT_OK);
+                            ResultReporter.onResult(resultJSONArray.toString(), true);
+                            finish();
+                        };
+                    } catch (JSONException e) {
+                        finishWithError("Error parsing view config: " + e.getMessage());
+                    } catch (Exception e) {
+                        finishWithError(getString(getResources().getIdentifier("error_invalid_json_data", "string", getPackageName()))
+                                + "\n" + e.getLocalizedMessage());
+                    }
+                } else {
+                    finishWithError("View config not found");
+                }
+            } else {
+                ScanViewLoadResult.Failed scanViewLoadFailed = (ScanViewLoadResult.Failed) scanViewLoadResult;
+                finishWithError(scanViewLoadFailed.getErrorMessage());
+            }
+        });
 
         if (savedInstanceState != null) {
             defaultOrientationApplied = savedInstanceState.getBoolean(KEY_DEFAULT_ORIENTATION_APPLIED);
         }
-
-        if (getIntent().hasExtra(EXTRA_CONFIG_JSON)) {
-            // TODO check for throws clauses
-            try {
-                JSONObject configJSON = new JSONObject(getIntent().getStringExtra(EXTRA_CONFIG_JSON));
-
-                applyDefaultOrientation(configJSON);
-                setupChangeOrientationButton(configJSON);
-                setupCustomUIFeedback(configJSON);
-
-                String initializationParametersString = getIntent().getStringExtra(EXTRA_SCANVIEW_INITIALIZATION_PARAMETERS);
-                if (initializationParametersString != null) {
-                    ScanViewInitializationParameters scanViewInitializationParameters =
-                            getScanViewInitializationParametersFromJsonObject(
-                                    this,
-                                    new JSONObject(initializationParametersString));
-                    scanView.init(configJSON, scanViewInitializationParameters);
-                }
-                else {
-                    scanView.init(configJSON);
-                }
-
-                ViewPluginBase viewPluginBase = scanView.getScanViewPlugin();
-
-                observeUIFeedbackEvents(viewPluginBase);
-
-                viewPluginBase.resultReceived = scanResult -> {
-                    setResult(AnylineSDKPlugin.RESULT_OK);
-                    JSONObject resultObject = getResultWithImagePath(scanResult);
-                    ResultReporter.onResult(resultObject.toString(), true);
-                    finish();
-                };
-
-                viewPluginBase.resultsReceived = scanResults -> {
-                    JSONArray resultJSONArray = new JSONArray();
-
-                    for (ScanResult scanResult : scanResults) {
-                        JSONObject resultObject = getResultWithImagePath(scanResult);
-                        resultJSONArray.put(resultObject);
-                    }
-                    setResult(AnylineSDKPlugin.RESULT_OK);
-                    ResultReporter.onResult(resultJSONArray.toString(), true);
-                    finish();
-                };
-            } catch (JSONException e) {
-                finishWithError("Error parsing view config: " + e.getMessage());
-            } catch (Exception e) {
-                finishWithError(getString(getResources().getIdentifier("error_invalid_json_data", "string", getPackageName()))
-                        + "\n" + e.getLocalizedMessage());
-            }
-        } else {
-            finishWithError("View config not found");
-        }
     }
 
     private void applyDefaultOrientation(JSONObject configJSON) {
@@ -408,7 +414,6 @@ public class ScanActivity extends AppCompatActivity {
     protected void onPause() {
         if (scanView.isInitialized()) {
             scanView.stop();
-            scanView.getCameraView().releaseCameraInBackground();
         }
         super.onPause();
     }

package/ios/ALJsonUIConfiguration.m

@@ -1,4 +1,4 @@
-#import "ALJSONUIConfiguration.h"
+#import "ALJsonUIConfiguration.h"
 #import <Anyline/Anyline.h>
 
 NSString * const DONE_BUTTON = @"doneButtonConfig";

package/ios/ALPluginHelper.h

@@ -1,4 +1,4 @@
-#import "ALJSONUIConfiguration.h"
+#import "ALJsonUIConfiguration.h"
 #import "ALRoundedView.h"
 
 NS_ASSUME_NONNULL_BEGIN

package/ios/AnylineReact.podspec

@@ -18,7 +18,7 @@ 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", "54.5.0"
+  s.dependency "Anyline", "54.6.0"
   s.dependency "React"
 
 end

package/package.json

@@ -1,6 +1,6 @@
 {
-  "_from": "anyline-ocr-react-native-module@^54.5.1",
-  "_id": "anyline-ocr-react-native-module@^54.5.1",
+  "_from": "anyline-ocr-react-native-module@^54.6.0",
+  "_id": "anyline-ocr-react-native-module@^54.6.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@^54.5.1",
+    "raw": "anyline-ocr-react-native-module@^54.6.0",
     "name": "anyline-ocr-react-native-module",
     "escapedName": "anyline-ocr-react-native-module",
-    "rawSpec": "^54.5.1",
+    "rawSpec": "^54.6.0",
     "saveSpec": null,
-    "fetchSpec": "^54.5.1"
+    "fetchSpec": "^54.6.0"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-54.5.1.tgz",
+  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-54.6.0.tgz",
   "_shasum": "bacbcd260cc662244f59393ed81a6edba009b52c",
-  "_spec": "anyline-ocr-react-native-module@^54.5.1",
+  "_spec": "anyline-ocr-react-native-module@^54.6.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": "54.5.1"
+  "version": "54.6.0"
 }