Skip to content

Commit 38d831c

Browse files
author
renatoAnyline
authored
Merge pull request #147 from Anyline/release/41.0.0
Release/41.0.0
2 parents 6797b34 + 63dc9bd commit 38d831c

File tree

11 files changed

+22
-30
lines changed

11 files changed

+22
-30
lines changed

example/RNExampleApp/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ android {
104104
minSdkVersion rootProject.ext.minSdkVersion
105105
targetSdkVersion rootProject.ext.targetSdkVersion
106106
versionCode 4
107-
versionName "40.0.0"
107+
versionName "41.0.0"
108108
multiDexEnabled true
109109

110110
}

example/RNExampleApp/config/AnalogMeterConfig.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default {
1212
"plugin": {
1313
"id": "Meter_ID",
1414
"meterPlugin": {
15-
"scanMode": "ANALOG_METER"
15+
"scanMode": "AUTO_ANALOG_DIGITAL_METER"
1616
}
1717
},
1818
"cutoutConfig": {
@@ -35,15 +35,6 @@ export default {
3535
},
3636
"cancelOnResult": true
3737
},
38-
"nativeBarcodeEnabled": true,
39-
"segment": {
40-
"titles": ["Analog", "Digital"],
41-
"modes": ["ANALOG_METER", "DIGITAL_METER"],
42-
"tintColor": "CCCCCC",
43-
"offset": {
44-
"x": 0,
45-
"y": 400
46-
}
47-
}
38+
"nativeBarcodeEnabled": true
4839
}
4940
}

example/RNExampleApp/config/DigitalMeterConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default {
1212
"plugin": {
1313
"id": "DIGITAL_METER",
1414
"meterPlugin": {
15-
"scanMode": "DIGITAL_METER"
15+
"scanMode": "AUTO_ANALOG_DIGITAL_METER"
1616
}
1717
},
1818
"cutoutConfig": {

example/RNExampleApp/config/DotMatrixConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default {
1212
"plugin": {
1313
"id": "Meter_ID",
1414
"meterPlugin": {
15-
"scanMode": "DOT_MATRIX_METER"
15+
"scanMode": "AUTO_ANALOG_DIGITAL_METER"
1616
}
1717
},
1818
"cutoutConfig": {

example/RNExampleApp/config/TireSizeConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default {
3535
"scanFeedback" : {
3636
"animation": "traverse_multi",
3737
"animationDuration" : 250,
38-
"style": "contour_rect",
38+
"style": "rect",
3939
"strokeWidth": 2,
4040
"strokeColor": "0099FF",
4141
"beepOnResult": true,

example/RNExampleApp/ios/RNExampleApp/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>40.0.0</string>
20+
<string>41.0.0</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>

example/RNExampleApp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "RNExampleApp",
3-
"version": "40.0.0",
3+
"version": "41.0.0",
44
"private": true,
55
"scripts": {
66
"start": "node node_modules/react-native/local-cli/cli.js start",

plugin/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ repositories {
6565

6666
dependencies {
6767
implementation fileTree(dir: "libs", include: ["*.jar"])
68-
implementation 'io.anyline:anylinesdk:40.0.0'
68+
implementation 'io.anyline:anylinesdk:41.0.0'
6969
implementation "com.facebook.react:react-native:+" // from node_modules
7070
implementation("com.google.android.material:material:1.4.0-rc01")
7171
implementation 'androidx.multidex:multidex:2.0.1'

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,6 @@ public void onResult(ScanResult result) {
249249
jsonMeterResult = AnylinePluginHelper.jsonHelper(Anyline4Activity.this, subResult,
250250
jsonMeterResult);
251251
jsonResult.put(subResult.getPluginId(), jsonMeterResult);
252-
AnylinePluginHelper.clearFinalBarcodeList(); // otherwise result from previous scan could be shown if new scan does not include barcode
253-
254252
} catch (Exception e) {
255253
Log.e(TAG, "EXCEPTION", e);
256254
}
@@ -437,10 +435,13 @@ public void onResult(MeterScanResult meterScanResult) {
437435
}
438436

439437
setResult(scanViewPlugin, jsonResult);
440-
AnylinePluginHelper.clearFinalBarcodeList(); // otherwise result from previous scan could be shown if new scan does not include barcode
441438
}
442439
});
443440
}
441+
442+
/* Clear NativeBarcodeResult after every scan, otherwise the result from previous
443+
* scan would be shown if now barcode was found */
444+
AnylinePluginHelper.clearFinalBarcodeList();
444445
}
445446

446447
} catch (Exception e) {

plugin/ios/AnylineReact.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
1919
s.source = { :git => "https://github.com/Anyline/anyline-ocr-react-native-module.git", :tag => "#{s.version}" }
2020

2121
s.source_files = "*.{h,m}"
22-
s.dependency "Anyline", "~> 40.0.0"
22+
s.dependency "Anyline", "~> 41.0.0"
2323
s.dependency "React"
2424
end

0 commit comments

Comments
 (0)