Merge pull request #147 from Anyline/release/41.0.0

Release/41.0.0
Anyline · Aug 3, 2022 · 38d831c · 38d831c
2 parents 6797b34 + 63dc9bd
commit 38d831c
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 30 deletions.
diff --git a/example/RNExampleApp/android/app/build.gradle b/example/RNExampleApp/android/app/build.gradle
@@ -104,7 +104,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 4
-        versionName "40.0.0"
+        versionName "41.0.0"
         multiDexEnabled true
 
     }

diff --git a/example/RNExampleApp/config/AnalogMeterConfig.js b/example/RNExampleApp/config/AnalogMeterConfig.js
@@ -12,7 +12,7 @@ export default {
             "plugin": {
                 "id": "Meter_ID",
                 "meterPlugin": {
-                    "scanMode": "ANALOG_METER"
+                    "scanMode": "AUTO_ANALOG_DIGITAL_METER"
                 }
             },
             "cutoutConfig": {
@@ -35,15 +35,6 @@ export default {
             },
             "cancelOnResult": true
         },
-        "nativeBarcodeEnabled": true,
-        "segment": {
-            "titles": ["Analog", "Digital"],
-            "modes": ["ANALOG_METER", "DIGITAL_METER"],
-            "tintColor": "CCCCCC",
-            "offset": {
-                "x": 0,
-                "y": 400
-            }
-        }
+        "nativeBarcodeEnabled": true
     }
 }
diff --git a/example/RNExampleApp/config/DigitalMeterConfig.js b/example/RNExampleApp/config/DigitalMeterConfig.js
@@ -12,7 +12,7 @@ export default {
             "plugin": {
                 "id": "DIGITAL_METER",
                 "meterPlugin": {
-                    "scanMode": "DIGITAL_METER"
+                    "scanMode": "AUTO_ANALOG_DIGITAL_METER"
                 }
             },
             "cutoutConfig": {

diff --git a/example/RNExampleApp/config/DotMatrixConfig.js b/example/RNExampleApp/config/DotMatrixConfig.js
@@ -12,7 +12,7 @@ export default {
             "plugin": {
                 "id": "Meter_ID",
                 "meterPlugin": {
-                    "scanMode": "DOT_MATRIX_METER"
+                    "scanMode": "AUTO_ANALOG_DIGITAL_METER"
                 }
             },
             "cutoutConfig": {

diff --git a/example/RNExampleApp/config/TireSizeConfig.js b/example/RNExampleApp/config/TireSizeConfig.js
@@ -35,7 +35,7 @@ export default {
             "scanFeedback" : {
                 "animation": "traverse_multi",
                 "animationDuration" : 250,
-                "style": "contour_rect",
+                "style": "rect",
                 "strokeWidth": 2,
                 "strokeColor": "0099FF",
                 "beepOnResult": true,

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

diff --git a/example/RNExampleApp/package.json b/example/RNExampleApp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "RNExampleApp",
-  "version": "40.0.0",
+  "version": "41.0.0",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",

diff --git a/plugin/android/build.gradle b/plugin/android/build.gradle
@@ -65,7 +65,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'io.anyline:anylinesdk:40.0.0'
+    implementation 'io.anyline:anylinesdk:41.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'

diff --git a/plugin/android/src/main/java/com/anyline/reactnative/Anyline4Activity.java b/plugin/android/src/main/java/com/anyline/reactnative/Anyline4Activity.java
@@ -249,8 +249,6 @@ public void onResult(ScanResult result) {
                                         jsonMeterResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, subResult,
                                                 jsonMeterResult);
                                         jsonResult.put(subResult.getPluginId(), jsonMeterResult);
-                                        AnylinePluginHelper.clearFinalBarcodeList();    // otherwise result from previous scan could be shown if new scan does not include barcode
-
                                     } catch (Exception e) {
                                         Log.e(TAG, "EXCEPTION", e);
                                     }
@@ -437,10 +435,13 @@ public void onResult(MeterScanResult meterScanResult) {
                             }
 
                             setResult(scanViewPlugin, jsonResult);
-                            AnylinePluginHelper.clearFinalBarcodeList();    // otherwise result from previous scan could be shown if new scan does not include barcode
                         }
                     });
                 }
+
+                /* Clear NativeBarcodeResult after every scan, otherwise the result from previous
+                 * scan would be shown if now barcode was found */
+                AnylinePluginHelper.clearFinalBarcodeList();
             }
 
         } catch (Exception e) {

diff --git a/plugin/ios/AnylineReact.podspec b/plugin/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", "~> 40.0.0"
+  s.dependency "Anyline", "~> 41.0.0"
   s.dependency "React"
 end
diff --git a/plugin/package.json b/plugin/package.json
@@ -1,26 +1,26 @@
 {
-  "_from": "anyline-ocr-react-native-module@^40.0.0",
-  "_id": "anyline-ocr-react-native-module@40.0.0",
+  "_from": "anyline-ocr-react-native-module@^41.0.0",
+  "_id": "anyline-ocr-react-native-module@41.0.0",
   "_inBundle": false,
   "_integrity": "sha512-BGi9zNkSsoxXywDBIqzgBRvKUBniQOJHDKBrozZubKthZNRBAj8Ry5tW0Me0yLXt/fauME//hbC0wsenfPJZqw==",
   "_location": "/anyline-ocr-react-native-module",
   "_phantomChildren": {},
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "anyline-ocr-react-native-module@^40.0.0",
+    "raw": "anyline-ocr-react-native-module@^41.0.0",
     "name": "anyline-ocr-react-native-module",
     "escapedName": "anyline-ocr-react-native-module",
-    "rawSpec": "^40.0.0",
+    "rawSpec": "^41.0.0",
     "saveSpec": null,
-    "fetchSpec": "^40.0.0"
+    "fetchSpec": "^41.0.0"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-40.0.0.tgz",
+  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-41.0.0.tgz",
   "_shasum": "bacbcd260cc662244f59393ed81a6edba009b52c",
-  "_spec": "anyline-ocr-react-native-module@^40.0.0",
+  "_spec": "anyline-ocr-react-native-module@^41.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": "40.0.0"
+  "version": "41.0.0"
 }