Skip to content

fixed bindable IsScanning property to be settable multiple times (#496) #736

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

Merged
Redth merged 4 commits into from
Dec 13, 2018
Merged

fixed bindable IsScanning property to be settable multiple times (#496) #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18aec79
fixed bindable IsScanning property to be settable multiple times
PaulVrugt May 30, 2018
ab0c58c
avoid duplicate camera setup
PaulVrugt May 30, 2018
97107ea
Set visibility to fix freeze bug on android 7
CNouws Sep 26, 2018
cf53743
Merge pull request #1 from CNouws/master
PaulVrugt Sep 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
23 changes: 17 additions & 6 deletions Source/ZXing.Net.Mobile.Android/CameraAccess/CameraAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public class CameraAnalyzer
private DateTime _lastPreviewAnalysis = DateTime.UtcNow;
private bool _wasScanned;
IScannerSessionHost _scannerHost;
private bool _cameraSetup;

public CameraAnalyzer(SurfaceView surfaceView, IScannerSessionHost scannerHost)
{
Expand Down Expand Up @@ -41,15 +42,23 @@ public void ResumeAnalysis()

public void ShutdownCamera()
{
IsAnalyzing = false;
_cameraEventListener.OnPreviewFrameReady -= HandleOnPreviewFrameReady;
_cameraController.ShutdownCamera();
if (_cameraSetup)
{
IsAnalyzing = false;
_cameraEventListener.OnPreviewFrameReady -= HandleOnPreviewFrameReady;
_cameraController.ShutdownCamera();
_cameraSetup = false;
}
}

public void SetupCamera()
{
_cameraEventListener.OnPreviewFrameReady += HandleOnPreviewFrameReady;
_cameraController.SetupCamera();
if (!_cameraSetup)
{
_cameraEventListener.OnPreviewFrameReady += HandleOnPreviewFrameReady;
_cameraController.SetupCamera();
_cameraSetup = true;
}
}

public void AutoFocus()
Expand All @@ -64,7 +73,9 @@ public void AutoFocus(int x, int y)

public void RefreshCamera()
{
_cameraController.RefreshCamera();
//only refresh the camera if it is actually setup
if(_cameraSetup)
_cameraController.RefreshCamera();
}

private bool CanAnalyzeFrame
Expand Down
20 changes: 15 additions & 5 deletions Source/ZXing.Net.Mobile.Android/ZXingSurfaceView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,13 @@ private void Init()

public async void SurfaceCreated(ISurfaceHolder holder)
{
await ZXing.Net.Mobile.Android.PermissionsHandler.PermissionRequestTask;

_cameraAnalyzer.SetupCamera();

_surfaceCreated = true;
//avoid duplicate setups, forcing the camera to be setup even when the camera was not scanning (this can happen when resuming the app)
if (!_surfaceCreated)
{
await ZXing.Net.Mobile.Android.PermissionsHandler.PermissionRequestTask;
_cameraAnalyzer.SetupCamera();
_surfaceCreated = true;
}
}

public async void SurfaceChanged(ISurfaceHolder holder, Format format, int wx, int hx)
Expand Down Expand Up @@ -98,6 +100,12 @@ public void AutoFocus(int x, int y)

public void StartScanning(Action<Result> scanResultCallback, MobileBarcodeScanningOptions options = null)
{
//fix Android 7 bug: camera freezes because surfacedestroyed function isn't always called correct, the old surfaceview was still visible.
this.Visibility = ViewStates.Visible;

//make sure the camera is setup
_cameraAnalyzer.SetupCamera();

ScanningOptions = options ?? MobileBarcodeScanningOptions.Default;

_cameraAnalyzer.BarcodeFound += (sender, result) =>
Expand All @@ -110,6 +118,8 @@ public void StartScanning(Action<Result> scanResultCallback, MobileBarcodeScanni
public void StopScanning()
{
_cameraAnalyzer.ShutdownCamera();
//fix Android 7 bug: camera freezes because surfacedestroyed function isn't always called correct, the old surfaceview was still visible.
this.Visibility = ViewStates.Gone;
}

public void PauseAnalysis()
Expand Down