From eb6debf8395edd3c027385f5cf2be328942fafa4 Mon Sep 17 00:00:00 2001 From: Bernd Kampl <97178352+berndkamplanyline@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:09:17 +0100 Subject: [PATCH] Release 54.2.2 (#184) --- example/RNExampleApp/android/app/build.gradle | 2 +- example/RNExampleApp/package.json | 2 +- .../anyline/reactnative/AnylineSDKPlugin.java | 38 +++++++++++++++++++ plugin/package.json | 16 ++++---- 4 files changed, 48 insertions(+), 10 deletions(-) diff --git a/example/RNExampleApp/android/app/build.gradle b/example/RNExampleApp/android/app/build.gradle index ce498ef..87bd911 100644 --- a/example/RNExampleApp/android/app/build.gradle +++ b/example/RNExampleApp/android/app/build.gradle @@ -87,7 +87,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 5 - versionName "54.2.1" + versionName "54.2.2" multiDexEnabled true buildConfigField("boolean", "REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS", (findProperty("reactNative.unstable_useRuntimeSchedulerAlways") ?: true).toString()) diff --git a/example/RNExampleApp/package.json b/example/RNExampleApp/package.json index 6daf426..8d8de4c 100644 --- a/example/RNExampleApp/package.json +++ b/example/RNExampleApp/package.json @@ -1,6 +1,6 @@ { "name": "react-native-example-app", - "version": "54.2.1", + "version": "54.2.2", "private": true, "scripts": { "initProject": "yarn add expo && yarn add ../../plugin", diff --git a/plugin/android/src/main/java/com/anyline/reactnative/AnylineSDKPlugin.java b/plugin/android/src/main/java/com/anyline/reactnative/AnylineSDKPlugin.java index 62da740..da96e2d 100755 --- a/plugin/android/src/main/java/com/anyline/reactnative/AnylineSDKPlugin.java +++ b/plugin/android/src/main/java/com/anyline/reactnative/AnylineSDKPlugin.java @@ -17,12 +17,14 @@ import org.json.JSONException; import org.json.JSONObject; +import java.io.File; import java.io.IOException; import java.util.HashMap; import io.anyline2.WrapperConfig; import io.anyline2.WrapperInfo; import io.anyline2.core.ScanController; +import io.anyline2.di.context.ContextProvider; import io.anyline2.legacy.products.AnylineUpdater; import io.anyline2.legacy.trainer.AssetContext; import io.anyline2.AnylineSdk; @@ -32,6 +34,11 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultReporter.OnResultListener { + static { + System.loadLibrary("opencv_java3_al"); + System.loadLibrary("anylineCore"); + } + public static final String REACT_CLASS = "AnylineSDKPlugin"; public static final String EXTRA_LICENSE_KEY = "EXTRA_LICENSE_KEY"; public static final String EXTRA_CONFIG_JSON = "EXTRA_CONFIG_JSON"; @@ -63,6 +70,7 @@ class AnylineSDKPlugin extends ReactContextBaseJavaModule implements ResultRepor super(context); this.reactContext = context; this.assetContextJsonParser = new AssetContextJsonParser(); + ContextProvider.setInstance(context); } @Override @@ -232,6 +240,35 @@ public void exportCachedEvents(final Promise promise) { } } + /** + * This function removes all previous scan result images from disk, either from external + * or internal files dir, e.g.: + * /sdcard/Android/[applicationId]/files/results/image1729849635965 + */ + private void deleteAllPreviousScanResultImages() { + String imagePath = ""; + if (reactContext.getExternalFilesDir(null) != null) { + imagePath = reactContext + .getExternalFilesDir(null) + .toString() + "/results/"; + + } else if (reactContext.getFilesDir() != null) { + imagePath = reactContext + .getFilesDir() + .toString() + "/results/"; + } + + File resultFolder = new File(imagePath); + File[] files = resultFolder.listFiles(); + if (files != null) { + for (int fileIndex = 0; fileIndex < files.length; fileIndex++) { + if (files[fileIndex].getName().startsWith("image")) { + files[fileIndex].delete(); + } + } + } + } + @ReactMethod public void setupPromise(String config, String scanMode, final Promise promise) { setupPromiseWithInitializationParameters(null, config, scanMode, promise); @@ -243,6 +280,7 @@ public void setupPromiseWithInitializationParameters(String initializationParame this.config = config; this.scanViewInitializationParameters = initializationParameters; + deleteAllPreviousScanResultImages(); routeScanMode(scanMode); } diff --git a/plugin/package.json b/plugin/package.json index d3278c2..0fdf6c7 100644 --- a/plugin/package.json +++ b/plugin/package.json @@ -1,6 +1,6 @@ { - "_from": "anyline-ocr-react-native-module@^54.2.1", - "_id": "anyline-ocr-react-native-module@^54.2.1", + "_from": "anyline-ocr-react-native-module@^54.2.2", + "_id": "anyline-ocr-react-native-module@^54.2.2", "_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.2.1", + "raw": "anyline-ocr-react-native-module@^54.2.2", "name": "anyline-ocr-react-native-module", "escapedName": "anyline-ocr-react-native-module", - "rawSpec": "^54.2.1", + "rawSpec": "^54.2.2", "saveSpec": null, - "fetchSpec": "^54.2.1" + "fetchSpec": "^54.2.2" }, "_requiredBy": [ "/" ], - "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-54.2.1.tgz", + "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-54.2.2.tgz", "_shasum": "bacbcd260cc662244f59393ed81a6edba009b52c", - "_spec": "anyline-ocr-react-native-module@^54.2.1", + "_spec": "anyline-ocr-react-native-module@^54.2.2", "_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.2.1" + "version": "54.2.2" }