Skip to content

fix windows 10 bugs #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MarcMenghin wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix windows 10 bugs #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7fcdb9
fix windows 10 (and phone) crash as camera is not ready to create a p…
MarcMenghin Jun 26, 2018
5bf3c7f
fix a NullPointerException if camera doesn't have an EnclosureLocatio…
MarcMenghin Jun 26, 2018
e5c185c
fix light can never be disabled after enabling it on windows phone
MarcMenghin Jun 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/windows/QRReader/Reader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,17 @@ private async Task<Result> GetCameraImage(CancellationToken cancelToken)

var videoFrameConfig = new VideoFrame(BitmapPixelFormat.Bgra8, (int)previewProperties.Width, (int)previewProperties.Height);

var videoFrame = await capture.GetPreviewFrameAsync(videoFrameConfig);


var result =
VideoFrame videoFrame;
try
{
videoFrame = await capture.GetPreviewFrameAsync(videoFrameConfig);
}
catch (Exception ex)
{
return null; //device not ready
}

var result =
await
Task.Run(
() => barcodeReader.Decode(videoFrame.SoftwareBitmap),
Expand Down
9 changes: 7 additions & 2 deletions src/windows/QRReader/VideoCapture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,14 @@ private static async Task<CameraSet> GetCameras()
throw new Exception("No cameras found");
}

var backCamera = cameras.FirstOrDefault((camera) => camera.IsEnabled && camera.EnclosureLocation.Panel == Panel.Back);
var frontCamera = cameras.FirstOrDefault((camera) => camera.IsEnabled && camera.EnclosureLocation.Panel == Panel.Front);
var backCamera = cameras.FirstOrDefault((camera) => camera.IsEnabled && camera.EnclosureLocation?.Panel == Panel.Back);
var frontCamera = cameras.FirstOrDefault((camera) => camera.IsEnabled && camera.EnclosureLocation?.Panel == Panel.Front);

if (backCamera == null && frontCamera == null)
{
backCamera = cameras.FirstOrDefault(information => information.IsEnabled);
}

return new CameraSet
{
Back = backCamera?.Id ?? "",
Expand Down
11 changes: 7 additions & 4 deletions src/windows/lib/qrScanner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,10 @@ qrScanner.enableLight = function () {
return init().then(function () {
if (statusFlags.lightEnabled) {
return generateStatusResponse();
}
}

statusFlags.lightEnabled = currentVideoCapture.enableLight();
currentVideoCapture.enableLight();
statusFlags.lightEnabled = true;

if (!statusFlags.lightEnabled) {
return Promise.wrapError(errorTypes.LIGHT_UNAVAILABLE);
Expand All @@ -248,8 +249,10 @@ qrScanner.enableLight = function () {
qrScanner.disableLight = function () {

if (statusFlags.lightEnabled) {
currentVideoCapture.disableLight();
}
currentVideoCapture.disableLight();

statusFlags.lightEnabled = false;
}

return generateStatusResponse();

Expand Down