mirror of
https://github.com/yugasun/qrcode-decoder.git
synced 2026-08-13 21:12:02 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 yugasun
|
a5cd17b951 | ||
|
yugasun
|
615081cc95 | ||
|
yugasun
|
7d77236fc0 |
@@ -9,3 +9,5 @@ tsconfig.tsbuildinfo
|
||||
coverage
|
||||
yarn.lock
|
||||
.rpt2_cache
|
||||
|
||||
demo/lib/index.min.js
|
||||
|
||||
+11
-2
@@ -1,11 +1,13 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
||||
<title>QrcodeDecoder - Camera</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<button id="start">Start</button> <button id="stop">Stop</button><br />
|
||||
<span id="result">Click start to scan qrcode.</span><br />
|
||||
@@ -13,7 +15,7 @@
|
||||
<video id="video" autoplay></video>
|
||||
|
||||
<script src="./lib/vconsole.min.js"></script>
|
||||
<script src="./index.min.js"></script>
|
||||
<script src="./lib/index.min.js"></script>
|
||||
<script type="text/javascript">
|
||||
var vConsole = new VConsole();
|
||||
console.log('Hello world');
|
||||
@@ -29,7 +31,13 @@
|
||||
throw new Error('Canvas and getUserMedia are required');
|
||||
}
|
||||
|
||||
let code = await qr.decodeFromCamera(video);
|
||||
let code = await qr.decodeFromCamera(video,
|
||||
// you can customize your camera size like below
|
||||
// {
|
||||
// width: 400,
|
||||
// height: 400,
|
||||
// }
|
||||
);
|
||||
console.log('code', code);
|
||||
result.innerText = 'Result: ' + code.data;
|
||||
}
|
||||
@@ -42,4 +50,5 @@
|
||||
main();
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
+5
-3
@@ -1,11 +1,13 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
||||
<title>QrcodeDecoder - Image</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<section>
|
||||
<h3>Same domain image</h3>
|
||||
@@ -19,13 +21,12 @@
|
||||
<input
|
||||
id="img2"
|
||||
value="https://yugasun.com/static/wechat.jpg"
|
||||
style="width: 400px"
|
||||
/><br />
|
||||
style="width: 400px" /><br />
|
||||
<button id="decode2">Decode!</button><br />
|
||||
<span id="result2"></span><br />
|
||||
</section>
|
||||
<script src="./lib/vconsole.min.js"></script>
|
||||
<script src="./index.min.js"></script>
|
||||
<script src="./lib/index.min.js"></script>
|
||||
<script type="module">
|
||||
var vConsole = new VConsole();
|
||||
function main() {
|
||||
@@ -61,4 +62,5 @@
|
||||
};
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
Vendored
-1
File diff suppressed because one or more lines are too long
+4
-2
@@ -1,21 +1,22 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
||||
<title>QrcodeDecoder - Video</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<button id="start">Start</button> <button id="stop">Stop</button><br />
|
||||
<span id="result">Click start to scan qrcode.</span><br />
|
||||
|
||||
<video src="./assets/qrcode-video.mp4"></video>
|
||||
<script src="./lib/vconsole.min.js"></script>
|
||||
<script src="./index.min.js"></script>
|
||||
<script src="./lib/index.min.js"></script>
|
||||
<script type="text/javascript">
|
||||
var vConsole = new VConsole();
|
||||
console.log('Hello world');
|
||||
function main() {
|
||||
var video = document.querySelector('video');
|
||||
var result = document.querySelector('#result');
|
||||
@@ -40,4 +41,5 @@
|
||||
main();
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
+5
-3
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "qrcode-decoder",
|
||||
"version": "0.2.2",
|
||||
"version": "0.3.0",
|
||||
"description": "Tool for decoding qrcode",
|
||||
"main": "dist/index.js",
|
||||
"module": "dist/index.esm.js",
|
||||
@@ -11,9 +11,10 @@
|
||||
"prettier:fix": "prettier --write '**/*.{ts,tsx,md}' --config .prettierrc",
|
||||
"test": "jest",
|
||||
"codecov": "jest --coverage && codecov",
|
||||
"copy-file": "cp dist/index.min.js demo/",
|
||||
"copy-file": "cp dist/index.min.js demo/lib",
|
||||
"release": "git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags",
|
||||
"pages": "gh-pages -d demo --remote origin"
|
||||
"pages": "gh-pages -d demo --remote origin",
|
||||
"demo": "http-server demo -c-1"
|
||||
},
|
||||
"husky": {
|
||||
"hooks": {
|
||||
@@ -56,6 +57,7 @@
|
||||
"cross-env": "^6.0.3",
|
||||
"fancy-log": "^1.3.3",
|
||||
"gh-pages": "^3.1.0",
|
||||
"http-server": "^14.1.0",
|
||||
"husky": "^3.0.9",
|
||||
"jest": "^24.9.0",
|
||||
"lint-staged": "^9.5.0",
|
||||
|
||||
+2
-12
@@ -20,16 +20,6 @@ const plugins: rollup.Plugin[] = [
|
||||
commonjs(),
|
||||
typescript2({
|
||||
tsconfig: path.join(__dirname, '..', 'tsconfig.json'),
|
||||
typescript: ts, // ensure we're using the same typescript (3.x) for rollup as for regular builds etc
|
||||
tsconfigOverride: {
|
||||
module: 'esnext',
|
||||
stripInternal: true,
|
||||
emitDeclarationOnly: false,
|
||||
composite: false,
|
||||
declaration: false,
|
||||
declarationMap: false,
|
||||
sourceMap: false,
|
||||
},
|
||||
}),
|
||||
];
|
||||
|
||||
@@ -77,7 +67,7 @@ async function bundleAio() {
|
||||
uglify({
|
||||
compress: {
|
||||
drop_debugger: true,
|
||||
drop_console: true,
|
||||
drop_console: false,
|
||||
},
|
||||
}),
|
||||
],
|
||||
@@ -86,7 +76,7 @@ async function bundleAio() {
|
||||
file: 'dist/index.min.js',
|
||||
name: 'QrcodeDecoder',
|
||||
format: 'iife',
|
||||
sourcemap: false,
|
||||
sourcemap: true,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
+30
-7
@@ -1,6 +1,11 @@
|
||||
import { Options } from 'jsqr';
|
||||
import jsQR from 'jsqr';
|
||||
|
||||
const videoSize = {
|
||||
width: { min: 360, ideal: 720, max: 1080 },
|
||||
height: { min: 360, ideal: 720, max: 1080 },
|
||||
};
|
||||
|
||||
class QrcodeDecoder {
|
||||
timerCapture: null | NodeJS.Timeout;
|
||||
canvasElem: null | HTMLCanvasElement;
|
||||
@@ -19,7 +24,8 @@ class QrcodeDecoder {
|
||||
this.videoElem = null;
|
||||
this.getUserMediaHandler = null;
|
||||
this.videoConstraints = {
|
||||
video: true,
|
||||
// default use rear camera
|
||||
video: { ...videoSize, facingMode: { exact: 'environment' } },
|
||||
audio: false,
|
||||
};
|
||||
|
||||
@@ -149,7 +155,7 @@ class QrcodeDecoder {
|
||||
* inversionAttempts - (attemptBoth (default), dontInvert, onlyInvert, or invertFirst)
|
||||
* refer to jsqr options: https://github.com/cozmo/jsQR
|
||||
*/
|
||||
async decodeFromCamera(videoElem: HTMLVideoElement, options = {}) {
|
||||
async decodeFromCamera(videoElem: HTMLVideoElement, options: any = {}) {
|
||||
const opts = {
|
||||
...this.defaultOption,
|
||||
...options,
|
||||
@@ -160,10 +166,29 @@ class QrcodeDecoder {
|
||||
throw new Error("Couldn't get video from camera");
|
||||
}
|
||||
|
||||
let stream: MediaStream;
|
||||
try {
|
||||
const stream = await navigator.mediaDevices.getUserMedia(
|
||||
this.videoConstraints,
|
||||
);
|
||||
stream = await navigator.mediaDevices.getUserMedia(this.videoConstraints);
|
||||
} catch (e) {
|
||||
if ((e as OverconstrainedError).name === 'OverconstrainedError') {
|
||||
console.log('[OverconstrainedError] Can not use rear camera.');
|
||||
|
||||
stream = await navigator.mediaDevices.getUserMedia({
|
||||
video: {
|
||||
...videoSize,
|
||||
...{
|
||||
width: opts.width,
|
||||
height: opts.height,
|
||||
},
|
||||
},
|
||||
audio: false,
|
||||
});
|
||||
} else {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
if (stream) {
|
||||
videoElem.srcObject = stream;
|
||||
// videoElem.src = window.URL.createObjectURL(stream);
|
||||
this.videoElem = videoElem;
|
||||
@@ -171,8 +196,6 @@ class QrcodeDecoder {
|
||||
|
||||
const code = await this.decodeFromVideo(videoElem, opts);
|
||||
return code;
|
||||
} catch (e) {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user