Skip to content
Snippets Groups Projects
Commit fabd8d6b authored by Vitaliy Vashchenko's avatar Vitaliy Vashchenko
Browse files

#558 Closing camera on back button pressed and on pausing Tablexia.

parent 7294c1c2
Branches
No related merge requests found
......@@ -36,7 +36,7 @@ public class AndroidQRCodeScanner extends QRCodeScanner implements Camera.Previe
@Override
public void onPreviewFrame(byte[] bytes, Camera camera) {
// TODO: 6.10.16 handle pause restore application or at least close camera view on pause
// TODO: 14.10.16 Reduce size of scanning area
if (isScanningEnabled()) {
int width = camera.getParameters().getPreviewSize().width;
int height = camera.getParameters().getPreviewSize().height;
......@@ -87,6 +87,7 @@ public class AndroidQRCodeScanner extends QRCodeScanner implements Camera.Previe
@Override
public void onCameraPreviewStarted() {
if (isCameraPreviewActive()) stopPreview();
prepareCameraAsync();
if (!cameraReady) {
......@@ -104,7 +105,7 @@ public class AndroidQRCodeScanner extends QRCodeScanner implements Camera.Previe
private synchronized void startPreviewAsync() {
Runnable r = new Runnable() {
public void run() {
preparePreview();
startPreview();
}
};
activity.post(r);
......@@ -141,7 +142,7 @@ public class AndroidQRCodeScanner extends QRCodeScanner implements Camera.Previe
}
}
private void preparePreview() {
private void startPreview() {
if (cameraSurface != null && cameraSurface.getCamera() != null) {
Log.debug(getClass().getSimpleName(), "startPreview");
cameraSurface.getCamera().setPreviewCallback(this);
......
......@@ -308,9 +308,21 @@ public class LoaderScreen extends AbstractTablexiaScreen<Void> {
@Override
public void backButtonPressed() {
Gdx.app.exit();
if (Tablexia.hasQRCodeScanner() && Tablexia.getQRCodeScanner().isCameraPreviewActive()) {
Tablexia.getQRCodeScanner().stopCameraPreview();
}else {
Gdx.app.exit();
}
}
@Override
public void pause() {
super.pause();
if (Tablexia.hasQRCodeScanner() && Tablexia.getQRCodeScanner().isCameraPreviewActive()) {
Tablexia.getQRCodeScanner().stopCameraPreview();
}
}
public void prepareLoadingBar() {
//Skin for LoadingBar
LoadingBar.LoadingBarSkin skin = new LoadingBar.LoadingBarSkin(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment