capacitor-card-scanner 0.2.0 → 0.3.0
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.
- package/README.md +11 -10
- package/android/src/main/java/pt/tcgclassifier/cardscanner/CardDetector.java +63 -22
- package/android/src/main/java/pt/tcgclassifier/cardscanner/CardScanner.java +2 -2
- package/android/src/main/java/pt/tcgclassifier/cardscanner/CardScannerPlugin.java +165 -164
- package/android/src/main/java/pt/tcgclassifier/cardscanner/DetectionOverlay.java +48 -16
- package/dist/docs.json +12 -0
- package/dist/esm/definitions.d.ts +7 -0
- package/dist/esm/definitions.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -328,16 +328,17 @@ requestPermissions() => Promise<PermissionStatus>
|
|
|
328
328
|
|
|
329
329
|
#### DetectionOptions
|
|
330
330
|
|
|
331
|
-
| Prop | Type | Description
|
|
332
|
-
| --------------------- | -------------------- |
|
|
333
|
-
| **`intervalMs`** | <code>number</code> | Minimum time between two OCR runs, in milliseconds. The red rectangle is updated on every frame regardless.
|
|
334
|
-
| **`stableFrames`** | <code>number</code> | How many consecutive OCR runs must read the same card before `cardDetected` fires.
|
|
335
|
-
| **`includeImage`** | <code>boolean</code> | Include a JPEG of the detected card in the event.
|
|
336
|
-
| **`cardAspectRatio`** | <code>number</code> | Expected width / height of an upright card. Only upright cards are detected; a card lying sideways falls outside the tolerance.
|
|
337
|
-
| **`aspectTolerance`** | <code>number</code> | Allowed relative deviation from `cardAspectRatio` (0.15 = ±15%). Increase it if tilted cards are not detected.
|
|
338
|
-
| **`minCardArea`** | <code>number</code> | Smallest card size, as a fraction of the camera frame (0-1).
|
|
339
|
-
| **`maxCardArea`** | <code>number</code> | Largest card size, as a fraction of the camera frame (0-1).
|
|
340
|
-
| **`requireCard`** | <code>boolean</code> | Only read text when a card-shaped object is visible. When false, the whole frame is read if no card is found.
|
|
331
|
+
| Prop | Type | Description | Default |
|
|
332
|
+
| --------------------- | -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------- |
|
|
333
|
+
| **`intervalMs`** | <code>number</code> | Minimum time between two OCR runs, in milliseconds. The red rectangle is updated on every frame regardless. | <code>300</code> |
|
|
334
|
+
| **`stableFrames`** | <code>number</code> | How many consecutive OCR runs must read the same card before `cardDetected` fires. | <code>2</code> |
|
|
335
|
+
| **`includeImage`** | <code>boolean</code> | Include a JPEG of the detected card in the event. | <code>false</code> |
|
|
336
|
+
| **`cardAspectRatio`** | <code>number</code> | Expected width / height of an upright card. Only upright cards are detected; a card lying sideways falls outside the tolerance. | <code>0.716 (63 x 88 mm)</code> |
|
|
337
|
+
| **`aspectTolerance`** | <code>number</code> | Allowed relative deviation from `cardAspectRatio` (0.15 = ±15%). Increase it if tilted cards are not detected. | <code>0.15</code> |
|
|
338
|
+
| **`minCardArea`** | <code>number</code> | Smallest card size, as a fraction of the camera frame (0-1). | <code>0.08</code> |
|
|
339
|
+
| **`maxCardArea`** | <code>number</code> | Largest card size, as a fraction of the camera frame (0-1). | <code>0.9</code> |
|
|
340
|
+
| **`requireCard`** | <code>boolean</code> | Only read text when a card-shaped object is visible. When false, the whole frame is read if no card is found. | <code>true</code> |
|
|
341
|
+
| **`debug`** | <code>boolean</code> | Draw every object found, labelled with its area (`a`) and width/height ratio (`r`): red when accepted as a card, grey when rejected (with the filter that rejected it). Use it to tune the filters above. | <code>false</code> |
|
|
341
342
|
|
|
342
343
|
|
|
343
344
|
#### PluginListenerHandle
|
|
@@ -24,7 +24,10 @@ import com.google.mlkit.vision.text.TextRecognition;
|
|
|
24
24
|
import com.google.mlkit.vision.text.TextRecognizer;
|
|
25
25
|
import com.google.mlkit.vision.text.latin.TextRecognizerOptions;
|
|
26
26
|
import java.io.ByteArrayOutputStream;
|
|
27
|
+
import java.util.ArrayList;
|
|
28
|
+
import java.util.Collections;
|
|
27
29
|
import java.util.List;
|
|
30
|
+
import java.util.Locale;
|
|
28
31
|
import java.util.regex.Matcher;
|
|
29
32
|
import java.util.regex.Pattern;
|
|
30
33
|
|
|
@@ -58,13 +61,42 @@ public class CardDetector implements ImageAnalysis.Analyzer {
|
|
|
58
61
|
public float maxCardArea = 0.9f;
|
|
59
62
|
/** Only run OCR when a card-shaped object is visible. */
|
|
60
63
|
public boolean requireCard = true;
|
|
64
|
+
/** Report every detected object (with its area/ratio) so the overlay can show why it was rejected. */
|
|
65
|
+
public boolean debug = false;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/** An object found by ML Kit, with the values the card filters were checked against. */
|
|
69
|
+
public static class Candidate {
|
|
70
|
+
|
|
71
|
+
/** Bounds normalized (0-1) to the upright frame. */
|
|
72
|
+
public final RectF box;
|
|
73
|
+
/** Fraction of the frame area. */
|
|
74
|
+
public final float area;
|
|
75
|
+
/** Width / height. */
|
|
76
|
+
public final float ratio;
|
|
77
|
+
/** Null when accepted, otherwise the filter that rejected it ("area" or "ratio"). */
|
|
78
|
+
@Nullable
|
|
79
|
+
public final String rejectedBy;
|
|
80
|
+
|
|
81
|
+
Candidate(RectF box, float area, float ratio, @Nullable String rejectedBy) {
|
|
82
|
+
this.box = box;
|
|
83
|
+
this.area = area;
|
|
84
|
+
this.ratio = ratio;
|
|
85
|
+
this.rejectedBy = rejectedBy;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
public String label() {
|
|
89
|
+
String s = String.format(Locale.US, "a=%.2f r=%.2f", area, ratio);
|
|
90
|
+
return rejectedBy == null ? s : s + " x" + rejectedBy;
|
|
91
|
+
}
|
|
61
92
|
}
|
|
62
93
|
|
|
63
94
|
public interface BoxListener {
|
|
64
95
|
/**
|
|
65
|
-
* @param
|
|
96
|
+
* @param card card bounds normalized (0-1) to the upright frame, or null when no card is visible
|
|
97
|
+
* @param candidates every detected object; empty unless debug is on
|
|
66
98
|
*/
|
|
67
|
-
void
|
|
99
|
+
void onDetections(@Nullable RectF card, List<Candidate> candidates, int frameWidth, int frameHeight);
|
|
68
100
|
}
|
|
69
101
|
|
|
70
102
|
// e.g. "025/165", "SV001/SV122", "TG05/TG30", "GG01/GG70"
|
|
@@ -113,27 +145,23 @@ public class CardDetector implements ImageAnalysis.Analyzer {
|
|
|
113
145
|
@Override
|
|
114
146
|
public void analyze(@NonNull ImageProxy image) {
|
|
115
147
|
long now = SystemClock.elapsedRealtime();
|
|
116
|
-
|
|
117
|
-
Bitmap raw;
|
|
148
|
+
Bitmap upright;
|
|
118
149
|
try {
|
|
119
|
-
|
|
150
|
+
// Rotate once, so both detectors and all coordinates share the same upright frame.
|
|
151
|
+
upright = rotate(image.toBitmap(), image.getImageInfo().getRotationDegrees());
|
|
120
152
|
} finally {
|
|
121
153
|
image.close();
|
|
122
154
|
}
|
|
123
|
-
int frameW =
|
|
124
|
-
int frameH =
|
|
155
|
+
int frameW = upright.getWidth();
|
|
156
|
+
int frameH = upright.getHeight();
|
|
125
157
|
|
|
126
158
|
try {
|
|
127
|
-
List<DetectedObject> objects = Tasks.await(objectDetector.process(InputImage.fromBitmap(
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
card.top / (float) frameH,
|
|
132
|
-
card.right / (float) frameW,
|
|
133
|
-
card.bottom / (float) frameH
|
|
134
|
-
);
|
|
159
|
+
List<DetectedObject> objects = Tasks.await(objectDetector.process(InputImage.fromBitmap(upright, 0)));
|
|
160
|
+
List<Candidate> candidates = options.debug ? new ArrayList<>() : Collections.emptyList();
|
|
161
|
+
Rect card = pickCard(objects, frameW, frameH, candidates);
|
|
162
|
+
RectF cardBox = card == null ? null : normalize(card, frameW, frameH);
|
|
135
163
|
BoxListener bl = boxListener;
|
|
136
|
-
if (bl != null) bl.
|
|
164
|
+
if (bl != null) bl.onDetections(cardBox, candidates, frameW, frameH);
|
|
137
165
|
|
|
138
166
|
if (now - lastOcrAt < options.intervalMs) return;
|
|
139
167
|
lastOcrAt = now;
|
|
@@ -143,7 +171,6 @@ public class CardDetector implements ImageAnalysis.Analyzer {
|
|
|
143
171
|
return;
|
|
144
172
|
}
|
|
145
173
|
|
|
146
|
-
Bitmap upright = rotate(raw, rotation);
|
|
147
174
|
Bitmap region = card == null ? upright : crop(upright, card);
|
|
148
175
|
Text text = Tasks.await(recognizer.process(InputImage.fromBitmap(region, 0)));
|
|
149
176
|
handle(text, region, cardBox, now);
|
|
@@ -152,9 +179,12 @@ public class CardDetector implements ImageAnalysis.Analyzer {
|
|
|
152
179
|
}
|
|
153
180
|
}
|
|
154
181
|
|
|
155
|
-
/**
|
|
182
|
+
/**
|
|
183
|
+
* The biggest detected object with the size and upright proportions of a card.
|
|
184
|
+
* When debug is on, every object is added to {@code candidates}.
|
|
185
|
+
*/
|
|
156
186
|
@Nullable
|
|
157
|
-
private Rect pickCard(List<DetectedObject> objects, int frameW, int frameH) {
|
|
187
|
+
private Rect pickCard(List<DetectedObject> objects, int frameW, int frameH, List<Candidate> candidates) {
|
|
158
188
|
float frameArea = (float) frameW * frameH;
|
|
159
189
|
float minRatio = options.cardAspectRatio * (1f - options.aspectTolerance);
|
|
160
190
|
float maxRatio = options.cardAspectRatio * (1f + options.aspectTolerance);
|
|
@@ -166,10 +196,17 @@ public class CardDetector implements ImageAnalysis.Analyzer {
|
|
|
166
196
|
|
|
167
197
|
long area = (long) r.width() * r.height();
|
|
168
198
|
float fraction = area / frameArea;
|
|
169
|
-
if (fraction < options.minCardArea || fraction > options.maxCardArea) continue;
|
|
170
|
-
|
|
171
199
|
float ratio = r.width() / (float) r.height();
|
|
172
|
-
|
|
200
|
+
String rejectedBy = null;
|
|
201
|
+
if (fraction < options.minCardArea || fraction > options.maxCardArea) {
|
|
202
|
+
rejectedBy = "area";
|
|
203
|
+
} else if (ratio < minRatio || ratio > maxRatio) {
|
|
204
|
+
rejectedBy = "ratio";
|
|
205
|
+
}
|
|
206
|
+
if (options.debug) {
|
|
207
|
+
candidates.add(new Candidate(normalize(r, frameW, frameH), fraction, ratio, rejectedBy));
|
|
208
|
+
}
|
|
209
|
+
if (rejectedBy != null) continue;
|
|
173
210
|
|
|
174
211
|
if (area > bestArea) {
|
|
175
212
|
best = r;
|
|
@@ -179,6 +216,10 @@ public class CardDetector implements ImageAnalysis.Analyzer {
|
|
|
179
216
|
return best;
|
|
180
217
|
}
|
|
181
218
|
|
|
219
|
+
private static RectF normalize(Rect r, int frameW, int frameH) {
|
|
220
|
+
return new RectF(r.left / (float) frameW, r.top / (float) frameH, r.right / (float) frameW, r.bottom / (float) frameH);
|
|
221
|
+
}
|
|
222
|
+
|
|
182
223
|
private static Bitmap rotate(Bitmap bitmap, int rotation) {
|
|
183
224
|
if (rotation == 0) return bitmap;
|
|
184
225
|
Matrix matrix = new Matrix();
|
|
@@ -151,10 +151,10 @@ public class CardScanner {
|
|
|
151
151
|
closeDetector();
|
|
152
152
|
detector = newDetector;
|
|
153
153
|
DetectionOverlay target = overlay;
|
|
154
|
-
detector.setBoxListener((
|
|
154
|
+
detector.setBoxListener((card, candidates, frameW, frameH) ->
|
|
155
155
|
target.post(() -> {
|
|
156
156
|
// Ignore frames that arrive after detection was stopped or restarted.
|
|
157
|
-
if (detector == newDetector) target.
|
|
157
|
+
if (detector == newDetector) target.setDetections(card, candidates, frameW, frameH);
|
|
158
158
|
})
|
|
159
159
|
);
|
|
160
160
|
bind();
|
|
@@ -1,164 +1,165 @@
|
|
|
1
|
-
package pt.tcgclassifier.cardscanner;
|
|
2
|
-
|
|
3
|
-
import android.Manifest;
|
|
4
|
-
import com.getcapacitor.JSObject;
|
|
5
|
-
import com.getcapacitor.PermissionState;
|
|
6
|
-
import com.getcapacitor.Plugin;
|
|
7
|
-
import com.getcapacitor.PluginCall;
|
|
8
|
-
import com.getcapacitor.PluginMethod;
|
|
9
|
-
import com.getcapacitor.annotation.CapacitorPlugin;
|
|
10
|
-
import com.getcapacitor.annotation.Permission;
|
|
11
|
-
import com.getcapacitor.annotation.PermissionCallback;
|
|
12
|
-
|
|
13
|
-
@CapacitorPlugin(name = "CardScanner", permissions = { @Permission(strings = { Manifest.permission.CAMERA }, alias = CardScannerPlugin.CAMERA) })
|
|
14
|
-
public class CardScannerPlugin extends Plugin {
|
|
15
|
-
|
|
16
|
-
static final String CAMERA = "camera";
|
|
17
|
-
|
|
18
|
-
private CardScanner implementation;
|
|
19
|
-
|
|
20
|
-
@Override
|
|
21
|
-
public void load() {
|
|
22
|
-
implementation = new CardScanner(getActivity(), getBridge().getWebView());
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
@Override
|
|
26
|
-
protected void handleOnDestroy() {
|
|
27
|
-
getActivity().runOnUiThread(() -> implementation.stop());
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
@PluginMethod
|
|
31
|
-
public void start(PluginCall call) {
|
|
32
|
-
if (getPermissionState(CAMERA) != PermissionState.GRANTED) {
|
|
33
|
-
requestPermissionForAlias(CAMERA, call, "cameraPermsCallback");
|
|
34
|
-
return;
|
|
35
|
-
}
|
|
36
|
-
doStart(call);
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
@PermissionCallback
|
|
40
|
-
private void cameraPermsCallback(PluginCall call) {
|
|
41
|
-
if (getPermissionState(CAMERA) == PermissionState.GRANTED) {
|
|
42
|
-
doStart(call);
|
|
43
|
-
} else {
|
|
44
|
-
call.reject("Camera permission denied", "PERMISSION_DENIED");
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
private void doStart(PluginCall call) {
|
|
49
|
-
boolean front = "front".equals(call.getString("position", "rear"));
|
|
50
|
-
getActivity().runOnUiThread(() -> implementation.start(front, voidCallback(call)));
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
@PluginMethod
|
|
54
|
-
public void stop(PluginCall call) {
|
|
55
|
-
getActivity().runOnUiThread(() -> {
|
|
56
|
-
implementation.stop();
|
|
57
|
-
call.resolve();
|
|
58
|
-
});
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
@PluginMethod
|
|
62
|
-
public void flip(PluginCall call) {
|
|
63
|
-
if (!ensureRunning(call)) return;
|
|
64
|
-
getActivity().runOnUiThread(() -> implementation.flip(voidCallback(call)));
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
@PluginMethod
|
|
68
|
-
public void capture(PluginCall call) {
|
|
69
|
-
if (!ensureRunning(call)) return;
|
|
70
|
-
int quality = Math.max(0, Math.min(100, call.getInt("quality", 85)));
|
|
71
|
-
implementation.capture(
|
|
72
|
-
quality,
|
|
73
|
-
new CardScanner.Callback<>() {
|
|
74
|
-
@Override
|
|
75
|
-
public void onSuccess(CardScanner.Photo photo) {
|
|
76
|
-
JSObject ret = new JSObject();
|
|
77
|
-
ret.put("base64", photo.base64);
|
|
78
|
-
ret.put("width", photo.width);
|
|
79
|
-
ret.put("height", photo.height);
|
|
80
|
-
call.resolve(ret);
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
@Override
|
|
84
|
-
public void onError(String message, Exception e) {
|
|
85
|
-
call.reject(message, e);
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
);
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
@PluginMethod
|
|
92
|
-
public void startDetection(PluginCall call) {
|
|
93
|
-
if (!ensureRunning(call)) return;
|
|
94
|
-
CardDetector.Options options = new CardDetector.Options();
|
|
95
|
-
options.intervalMs = call.getInt("intervalMs", (int) options.intervalMs);
|
|
96
|
-
options.stableFrames = call.getInt("stableFrames", options.stableFrames);
|
|
97
|
-
options.includeImage = call.getBoolean("includeImage", options.includeImage);
|
|
98
|
-
options.cardAspectRatio = call.getFloat("cardAspectRatio", options.cardAspectRatio);
|
|
99
|
-
options.aspectTolerance = call.getFloat("aspectTolerance", options.aspectTolerance);
|
|
100
|
-
options.minCardArea = call.getFloat("minCardArea", options.minCardArea);
|
|
101
|
-
options.maxCardArea = call.getFloat("maxCardArea", options.maxCardArea);
|
|
102
|
-
options.requireCard = call.getBoolean("requireCard", options.requireCard);
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
call.
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
}
|
|
1
|
+
package pt.tcgclassifier.cardscanner;
|
|
2
|
+
|
|
3
|
+
import android.Manifest;
|
|
4
|
+
import com.getcapacitor.JSObject;
|
|
5
|
+
import com.getcapacitor.PermissionState;
|
|
6
|
+
import com.getcapacitor.Plugin;
|
|
7
|
+
import com.getcapacitor.PluginCall;
|
|
8
|
+
import com.getcapacitor.PluginMethod;
|
|
9
|
+
import com.getcapacitor.annotation.CapacitorPlugin;
|
|
10
|
+
import com.getcapacitor.annotation.Permission;
|
|
11
|
+
import com.getcapacitor.annotation.PermissionCallback;
|
|
12
|
+
|
|
13
|
+
@CapacitorPlugin(name = "CardScanner", permissions = { @Permission(strings = { Manifest.permission.CAMERA }, alias = CardScannerPlugin.CAMERA) })
|
|
14
|
+
public class CardScannerPlugin extends Plugin {
|
|
15
|
+
|
|
16
|
+
static final String CAMERA = "camera";
|
|
17
|
+
|
|
18
|
+
private CardScanner implementation;
|
|
19
|
+
|
|
20
|
+
@Override
|
|
21
|
+
public void load() {
|
|
22
|
+
implementation = new CardScanner(getActivity(), getBridge().getWebView());
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
@Override
|
|
26
|
+
protected void handleOnDestroy() {
|
|
27
|
+
getActivity().runOnUiThread(() -> implementation.stop());
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
@PluginMethod
|
|
31
|
+
public void start(PluginCall call) {
|
|
32
|
+
if (getPermissionState(CAMERA) != PermissionState.GRANTED) {
|
|
33
|
+
requestPermissionForAlias(CAMERA, call, "cameraPermsCallback");
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
doStart(call);
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
@PermissionCallback
|
|
40
|
+
private void cameraPermsCallback(PluginCall call) {
|
|
41
|
+
if (getPermissionState(CAMERA) == PermissionState.GRANTED) {
|
|
42
|
+
doStart(call);
|
|
43
|
+
} else {
|
|
44
|
+
call.reject("Camera permission denied", "PERMISSION_DENIED");
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
private void doStart(PluginCall call) {
|
|
49
|
+
boolean front = "front".equals(call.getString("position", "rear"));
|
|
50
|
+
getActivity().runOnUiThread(() -> implementation.start(front, voidCallback(call)));
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
@PluginMethod
|
|
54
|
+
public void stop(PluginCall call) {
|
|
55
|
+
getActivity().runOnUiThread(() -> {
|
|
56
|
+
implementation.stop();
|
|
57
|
+
call.resolve();
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
@PluginMethod
|
|
62
|
+
public void flip(PluginCall call) {
|
|
63
|
+
if (!ensureRunning(call)) return;
|
|
64
|
+
getActivity().runOnUiThread(() -> implementation.flip(voidCallback(call)));
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
@PluginMethod
|
|
68
|
+
public void capture(PluginCall call) {
|
|
69
|
+
if (!ensureRunning(call)) return;
|
|
70
|
+
int quality = Math.max(0, Math.min(100, call.getInt("quality", 85)));
|
|
71
|
+
implementation.capture(
|
|
72
|
+
quality,
|
|
73
|
+
new CardScanner.Callback<>() {
|
|
74
|
+
@Override
|
|
75
|
+
public void onSuccess(CardScanner.Photo photo) {
|
|
76
|
+
JSObject ret = new JSObject();
|
|
77
|
+
ret.put("base64", photo.base64);
|
|
78
|
+
ret.put("width", photo.width);
|
|
79
|
+
ret.put("height", photo.height);
|
|
80
|
+
call.resolve(ret);
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
@Override
|
|
84
|
+
public void onError(String message, Exception e) {
|
|
85
|
+
call.reject(message, e);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
);
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
@PluginMethod
|
|
92
|
+
public void startDetection(PluginCall call) {
|
|
93
|
+
if (!ensureRunning(call)) return;
|
|
94
|
+
CardDetector.Options options = new CardDetector.Options();
|
|
95
|
+
options.intervalMs = call.getInt("intervalMs", (int) options.intervalMs);
|
|
96
|
+
options.stableFrames = call.getInt("stableFrames", options.stableFrames);
|
|
97
|
+
options.includeImage = call.getBoolean("includeImage", options.includeImage);
|
|
98
|
+
options.cardAspectRatio = call.getFloat("cardAspectRatio", options.cardAspectRatio);
|
|
99
|
+
options.aspectTolerance = call.getFloat("aspectTolerance", options.aspectTolerance);
|
|
100
|
+
options.minCardArea = call.getFloat("minCardArea", options.minCardArea);
|
|
101
|
+
options.maxCardArea = call.getFloat("maxCardArea", options.maxCardArea);
|
|
102
|
+
options.requireCard = call.getBoolean("requireCard", options.requireCard);
|
|
103
|
+
options.debug = call.getBoolean("debug", options.debug);
|
|
104
|
+
|
|
105
|
+
CardDetector detector = new CardDetector(options, result -> notifyListeners("cardDetected", result));
|
|
106
|
+
getActivity().runOnUiThread(() -> {
|
|
107
|
+
try {
|
|
108
|
+
implementation.startDetection(detector);
|
|
109
|
+
call.resolve();
|
|
110
|
+
} catch (Exception e) {
|
|
111
|
+
detector.close();
|
|
112
|
+
call.reject("Failed to start detection: " + e.getMessage(), e);
|
|
113
|
+
}
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
@PluginMethod
|
|
118
|
+
public void stopDetection(PluginCall call) {
|
|
119
|
+
getActivity().runOnUiThread(() -> {
|
|
120
|
+
implementation.stopDetection();
|
|
121
|
+
call.resolve();
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
@PluginMethod
|
|
126
|
+
public void setTorch(PluginCall call) {
|
|
127
|
+
if (!ensureRunning(call)) return;
|
|
128
|
+
implementation.setTorch(Boolean.TRUE.equals(call.getBoolean("enabled", false)));
|
|
129
|
+
call.resolve();
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
@PluginMethod
|
|
133
|
+
public void setZoom(PluginCall call) {
|
|
134
|
+
if (!ensureRunning(call)) return;
|
|
135
|
+
Float ratio = call.getFloat("ratio");
|
|
136
|
+
if (ratio == null) {
|
|
137
|
+
call.reject("Missing 'ratio'");
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
implementation.setZoom(ratio);
|
|
141
|
+
call.resolve();
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
private boolean ensureRunning(PluginCall call) {
|
|
145
|
+
if (!implementation.isRunning()) {
|
|
146
|
+
call.reject("Camera is not running", "NOT_RUNNING");
|
|
147
|
+
return false;
|
|
148
|
+
}
|
|
149
|
+
return true;
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
private CardScanner.Callback<Void> voidCallback(PluginCall call) {
|
|
153
|
+
return new CardScanner.Callback<>() {
|
|
154
|
+
@Override
|
|
155
|
+
public void onSuccess(Void result) {
|
|
156
|
+
call.resolve();
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
@Override
|
|
160
|
+
public void onError(String message, Exception e) {
|
|
161
|
+
call.reject(message, e);
|
|
162
|
+
}
|
|
163
|
+
};
|
|
164
|
+
}
|
|
165
|
+
}
|
|
@@ -8,35 +8,52 @@ import android.graphics.RectF;
|
|
|
8
8
|
import android.os.SystemClock;
|
|
9
9
|
import android.view.View;
|
|
10
10
|
import androidx.annotation.Nullable;
|
|
11
|
+
import java.util.Collections;
|
|
12
|
+
import java.util.List;
|
|
11
13
|
|
|
12
14
|
/**
|
|
13
15
|
* Draws a red rectangle around the detected card. Sits between the camera
|
|
14
16
|
* preview and the (transparent) WebView, and maps frame coordinates the same
|
|
15
|
-
* way PreviewView's FILL_CENTER does.
|
|
17
|
+
* way PreviewView's FILL_CENTER does. In debug mode it also draws every object
|
|
18
|
+
* ML Kit found, labelled with its area/ratio (grey when rejected).
|
|
16
19
|
*/
|
|
17
20
|
public class DetectionOverlay extends View {
|
|
18
21
|
|
|
19
22
|
/** Keep the rectangle this long after the card was last seen, to avoid flicker. */
|
|
20
23
|
private static final long HIDE_AFTER_MS = 300;
|
|
21
24
|
|
|
22
|
-
private final Paint
|
|
25
|
+
private final Paint cardPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
|
|
26
|
+
private final Paint rejectedPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
|
|
27
|
+
private final Paint labelPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
|
|
23
28
|
private final float radius;
|
|
29
|
+
private final float labelPadding;
|
|
24
30
|
private final RectF drawRect = new RectF();
|
|
25
31
|
|
|
26
32
|
@Nullable
|
|
27
|
-
private RectF
|
|
33
|
+
private RectF card;
|
|
34
|
+
private List<CardDetector.Candidate> candidates = Collections.emptyList();
|
|
28
35
|
private int frameWidth;
|
|
29
36
|
private int frameHeight;
|
|
30
37
|
private boolean mirror;
|
|
31
|
-
private long
|
|
38
|
+
private long lastCardAt;
|
|
32
39
|
|
|
33
40
|
public DetectionOverlay(Context context) {
|
|
34
41
|
super(context);
|
|
35
42
|
float density = context.getResources().getDisplayMetrics().density;
|
|
36
43
|
radius = 8 * density;
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
44
|
+
labelPadding = 4 * density;
|
|
45
|
+
|
|
46
|
+
cardPaint.setColor(Color.RED);
|
|
47
|
+
cardPaint.setStyle(Paint.Style.STROKE);
|
|
48
|
+
cardPaint.setStrokeWidth(3 * density);
|
|
49
|
+
|
|
50
|
+
rejectedPaint.setColor(Color.argb(200, 180, 180, 180));
|
|
51
|
+
rejectedPaint.setStyle(Paint.Style.STROKE);
|
|
52
|
+
rejectedPaint.setStrokeWidth(2 * density);
|
|
53
|
+
|
|
54
|
+
labelPaint.setColor(Color.WHITE);
|
|
55
|
+
labelPaint.setTextSize(13 * density);
|
|
56
|
+
labelPaint.setShadowLayer(3 * density, 0, 0, Color.BLACK);
|
|
40
57
|
}
|
|
41
58
|
|
|
42
59
|
public void setMirror(boolean mirror) {
|
|
@@ -44,28 +61,44 @@ public class DetectionOverlay extends View {
|
|
|
44
61
|
}
|
|
45
62
|
|
|
46
63
|
/** Must be called on the UI thread. */
|
|
47
|
-
public void
|
|
64
|
+
public void setDetections(@Nullable RectF card, List<CardDetector.Candidate> candidates, int frameWidth, int frameHeight) {
|
|
48
65
|
long now = SystemClock.uptimeMillis();
|
|
49
|
-
if (
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
66
|
+
if (card != null) {
|
|
67
|
+
lastCardAt = now;
|
|
68
|
+
this.card = card;
|
|
69
|
+
} else if (now - lastCardAt >= HIDE_AFTER_MS) {
|
|
70
|
+
this.card = null;
|
|
53
71
|
}
|
|
54
|
-
this.
|
|
72
|
+
this.candidates = candidates;
|
|
55
73
|
this.frameWidth = frameWidth;
|
|
56
74
|
this.frameHeight = frameHeight;
|
|
57
75
|
invalidate();
|
|
58
76
|
}
|
|
59
77
|
|
|
60
78
|
public void clear() {
|
|
61
|
-
|
|
79
|
+
card = null;
|
|
80
|
+
candidates = Collections.emptyList();
|
|
62
81
|
invalidate();
|
|
63
82
|
}
|
|
64
83
|
|
|
65
84
|
@Override
|
|
66
85
|
protected void onDraw(Canvas canvas) {
|
|
67
|
-
if (
|
|
86
|
+
if (frameWidth == 0 || frameHeight == 0) return;
|
|
87
|
+
|
|
88
|
+
for (CardDetector.Candidate c : candidates) {
|
|
89
|
+
map(c.box);
|
|
90
|
+
canvas.drawRoundRect(drawRect, radius, radius, c.rejectedBy == null ? cardPaint : rejectedPaint);
|
|
91
|
+
canvas.drawText(c.label(), drawRect.left + labelPadding, drawRect.top - labelPadding, labelPaint);
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
if (card != null) {
|
|
95
|
+
map(card);
|
|
96
|
+
canvas.drawRoundRect(drawRect, radius, radius, cardPaint);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
68
99
|
|
|
100
|
+
/** Maps a normalized frame rectangle into drawRect, in view coordinates. */
|
|
101
|
+
private void map(RectF box) {
|
|
69
102
|
float vw = getWidth();
|
|
70
103
|
float vh = getHeight();
|
|
71
104
|
float scale = Math.max(vw / frameWidth, vh / frameHeight);
|
|
@@ -77,6 +110,5 @@ public class DetectionOverlay extends View {
|
|
|
77
110
|
float left = mirror ? 1f - box.right : box.left;
|
|
78
111
|
float right = mirror ? 1f - box.left : box.right;
|
|
79
112
|
drawRect.set(dx + left * sw, dy + box.top * sh, dx + right * sw, dy + box.bottom * sh);
|
|
80
|
-
canvas.drawRoundRect(drawRect, radius, radius, paint);
|
|
81
113
|
}
|
|
82
114
|
}
|
package/dist/docs.json
CHANGED
|
@@ -396,6 +396,18 @@
|
|
|
396
396
|
"docs": "Only read text when a card-shaped object is visible. When false, the whole\nframe is read if no card is found.",
|
|
397
397
|
"complexTypes": [],
|
|
398
398
|
"type": "boolean | undefined"
|
|
399
|
+
},
|
|
400
|
+
{
|
|
401
|
+
"name": "debug",
|
|
402
|
+
"tags": [
|
|
403
|
+
{
|
|
404
|
+
"text": "false",
|
|
405
|
+
"name": "default"
|
|
406
|
+
}
|
|
407
|
+
],
|
|
408
|
+
"docs": "Draw every object found, labelled with its area (`a`) and width/height\nratio (`r`): red when accepted as a card, grey when rejected (with the\nfilter that rejected it). Use it to tune the filters above.",
|
|
409
|
+
"complexTypes": [],
|
|
410
|
+
"type": "boolean | undefined"
|
|
399
411
|
}
|
|
400
412
|
]
|
|
401
413
|
},
|
|
@@ -76,6 +76,13 @@ export interface DetectionOptions {
|
|
|
76
76
|
* @default true
|
|
77
77
|
*/
|
|
78
78
|
requireCard?: boolean;
|
|
79
|
+
/**
|
|
80
|
+
* Draw every object found, labelled with its area (`a`) and width/height
|
|
81
|
+
* ratio (`r`): red when accepted as a card, grey when rejected (with the
|
|
82
|
+
* filter that rejected it). Use it to tune the filters above.
|
|
83
|
+
* @default false
|
|
84
|
+
*/
|
|
85
|
+
debug?: boolean;
|
|
79
86
|
}
|
|
80
87
|
/** Normalized rectangle (0-1). */
|
|
81
88
|
export interface Box {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import type { PermissionState, PluginListenerHandle } from '@capacitor/core';\n\nexport type CameraPosition = 'rear' | 'front';\n\nexport interface StartOptions {\n /**\n * Which camera to use.\n * @default 'rear'\n */\n position?: CameraPosition;\n}\n\nexport interface CaptureOptions {\n /**\n * JPEG quality (0-100).\n * @default 85\n */\n quality?: number;\n}\n\nexport interface CaptureResult {\n /** Base64 encoded JPEG (without the `data:` prefix). */\n base64: string;\n width: number;\n height: number;\n}\n\nexport interface TorchOptions {\n enabled: boolean;\n}\n\nexport interface ZoomOptions {\n /** Zoom ratio, clamped between the camera's min and max. */\n ratio: number;\n}\n\nexport interface PermissionStatus {\n camera: PermissionState;\n}\n\nexport interface DetectionOptions {\n /**\n * Minimum time between two OCR runs, in milliseconds.\n * The red rectangle is updated on every frame regardless.\n * @default 300\n */\n intervalMs?: number;\n /**\n * How many consecutive OCR runs must read the same card before\n * `cardDetected` fires.\n * @default 2\n */\n stableFrames?: number;\n /**\n * Include a JPEG of the detected card in the event.\n * @default false\n */\n includeImage?: boolean;\n /**\n * Expected width / height of an upright card. Only upright cards are\n * detected; a card lying sideways falls outside the tolerance.\n * @default 0.716 (63 x 88 mm)\n */\n cardAspectRatio?: number;\n /**\n * Allowed relative deviation from `cardAspectRatio` (0.15 = ±15%).\n * Increase it if tilted cards are not detected.\n * @default 0.15\n */\n aspectTolerance?: number;\n /**\n * Smallest card size, as a fraction of the camera frame (0-1).\n * @default 0.08\n */\n minCardArea?: number;\n /**\n * Largest card size, as a fraction of the camera frame (0-1).\n * @default 0.9\n */\n maxCardArea?: number;\n /**\n * Only read text when a card-shaped object is visible. When false, the whole\n * frame is read if no card is found.\n * @default true\n */\n requireCard?: boolean;\n}\n\n/** Normalized rectangle (0-1). */\nexport interface Box {\n x: number;\n y: number;\n width: number;\n height: number;\n}\n\nexport interface TextLine {\n text: string;\n /** Position inside the card image. */\n box: Box;\n}\n\nexport interface CardDetectedEvent {\n /** Best guess for the card name (topmost line of text on the card). */\n name?: string;\n /** Collector number, e.g. `025/165`. */\n collectorNumber?: string;\n /** All text read on the card. */\n text: string;\n lines: TextLine[];\n /** Where the card is in the camera frame. Missing if no card outline was found. */\n cardBox?: Box;\n /** Base64 JPEG of the card, when `includeImage` is true. */\n image?: string;\n}\n\nexport interface CardScannerPlugin {\n /**\n * Opens the camera **behind** the WebView. The WebView background is made\n * transparent, so the HTML page must also use transparent backgrounds\n * where the camera should be visible.\n */\n start(options?: StartOptions): Promise<void>;\n\n /** Stops the camera and removes the preview. */\n stop(): Promise<void>;\n\n /** Takes a photo from the running camera. */\n capture(options?: CaptureOptions): Promise<CaptureResult>;\n\n /** Turns the flashlight on/off. */\n setTorch(options: TorchOptions): Promise<void>;\n\n /** Sets the zoom ratio. */\n setZoom(options: ZoomOptions): Promise<void>;\n\n /** Switches between the rear and front camera. */\n flip(): Promise<void>;\n\n /**\n * Starts looking for cards: draws a red rectangle around the card and reads\n * its text, emitting `cardDetected`. Requires `start()` first. Android only.\n */\n startDetection(options?: DetectionOptions): Promise<void>;\n\n /** Stops card detection and hides the rectangle. */\n stopDetection(): Promise<void>;\n\n /** Fired once per card, when its text has been read consistently. */\n addListener(eventName: 'cardDetected', listener: (event: CardDetectedEvent) => void): Promise<PluginListenerHandle>;\n\n removeAllListeners(): Promise<void>;\n\n checkPermissions(): Promise<PermissionStatus>;\n\n requestPermissions(): Promise<PermissionStatus>;\n}\n"]}
|
|
1
|
+
{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import type { PermissionState, PluginListenerHandle } from '@capacitor/core';\n\nexport type CameraPosition = 'rear' | 'front';\n\nexport interface StartOptions {\n /**\n * Which camera to use.\n * @default 'rear'\n */\n position?: CameraPosition;\n}\n\nexport interface CaptureOptions {\n /**\n * JPEG quality (0-100).\n * @default 85\n */\n quality?: number;\n}\n\nexport interface CaptureResult {\n /** Base64 encoded JPEG (without the `data:` prefix). */\n base64: string;\n width: number;\n height: number;\n}\n\nexport interface TorchOptions {\n enabled: boolean;\n}\n\nexport interface ZoomOptions {\n /** Zoom ratio, clamped between the camera's min and max. */\n ratio: number;\n}\n\nexport interface PermissionStatus {\n camera: PermissionState;\n}\n\nexport interface DetectionOptions {\n /**\n * Minimum time between two OCR runs, in milliseconds.\n * The red rectangle is updated on every frame regardless.\n * @default 300\n */\n intervalMs?: number;\n /**\n * How many consecutive OCR runs must read the same card before\n * `cardDetected` fires.\n * @default 2\n */\n stableFrames?: number;\n /**\n * Include a JPEG of the detected card in the event.\n * @default false\n */\n includeImage?: boolean;\n /**\n * Expected width / height of an upright card. Only upright cards are\n * detected; a card lying sideways falls outside the tolerance.\n * @default 0.716 (63 x 88 mm)\n */\n cardAspectRatio?: number;\n /**\n * Allowed relative deviation from `cardAspectRatio` (0.15 = ±15%).\n * Increase it if tilted cards are not detected.\n * @default 0.15\n */\n aspectTolerance?: number;\n /**\n * Smallest card size, as a fraction of the camera frame (0-1).\n * @default 0.08\n */\n minCardArea?: number;\n /**\n * Largest card size, as a fraction of the camera frame (0-1).\n * @default 0.9\n */\n maxCardArea?: number;\n /**\n * Only read text when a card-shaped object is visible. When false, the whole\n * frame is read if no card is found.\n * @default true\n */\n requireCard?: boolean;\n /**\n * Draw every object found, labelled with its area (`a`) and width/height\n * ratio (`r`): red when accepted as a card, grey when rejected (with the\n * filter that rejected it). Use it to tune the filters above.\n * @default false\n */\n debug?: boolean;\n}\n\n/** Normalized rectangle (0-1). */\nexport interface Box {\n x: number;\n y: number;\n width: number;\n height: number;\n}\n\nexport interface TextLine {\n text: string;\n /** Position inside the card image. */\n box: Box;\n}\n\nexport interface CardDetectedEvent {\n /** Best guess for the card name (topmost line of text on the card). */\n name?: string;\n /** Collector number, e.g. `025/165`. */\n collectorNumber?: string;\n /** All text read on the card. */\n text: string;\n lines: TextLine[];\n /** Where the card is in the camera frame. Missing if no card outline was found. */\n cardBox?: Box;\n /** Base64 JPEG of the card, when `includeImage` is true. */\n image?: string;\n}\n\nexport interface CardScannerPlugin {\n /**\n * Opens the camera **behind** the WebView. The WebView background is made\n * transparent, so the HTML page must also use transparent backgrounds\n * where the camera should be visible.\n */\n start(options?: StartOptions): Promise<void>;\n\n /** Stops the camera and removes the preview. */\n stop(): Promise<void>;\n\n /** Takes a photo from the running camera. */\n capture(options?: CaptureOptions): Promise<CaptureResult>;\n\n /** Turns the flashlight on/off. */\n setTorch(options: TorchOptions): Promise<void>;\n\n /** Sets the zoom ratio. */\n setZoom(options: ZoomOptions): Promise<void>;\n\n /** Switches between the rear and front camera. */\n flip(): Promise<void>;\n\n /**\n * Starts looking for cards: draws a red rectangle around the card and reads\n * its text, emitting `cardDetected`. Requires `start()` first. Android only.\n */\n startDetection(options?: DetectionOptions): Promise<void>;\n\n /** Stops card detection and hides the rectangle. */\n stopDetection(): Promise<void>;\n\n /** Fired once per card, when its text has been read consistently. */\n addListener(eventName: 'cardDetected', listener: (event: CardDetectedEvent) => void): Promise<PluginListenerHandle>;\n\n removeAllListeners(): Promise<void>;\n\n checkPermissions(): Promise<PermissionStatus>;\n\n requestPermissions(): Promise<PermissionStatus>;\n}\n"]}
|