Skip to content

Commit faefb9c

Browse files
Fix capacitor detection method, aruco-rs path and remove scan timeout.
1 parent 71f30ed commit faefb9c

4 files changed

Lines changed: 4 additions & 18 deletions

File tree

public/app/js/argrid-scanner.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ const ArGridScanner = {
123123

124124
async _initArucoRs() {
125125
try {
126-
const mod = await import('/app/argrid/aruco_rs.js');
126+
const mod = await import('../argrid/aruco_rs.js');
127127
await mod.default();
128128
this.arucoRsDetector = new mod.ARucoDetector('ARUCO');
129129
this._arucoModule = mod;
@@ -1644,15 +1644,6 @@ const ArGridScanner = {
16441644
}
16451645
}
16461646

1647-
// Timeout
1648-
if (Date.now() - this.scanStartTime > this.SCAN_TIMEOUT_MS) {
1649-
if (this._onStatusUpdate) {
1650-
this._onStatusUpdate({ timeout: true, message: 'Таймаут сканирования' });
1651-
}
1652-
this.stop();
1653-
return;
1654-
}
1655-
16561647
// Already decoded
16571648
if (this.decodeComplete) return;
16581649

public/app/js/matrix-receiver.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ const MatrixReceiver = {
271271
}
272272

273273
// ===== FALLBACK: ArUco WASM detector =====
274-
const mod = await import('/app/argrid/aruco_rs.js');
274+
const mod = await import('../argrid/aruco_rs.js');
275275
await mod.default();
276276

277277
try {

public/app/js/receiver.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,11 +1108,6 @@ const Receiver = {
11081108
this.state.argridStatus = 'ArGRID: ' + mk + '/' + exp + ' (' + info.gridInfo + ')';
11091109
} else if (info.searching) {
11101110
this.state.argridStatus = 'ArGRID: поиск маркеров...';
1111-
} else if (info.timeout) {
1112-
this.state.argridStatus = 'Таймаут сканирования';
1113-
this._scanning = false;
1114-
this.state.status = 'idle';
1115-
this.updateUI();
11161111
}
11171112
this.updateScanStatus();
11181113
},
@@ -2012,7 +2007,7 @@ const Receiver = {
20122007

20132008
// Smart download: native app (Capacitor) uses Filesystem + Share,
20142009
// browser falls back to the classic <a download> logic.
2015-
if (window.Capacitor && window.Capacitor.isNative) {
2010+
if (window.Capacitor && typeof window.Capacitor.isNativePlatform === 'function' && window.Capacitor.isNativePlatform()) {
20162011
// Весь async-поток обёрнут в try/catch, иначе ошибки из
20172012
// onloadend/Filesystem/Share уходят в unhandled rejection и
20182013
// Android WebView глушит их молча (кажется, что ничего не происходит).

public/app/js/video-exporter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ const VideoExporter = {
948948
downloadBlob(blob, filename) {
949949
// Smart download: native app (Capacitor) uses Filesystem + Share,
950950
// browser falls back to the classic <a download> logic.
951-
if (window.Capacitor && window.Capacitor.isNative) {
951+
if (window.Capacitor && typeof window.Capacitor.isNativePlatform === 'function' && window.Capacitor.isNativePlatform()) {
952952
// Весь async-поток обёрнут в try/catch, иначе ошибки из
953953
// onloadend/Filesystem/Share уходят в unhandled rejection и
954954
// Android WebView глушит их молча (кажется, что ничего не происходит).

0 commit comments

Comments
 (0)