github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-07 05:16:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add camera picker button

Browse Source
This commit is contained in:
Michael Frikke Madsen 2020-04-13 19:29:14 +02:00
parent 6f4769a7b3
commit d5ecc0c9c5
1 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
public/viewjs/components/barcodescanner.js
View File

@ -1,6 +1,6 @@
Grocy.Components.BarcodeScanner = { }; Grocy.Components.BarcodeScanner = { };
Grocy.Components.BarcodeScanner.CheckCapabilities = function() Grocy.Components.BarcodeScanner.CheckCapabilities = async function()
{ {
var track = Quagga.CameraAccess.getActiveTrack(); var track = Quagga.CameraAccess.getActiveTrack();
var capabilities = {}; var capabilities = {};
@ -8,6 +8,13 @@ Grocy.Components.BarcodeScanner.CheckCapabilities = function()
capabilities = track.getCapabilities(); capabilities = track.getCapabilities();
} }
// If there is only 1 camera, hide the camera select button
var cameras = await Quagga.CameraAccess.enumerateVideoDevices();
var cameraPickerButton = document.querySelector('.cameraPicker');
if (cameraPickerButton) {
cameraPickerButton.style.display = cameras.length > 1 ? 'inline-block' : 'none';
}
// Check if the camera is capable to turn on a torch. // Check if the camera is capable to turn on a torch.
var canTorch = typeof capabilities.torch === 'boolean' && capabilities.torch var canTorch = typeof capabilities.torch === 'boolean' && capabilities.torch
// Remove the torch button, if either the device can not torch or AutoTorchOn is set. // Remove the torch button, if either the device can not torch or AutoTorchOn is set.
@ -48,7 +55,8 @@ Grocy.Components.BarcodeScanner.StartScanning = function()
type: "LiveStream", type: "LiveStream",
target: document.querySelector("#barcodescanner-livestream"), target: document.querySelector("#barcodescanner-livestream"),
constraints: { constraints: {
facingMode: "environment" facingMode: "environment",
...(window.localStorage.getItem('cameraId') && {deviceId : window.localStorage.getItem('cameraId')}) // If preferred cameraId is set, request to use that specific camera
} }
}, },
locator: { locator: {
@ -99,6 +107,7 @@ Grocy.Components.BarcodeScanner.StartScanning = function()
{ {
Grocy.FrontendHelpers.ShowGenericError("Error while initializing the barcode scanning library", error.message); Grocy.FrontendHelpers.ShowGenericError("Error while initializing the barcode scanning library", error.message);
toastr.info(__t("Camera access is only possible when supported and allowed by your browser and when grocy is served via a secure (https://) connection")); toastr.info(__t("Camera access is only possible when supported and allowed by your browser and when grocy is served via a secure (https://) connection"));
window.localStorage.removeItem("cameraId");
setTimeout(function() setTimeout(function()
{ {
bootbox.hideAll(); bootbox.hideAll();
@ -184,7 +193,7 @@ Quagga.onProcessed(function(result)
} }
}); });
$(document).on("click", "#barcodescanner-start-button", function(e) $(document).on("click", "#barcodescanner-start-button", async function(e)
{ {
e.preventDefault(); e.preventDefault();
var inputElement = $(e.currentTarget).prev(); var inputElement = $(e.currentTarget).prev();
@ -197,6 +206,8 @@ $(document).on("click", "#barcodescanner-start-button", function(e)
Grocy.Components.BarcodeScanner.CurrentTarget = inputElement.attr("data-target"); Grocy.Components.BarcodeScanner.CurrentTarget = inputElement.attr("data-target");
var cameras = await Quagga.CameraAccess.enumerateVideoDevices();
bootbox.dialog({ bootbox.dialog({
message: '<div id="barcodescanner-container" class="col"><div id="barcodescanner-livestream"></div></div>', message: '<div id="barcodescanner-container" class="col"><div id="barcodescanner-livestream"></div></div>',
title: __t('Scan a barcode'), title: __t('Scan a barcode'),
@ -208,6 +219,34 @@ $(document).on("click", "#barcodescanner-start-button", function(e)
backdrop: true, backdrop: true,
closeButton: true, closeButton: true,
buttons: { buttons: {
cameraPicker: {
label: 'Camera Picker',
className: 'btn-secondary responsive-button cameraPicker',
// When clicking the camera picker button, open a second prompt and populate it with a list of cameras to choose from
callback: function()
{
bootbox.prompt({
title: "Pick a camera",
inputType: 'select',
value: window.localStorage.getItem('cameraId'),
inputOptions: cameras.map(camera => {
const cameraSelect = {};
cameraSelect.text = camera.label ? camera.label : camera.deviceId; // Use camera label if it exists, else show device id
cameraSelect.value = camera.deviceId;
return cameraSelect;
}),
// When new camera is picked, re-initialise scanning so it picks up the new camera choice
callback: function (result) {
if ( result ) {
window.localStorage.setItem('cameraId', result);
Quagga.stop();
Grocy.Components.BarcodeScanner.StartScanning();
}
}
});
return false;
}
},
torch: { torch: {
label: '<i class="far fa-lightbulb"></i>', label: '<i class="far fa-lightbulb"></i>',
className: 'btn-warning responsive-button torch', className: 'btn-warning responsive-button torch',
@ -219,7 +258,7 @@ $(document).on("click", "#barcodescanner-start-button", function(e)
}, },
cancel: { cancel: {
label: __t('Cancel'), label: __t('Cancel'),
className: 'btn-secondary responsive-button', className: 'btn-danger responsive-button',
callback: function() callback: function()
{ {
Grocy.Components.BarcodeScanner.StopScanning(); Grocy.Components.BarcodeScanner.StopScanning();