taolin/cordova-plugin-cszbar-jsg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull Request cleanup (#16): Reinstated old interval autofocus bahaviour on Android API Level < 14 (plus minor blank line formatting)

Browse Source
This commit is contained in:
TJ Woon 2015-04-19 23:58:45 +08:00
parent fc6e2ff07c
commit a70a9bcb03
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/ZBarScannerActivity.java
View File

@ -253,6 +253,7 @@ implements SurfaceHolder.Callback {
} }
// Continuously auto-focus ----------------------------------------- // Continuously auto-focus -----------------------------------------
// For API Level < 14
private AutoFocusCallback autoFocusCb = new AutoFocusCallback() private AutoFocusCallback autoFocusCb = new AutoFocusCallback()
{ {
@ -385,11 +386,14 @@ implements SurfaceHolder.Callback {
camera.setPreviewDisplay(holder); camera.setPreviewDisplay(holder);
camera.setPreviewCallback(previewCb); camera.setPreviewCallback(previewCb);
camera.startPreview(); camera.startPreview();
//camera.autoFocus(autoFocusCb); // We are not using any of the
if (android.os.Build.VERSION.SDK_INT >= 14) {
camera.autoFocus(autoFocusCb); // We are not using any of the
// continuous autofocus modes as that does not seem to work // continuous autofocus modes as that does not seem to work
// well with flash setting of "on"... At least with this // well with flash setting of "on"... At least with this
// simple and stupid focus method, we get to turn the flash // simple and stupid focus method, we get to turn the flash
// on during autofocus. // on during autofocus.
}
} catch (IOException e) { } catch (IOException e) {
die("Could not start camera preview: " + e.getMessage()); die("Could not start camera preview: " + e.getMessage());
} }