mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switched back to the one shot preview mechanism and lowered the beep volume a bit.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1071 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2009-10-13 14:02:13 +00:00
parent 54084961c4
commit 3bf20cf82f
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/AndroidManifest.xml
View file

@ -20,8 +20,8 @@ version to be published. The next versionCode will be 7, regardless of whether t
versionName is 2.31, 2.4, or 3.0. --> versionName is 2.31, 2.4, or 3.0. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.zxing.client.android" package="com.google.zxing.client.android"
android:versionName="3.0 alpha2" android:versionName="3.0 alpha3"
android:versionCode="33"> android:versionCode="34">
<!-- Allows this app to run on Cupcake devices. --> <!-- Allows this app to run on Cupcake devices. -->
<uses-sdk android:minSdkVersion="3"/> <uses-sdk android:minSdkVersion="3"/>
<!-- Donut-specific flags which allow us to run on large and high dpi screens. --> <!-- Donut-specific flags which allow us to run on large and high dpi screens. -->

4
android/src/com/google/zxing/client/android/CameraManager.java
View file

@ -67,7 +67,6 @@ final class CameraManager {
*/ */
private final Camera.PreviewCallback previewCallback = new Camera.PreviewCallback() { private final Camera.PreviewCallback previewCallback = new Camera.PreviewCallback() {
public void onPreviewFrame(byte[] data, Camera camera) { public void onPreviewFrame(byte[] data, Camera camera) {
camera.setPreviewCallback(null);
if (previewHandler != null) { if (previewHandler != null) {
Message message = previewHandler.obtainMessage(previewMessage, cameraResolution.x, Message message = previewHandler.obtainMessage(previewMessage, cameraResolution.x,
cameraResolution.y, data); cameraResolution.y, data);
@ -163,7 +162,6 @@ final class CameraManager {
*/ */
public void stopPreview() { public void stopPreview() {
if (camera != null && previewing) { if (camera != null && previewing) {
camera.setPreviewCallback(null);
camera.stopPreview(); camera.stopPreview();
previewHandler = null; previewHandler = null;
autoFocusHandler = null; autoFocusHandler = null;
@ -183,7 +181,7 @@ final class CameraManager {
if (camera != null && previewing) { if (camera != null && previewing) {
previewHandler = handler; previewHandler = handler;
previewMessage = message; previewMessage = message;
camera.setPreviewCallback(previewCallback); camera.setOneShotPreviewCallback(previewCallback);
} }
} }

8
android/src/com/google/zxing/client/android/CaptureActivity.java
View file

@ -16,13 +16,12 @@
package com.google.zxing.client.android; package com.google.zxing.client.android;
import android.graphics.drawable.BitmapDrawable;
import com.google.zxing.Result; import com.google.zxing.Result;
import com.google.zxing.ResultPoint; import com.google.zxing.ResultPoint;
import com.google.zxing.client.android.history.HistoryManager;
import com.google.zxing.client.android.result.ResultButtonListener; import com.google.zxing.client.android.result.ResultButtonListener;
import com.google.zxing.client.android.result.ResultHandler; import com.google.zxing.client.android.result.ResultHandler;
import com.google.zxing.client.android.result.ResultHandlerFactory; import com.google.zxing.client.android.result.ResultHandlerFactory;
import com.google.zxing.client.android.history.HistoryManager;
import com.google.zxing.client.android.share.ShareActivity; import com.google.zxing.client.android.share.ShareActivity;
import android.app.Activity; import android.app.Activity;
@ -38,14 +37,15 @@ import android.graphics.Bitmap;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.media.AudioManager; import android.media.AudioManager;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.media.MediaPlayer.OnCompletionListener; import android.media.MediaPlayer.OnCompletionListener;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.Vibrator; import android.os.Vibrator;
import android.os.Handler;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.text.ClipboardManager; import android.text.ClipboardManager;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
@ -83,7 +83,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
private static final int MAX_RESULT_IMAGE_SIZE = 150; private static final int MAX_RESULT_IMAGE_SIZE = 150;
private static final long INTENT_RESULT_DURATION = 1500L; private static final long INTENT_RESULT_DURATION = 1500L;
private static final float BEEP_VOLUME = 0.15f; private static final float BEEP_VOLUME = 0.10f;
private static final long VIBRATE_DURATION = 200L; private static final long VIBRATE_DURATION = 200L;
private static final String PACKAGE_NAME = "com.google.zxing.client.android"; private static final String PACKAGE_NAME = "com.google.zxing.client.android";