@scrumble-nl/react-native-honeywell-scanner 1.7.0 → 1.7.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -25,7 +25,6 @@ public class HoneywellScannerModule extends ReactContextBaseJavaModule implement
25
25
  private final ReactApplicationContext reactContext;
26
26
  private AidcManager manager;
27
27
  private BarcodeReader reader;
28
- private List<BarcodeReaderInfo> readerInfoList;
29
28
 
30
29
  private static final String BARCODE_READ_SUCCESS = "barcodeReadSuccess";
31
30
  private static final String BARCODE_READ_FAIL = "barcodeReadFail";
@@ -71,82 +70,119 @@ public class HoneywellScannerModule extends ReactContextBaseJavaModule implement
71
70
  sendEvent(BARCODE_READ_FAIL, params);
72
71
  }
73
72
 
74
- public void registerReader(Promise promise) {
75
- if (reader != null) {
76
- reader.addBarcodeListener(HoneywellScannerModule.this);
77
- try {
78
- reader.claim();
79
- reader.setProperty(BarcodeReader.PROPERTY_EAN_8_ENABLED, true);
80
- reader.setProperty(BarcodeReader.PROPERTY_EAN_8_CHECK_DIGIT_TRANSMIT_ENABLED, true);
81
- reader.setProperty(BarcodeReader.PROPERTY_EAN_13_ENABLED, true);
82
- reader.setProperty(BarcodeReader.PROPERTY_EAN_13_CHECK_DIGIT_TRANSMIT_ENABLED, true);
83
- reader.setProperty(BarcodeReader.PROPERTY_EAN_13_TWO_CHAR_ADDENDA_ENABLED, true);
84
- reader.setProperty(BarcodeReader.PROPERTY_EAN_13_FIVE_CHAR_ADDENDA_ENABLED, true);
85
- reader.setProperty(BarcodeReader.PROPERTY_DATAMATRIX_ENABLED, true);
86
- promise.resolve(true);
87
- } catch (ScannerUnavailableException | UnsupportedPropertyException e) {
88
- promise.resolve(false);
89
- e.printStackTrace();
73
+ /**
74
+ * The ring scanner of a CT60 can connect and disconnect at any time: switch to it, or back to the built-in reader.
75
+ * Kept in a field so stopReader removes this exact listener again.
76
+ */
77
+ private final BarcodeDeviceListener deviceListener = new BarcodeDeviceListener() {
78
+ @Override
79
+ public void onBarcodeDeviceConnectionEvent(BarcodeDeviceConnectionEvent event) {
80
+ synchronized (HoneywellScannerModule.this) {
81
+ if (manager == null) {
82
+ return;
83
+ }
84
+
85
+ closeReader();
86
+ openReader(event.getConnectionStatus() == AidcManager.BARCODE_DEVICE_CONNECTED
87
+ ? event.getBarcodeReaderInfo().getName()
88
+ : null);
90
89
  }
91
90
  }
91
+ };
92
+
93
+ private boolean started = false;
94
+
95
+ private boolean openReader(@Nullable String name) {
96
+ reader = name == null ? manager.createBarcodeReader() : manager.createBarcodeReader(name);
97
+ reader.addBarcodeListener(this);
98
+
99
+ return claimReader();
100
+ }
101
+
102
+ private boolean claimReader() {
103
+ try {
104
+ reader.claim();
105
+ reader.setProperty(BarcodeReader.PROPERTY_EAN_8_ENABLED, true);
106
+ reader.setProperty(BarcodeReader.PROPERTY_EAN_8_CHECK_DIGIT_TRANSMIT_ENABLED, true);
107
+ reader.setProperty(BarcodeReader.PROPERTY_EAN_13_ENABLED, true);
108
+ reader.setProperty(BarcodeReader.PROPERTY_EAN_13_CHECK_DIGIT_TRANSMIT_ENABLED, true);
109
+ reader.setProperty(BarcodeReader.PROPERTY_EAN_13_TWO_CHAR_ADDENDA_ENABLED, true);
110
+ reader.setProperty(BarcodeReader.PROPERTY_EAN_13_FIVE_CHAR_ADDENDA_ENABLED, true);
111
+ reader.setProperty(BarcodeReader.PROPERTY_DATAMATRIX_ENABLED, true);
112
+ reader.setProperty(BarcodeReader.PROPERTY_QR_CODE_ENABLED, true);
113
+ reader.setProperty(BarcodeReader.PROPERTY_DATA_PROCESSOR_LAUNCH_BROWSER, false);
114
+ return true;
115
+ } catch (ScannerUnavailableException | UnsupportedPropertyException e) {
116
+ e.printStackTrace();
117
+ return false;
118
+ }
119
+ }
120
+
121
+ private void closeReader() {
122
+ if (reader == null) {
123
+ return;
124
+ }
125
+
126
+ reader.removeBarcodeListener(this);
127
+ reader.release();
128
+ reader.close();
129
+ reader = null;
92
130
  }
93
131
 
94
132
  /*******************************/
95
133
  /** Methods Available from JS **/
96
134
  /*******************************/
97
135
 
136
+ /**
137
+ * Called by every screen that starts scanning, also while the reader is already running: reuse it then.
138
+ */
98
139
  @ReactMethod
99
- public void startReader(final Promise promise) {
140
+ public synchronized void startReader(final Promise promise) {
141
+ started = true;
142
+
143
+ if (manager != null) {
144
+ promise.resolve(reader != null && claimReader());
145
+ return;
146
+ }
147
+
100
148
  AidcManager.create(reactContext, new CreatedCallback() {
101
149
  @Override
102
150
  public void onCreated(AidcManager aidcManager) {
103
- manager = aidcManager;
104
- readerInfoList = manager.listConnectedBarcodeDevices();
105
- reader = manager.createBarcodeReader();
106
-
107
- for (BarcodeReaderInfo info : readerInfoList) {
108
- if (info.getName().trim().contains("ring")) {
109
- reader = manager.createBarcodeReader(info.getName());
151
+ synchronized (HoneywellScannerModule.this) {
152
+ // Stopped while creating, or another start won the race.
153
+ if (!started || manager != null) {
154
+ aidcManager.close();
155
+ promise.resolve(manager != null);
156
+ return;
110
157
  }
111
- }
112
158
 
113
- registerReader(promise);
114
-
115
- manager.addBarcodeDeviceListener(new BarcodeDeviceListener() {
116
- @Override
117
- public void onBarcodeDeviceConnectionEvent(BarcodeDeviceConnectionEvent event) {
118
- if (event.getConnectionStatus() == manager.BARCODE_DEVICE_CONNECTED) {
119
- reader = manager.createBarcodeReader(event.getBarcodeReaderInfo().getName());
120
- } else {
121
- reader = manager.createBarcodeReader();
159
+ manager = aidcManager;
160
+ String ringName = null;
161
+ for (BarcodeReaderInfo info : manager.listConnectedBarcodeDevices()) {
162
+ if (info.getName().trim().contains("ring")) {
163
+ ringName = info.getName();
122
164
  }
123
-
124
- registerReader(promise);
125
165
  }
126
- });
166
+
167
+ boolean claimed = openReader(ringName);
168
+ manager.addBarcodeDeviceListener(deviceListener);
169
+ promise.resolve(claimed);
170
+ }
127
171
  }
128
172
  });
129
173
  }
130
174
 
131
175
  @ReactMethod
132
- public void stopReader(Promise promise) {
133
- if (reader != null) {
134
- reader.release();
135
- reader.close();
136
- }
176
+ public synchronized void stopReader(Promise promise) {
177
+ started = false;
178
+ closeReader();
179
+
137
180
  if (manager != null) {
138
- manager.removeBarcodeDeviceListener(new BarcodeDeviceListener() {
139
- @Override
140
- public void onBarcodeDeviceConnectionEvent(BarcodeDeviceConnectionEvent event) {
141
- if (event.getConnectionStatus() == manager.BARCODE_DEVICE_CONNECTED) {
142
- reader = manager.createBarcodeReader(event.getBarcodeReaderInfo().getName());
143
- } else {
144
- reader = manager.createBarcodeReader();
145
- }
146
- }
147
- });
181
+ manager.removeBarcodeDeviceListener(deviceListener);
148
182
  manager.close();
183
+ manager = null;
149
184
  }
185
+
150
186
  promise.resolve(null);
151
187
  }
152
188
 
package/dist/index.d.ts CHANGED
@@ -4,7 +4,7 @@ import { EmitterSubscription } from 'react-native';
4
4
  * @param {String} eventName Name of event one of barcodeReadSuccess, barcodeReadFail
5
5
  * @param {Function} handler Event handler
6
6
  */
7
- export declare type ScanEvent = (event: {
7
+ export type ScanEvent = (event: {
8
8
  data: string;
9
9
  }) => void;
10
10
  interface Scanner {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@scrumble-nl/react-native-honeywell-scanner",
3
3
  "title": "React Native Honeywell Scanner",
4
- "version": "1.7.0",
4
+ "version": "1.7.2",
5
5
  "description": "Bridge to use the Honeywell scanner",
6
6
  "main": "dist/index.js",
7
7
  "types": "dist/index.d.ts",
@@ -26,11 +26,11 @@
26
26
  "licenseFilename": "LICENSE",
27
27
  "readmeFilename": "README.md",
28
28
  "peerDependencies": {
29
- "react": "18.*|19.*",
29
+ "react": "18.* || 19.*",
30
30
  "react-native": "0.80.*"
31
31
  },
32
32
  "devDependencies": {
33
- "react": "18.* || ^19.*",
33
+ "react": "18.* || 19.*",
34
34
  "react-native": "0.80.*"
35
35
  },
36
36
  "overrides": {