package com.google.zxing.client.android;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.Result;
+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.ResultHandler;
+import com.google.zxing.client.android.result.ResultHandlerFactory;
+import com.google.zxing.client.android.share.ShareActivity;
+
import android.app.Activity;
import android.app.AlertDialog;
-import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
import android.media.AudioManager;
import android.media.MediaPlayer;
import android.media.MediaPlayer.OnCompletionListener;
import android.net.Uri;
import android.os.Bundle;
+import android.os.Handler;
import android.os.Message;
import android.os.Vibrator;
import android.preference.PreferenceManager;
-import android.text.SpannableStringBuilder;
import android.text.ClipboardManager;
+import android.text.SpannableStringBuilder;
import android.text.style.UnderlineSpan;
+import android.util.Log;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
-import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
-import com.google.zxing.Result;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.client.android.result.ResultButtonListener;
-import com.google.zxing.client.android.result.ResultHandler;
-import com.google.zxing.client.android.result.ResultHandlerFactory;
import java.io.IOException;
+import java.util.Vector;
+import java.util.regex.Pattern;
/**
* The barcode reader activity itself. This is loosely based on the CameraPreview
* example included in the Android SDK.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
*/
public final class CaptureActivity extends Activity implements SurfaceHolder.Callback {
+ private static final String TAG = "CaptureActivity";
+ private static final Pattern COMMA_PATTERN = Pattern.compile(",");
+
private static final int SHARE_ID = Menu.FIRST;
- private static final int SETTINGS_ID = Menu.FIRST + 1;
- private static final int HELP_ID = Menu.FIRST + 2;
- private static final int ABOUT_ID = Menu.FIRST + 3;
+ private static final int HISTORY_ID = Menu.FIRST + 1;
+ private static final int SETTINGS_ID = Menu.FIRST + 2;
+ private static final int HELP_ID = Menu.FIRST + 3;
+ private static final int ABOUT_ID = Menu.FIRST + 4;
private static final int MAX_RESULT_IMAGE_SIZE = 150;
- private static final int INTENT_RESULT_DURATION = 1500;
- private static final float BEEP_VOLUME = 0.15f;
- private static final long VIBRATE_DURATION = 200;
+ private static final long INTENT_RESULT_DURATION = 1500L;
+ private static final float BEEP_VOLUME = 0.10f;
+ private static final long VIBRATE_DURATION = 200L;
private static final String PACKAGE_NAME = "com.google.zxing.client.android";
+ private static final String PRODUCT_SEARCH_URL_PREFIX = "http://www.google";
+ private static final String PRODUCT_SEARCH_URL_SUFFIX = "/m/products/scan";
+ private static final String ZXING_URL = "http://zxing.appspot.com/scan";
+
+ static final Vector<BarcodeFormat> PRODUCT_FORMATS;
+ static final Vector<BarcodeFormat> ONE_D_FORMATS;
+ static final Vector<BarcodeFormat> QR_CODE_FORMATS;
+ static final Vector<BarcodeFormat> ALL_FORMATS;
+
+ static {
+ PRODUCT_FORMATS = new Vector<BarcodeFormat>(5);
+ PRODUCT_FORMATS.add(BarcodeFormat.UPC_A);
+ PRODUCT_FORMATS.add(BarcodeFormat.UPC_E);
+ PRODUCT_FORMATS.add(BarcodeFormat.EAN_13);
+ PRODUCT_FORMATS.add(BarcodeFormat.EAN_8);
+ PRODUCT_FORMATS.add(BarcodeFormat.RSS14);
+ ONE_D_FORMATS = new Vector<BarcodeFormat>(PRODUCT_FORMATS.size() + 3);
+ ONE_D_FORMATS.addAll(PRODUCT_FORMATS);
+ ONE_D_FORMATS.add(BarcodeFormat.CODE_39);
+ ONE_D_FORMATS.add(BarcodeFormat.CODE_128);
+ ONE_D_FORMATS.add(BarcodeFormat.ITF);
+ QR_CODE_FORMATS = new Vector<BarcodeFormat>(1);
+ QR_CODE_FORMATS.add(BarcodeFormat.QR_CODE);
+ ALL_FORMATS = new Vector<BarcodeFormat>(ONE_D_FORMATS.size() + QR_CODE_FORMATS.size());
+ ALL_FORMATS.addAll(ONE_D_FORMATS);
+ ALL_FORMATS.addAll(QR_CODE_FORMATS);
+ }
+
+ private enum Source {
+ NATIVE_APP_INTENT,
+ PRODUCT_SEARCH_LINK,
+ ZXING_LINK,
+ NONE
+ }
- public CaptureActivityHandler mHandler;
+ private CaptureActivityHandler handler;
+
+ private ViewfinderView viewfinderView;
+ private View statusView;
+ private View resultView;
+ private MediaPlayer mediaPlayer;
+ private Result lastResult;
+ private boolean hasSurface;
+ private boolean playBeep;
+ private boolean vibrate;
+ private boolean copyToClipboard;
+ private Source source;
+ private String sourceUrl;
+ private Vector<BarcodeFormat> decodeFormats;
+ private String characterSet;
+ private String versionName;
+ private HistoryManager historyManager;
+
+ private final OnCompletionListener beepListener = new BeepListener();
+
+ private final DialogInterface.OnClickListener aboutListener =
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialogInterface, int i) {
+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.zxing_url)));
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+ startActivity(intent);
+ }
+ };
- private ViewfinderView mViewfinderView;
- private View mStatusView;
- private View mResultView;
- private MediaPlayer mMediaPlayer;
- private Result mLastResult;
- private boolean mHasSurface;
- private boolean mPlayBeep;
- private boolean mVibrate;
- private boolean mCopyToClipboard;
- private boolean mScanIntent;
- private String mDecodeMode;
+ ViewfinderView getViewfinderView() {
+ return viewfinderView;
+ }
- private final OnCompletionListener mBeepListener = new BeepListener();
+ public Handler getHandler() {
+ return handler;
+ }
@Override
public void onCreate(Bundle icicle) {
setContentView(R.layout.capture);
CameraManager.init(getApplication());
- mViewfinderView = (ViewfinderView) findViewById(R.id.viewfinder_view);
- mResultView = findViewById(R.id.result_view);
- mStatusView = findViewById(R.id.status_view);
- mHandler = null;
- mLastResult = null;
- mHasSurface = false;
+ viewfinderView = (ViewfinderView) findViewById(R.id.viewfinder_view);
+ resultView = findViewById(R.id.result_view);
+ statusView = findViewById(R.id.status_view);
+ handler = null;
+ lastResult = null;
+ hasSurface = false;
+ historyManager = new HistoryManager(this);
+ historyManager.trimHistory();
showHelpOnFirstLaunch();
}
SurfaceView surfaceView = (SurfaceView) findViewById(R.id.preview_view);
SurfaceHolder surfaceHolder = surfaceView.getHolder();
- if (mHasSurface) {
+ if (hasSurface) {
// The activity was paused but not stopped, so the surface still exists. Therefore
// surfaceCreated() won't be called, so init the camera here.
initCamera(surfaceHolder);
}
Intent intent = getIntent();
- if (intent != null && (intent.getAction().equals(Intents.Scan.ACTION) ||
- intent.getAction().equals(Intents.Scan.DEPRECATED_ACTION))) {
- mScanIntent = true;
- mDecodeMode = intent.getStringExtra(Intents.Scan.MODE);
- resetStatusView();
+ String action = intent == null ? null : intent.getAction();
+ String dataString = intent == null ? null : intent.getDataString();
+ if (intent != null && action != null) {
+ if (action.equals(Intents.Scan.ACTION)) {
+ // Scan the formats the intent requested, and return the result to the calling activity.
+ source = Source.NATIVE_APP_INTENT;
+ decodeFormats = parseDecodeFormats(intent);
+ resetStatusView();
+ } else if (dataString != null && dataString.contains(PRODUCT_SEARCH_URL_PREFIX) &&
+ dataString.contains(PRODUCT_SEARCH_URL_SUFFIX)) {
+ // Scan only products and send the result to mobile Product Search.
+ source = Source.PRODUCT_SEARCH_LINK;
+ sourceUrl = dataString;
+ decodeFormats = PRODUCT_FORMATS;
+ resetStatusView();
+ } else if (dataString != null && dataString.equals(ZXING_URL)) {
+ // Scan all formats and handle the results ourselves.
+ // TODO: In the future we could allow the hyperlink to include a URL to send the results to.
+ source = Source.ZXING_LINK;
+ sourceUrl = dataString;
+ decodeFormats = null;
+ resetStatusView();
+ } else {
+ // Scan all formats and handle the results ourselves (launched from Home).
+ source = Source.NONE;
+ decodeFormats = null;
+ resetStatusView();
+ }
+ characterSet = intent.getStringExtra(Intents.Scan.CHARACTER_SET);
} else {
- mScanIntent = false;
- mDecodeMode = null;
- if (mLastResult == null) {
+ source = Source.NONE;
+ decodeFormats = null;
+ characterSet = null;
+ if (lastResult == null) {
resetStatusView();
}
}
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
- mPlayBeep = prefs.getBoolean(PreferencesActivity.KEY_PLAY_BEEP, true);
- mVibrate = prefs.getBoolean(PreferencesActivity.KEY_VIBRATE, false);
- mCopyToClipboard = prefs.getBoolean(PreferencesActivity.KEY_COPY_TO_CLIPBOARD, true);
+ playBeep = prefs.getBoolean(PreferencesActivity.KEY_PLAY_BEEP, true);
+ vibrate = prefs.getBoolean(PreferencesActivity.KEY_VIBRATE, false);
+ copyToClipboard = prefs.getBoolean(PreferencesActivity.KEY_COPY_TO_CLIPBOARD, true);
initBeepSound();
}
+ private static Vector<BarcodeFormat> parseDecodeFormats(Intent intent) {
+ String scanFormats = intent.getStringExtra(Intents.Scan.SCAN_FORMATS);
+ if (scanFormats != null) {
+ Vector<BarcodeFormat> formats = new Vector<BarcodeFormat>();
+ try {
+ for (String format : COMMA_PATTERN.split(scanFormats)) {
+ formats.add(BarcodeFormat.valueOf(format));
+ }
+ return formats;
+ } catch (IllegalArgumentException iae) {
+ // ignore it then
+ }
+ }
+ String decodeMode = intent.getStringExtra(Intents.Scan.MODE);
+ if (decodeMode != null) {
+ if (Intents.Scan.PRODUCT_MODE.equals(decodeMode)) {
+ return PRODUCT_FORMATS;
+ }
+ if (Intents.Scan.QR_CODE_MODE.equals(decodeMode)) {
+ return QR_CODE_FORMATS;
+ }
+ if (Intents.Scan.ONE_D_MODE.equals(decodeMode)) {
+ return ONE_D_FORMATS;
+ }
+ }
+ return null;
+ }
+
@Override
protected void onPause() {
super.onPause();
- if (mHandler != null) {
- mHandler.quitSynchronously();
- mHandler = null;
+ if (handler != null) {
+ handler.quitSynchronously();
+ handler = null;
}
CameraManager.get().closeDriver();
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
- if (mScanIntent) {
+ if (source == Source.NATIVE_APP_INTENT) {
setResult(RESULT_CANCELED);
finish();
return true;
- } else if (mLastResult != null) {
+ } else if ((source == Source.NONE || source == Source.ZXING_LINK) && lastResult != null) {
resetStatusView();
- mHandler.sendEmptyMessage(R.id.restart_preview);
+ if (handler != null) {
+ handler.sendEmptyMessage(R.id.restart_preview);
+ }
return true;
}
} else if (keyCode == KeyEvent.KEYCODE_FOCUS || keyCode == KeyEvent.KEYCODE_CAMERA) {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
- menu.add(0, SHARE_ID, 0, R.string.menu_share).setIcon(R.drawable.share_menu_item);
+ menu.add(0, SHARE_ID, 0, R.string.menu_share)
+ .setIcon(android.R.drawable.ic_menu_share);
+ menu.add(0, HISTORY_ID, 0, R.string.menu_history)
+ .setIcon(android.R.drawable.ic_menu_recent_history);
menu.add(0, SETTINGS_ID, 0, R.string.menu_settings)
.setIcon(android.R.drawable.ic_menu_preferences);
menu.add(0, HELP_ID, 0, R.string.menu_help)
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
- menu.findItem(SHARE_ID).setVisible(mLastResult == null);
+ menu.findItem(SHARE_ID).setVisible(lastResult == null);
return true;
}
switch (item.getItemId()) {
case SHARE_ID: {
Intent intent = new Intent(Intent.ACTION_VIEW);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
intent.setClassName(this, ShareActivity.class.getName());
startActivity(intent);
break;
}
+ case HISTORY_ID: {
+ AlertDialog historyAlert = historyManager.buildAlert();
+ historyAlert.show();
+ break;
+ }
case SETTINGS_ID: {
Intent intent = new Intent(Intent.ACTION_VIEW);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
intent.setClassName(this, PreferencesActivity.class.getName());
startActivity(intent);
break;
}
case HELP_ID: {
Intent intent = new Intent(Intent.ACTION_VIEW);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
intent.setClassName(this, HelpActivity.class.getName());
startActivity(intent);
break;
}
case ABOUT_ID:
AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setTitle(R.string.title_about);
+ builder.setTitle(getString(R.string.title_about) + versionName);
builder.setMessage(getString(R.string.msg_about) + "\n\n" + getString(R.string.zxing_url));
builder.setIcon(R.drawable.zxing_icon);
- builder.setPositiveButton(R.string.button_open_browser, mAboutListener);
+ builder.setPositiveButton(R.string.button_open_browser, aboutListener);
builder.setNegativeButton(R.string.button_cancel, null);
builder.show();
break;
super.onConfigurationChanged(config);
}
- private final DialogInterface.OnClickListener mAboutListener = new DialogInterface.OnClickListener() {
- public void onClick(android.content.DialogInterface dialogInterface, int i) {
- Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.zxing_url)));
- startActivity(intent);
- }
- };
-
public void surfaceCreated(SurfaceHolder holder) {
- if (!mHasSurface) {
- mHasSurface = true;
+ if (!hasSurface) {
+ hasSurface = true;
initCamera(holder);
}
}
public void surfaceDestroyed(SurfaceHolder holder) {
- mHasSurface = false;
+ hasSurface = false;
}
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
*
* @param rawResult The contents of the barcode.
* @param barcode A greyscale bitmap of the camera data which was decoded.
- * @param duration How long the decoding took in milliseconds.
*/
- public void handleDecode(Result rawResult, Bitmap barcode, int duration) {
- mLastResult = rawResult;
- playBeepSoundAndVibrate();
- drawResultPoints(barcode, rawResult);
-
- if (mScanIntent) {
- handleDecodeForScanIntent(rawResult, barcode, duration);
+ public void handleDecode(Result rawResult, Bitmap barcode) {
+ lastResult = rawResult;
+ historyManager.addHistoryItem(rawResult);
+ if (barcode == null) {
+ // This is from history -- no saved barcode
+ handleDecodeInternally(rawResult, null);
} else {
- mStatusView.setVisibility(View.GONE);
- mViewfinderView.setVisibility(View.GONE);
- mResultView.setVisibility(View.VISIBLE);
-
- ImageView barcodeImageView = (ImageView) findViewById(R.id.barcode_image_view);
- barcodeImageView.setMaxWidth(MAX_RESULT_IMAGE_SIZE);
- barcodeImageView.setMaxHeight(MAX_RESULT_IMAGE_SIZE);
- barcodeImageView.setImageBitmap(barcode);
-
- TextView formatTextView = (TextView) findViewById(R.id.format_text_view);
- formatTextView.setText(getString(R.string.msg_default_format) + ": " +
- rawResult.getBarcodeFormat().toString());
-
- ResultHandler resultHandler = ResultHandlerFactory.makeResultHandler(this, rawResult);
- TextView typeTextView = (TextView) findViewById(R.id.type_text_view);
- typeTextView.setText(getString(R.string.msg_default_type) + ": " +
- resultHandler.getType().toString());
-
- TextView contentsTextView = (TextView) findViewById(R.id.contents_text_view);
- CharSequence title = getString(resultHandler.getDisplayTitle());
- SpannableStringBuilder styled = new SpannableStringBuilder(title + "\n\n");
- styled.setSpan(new UnderlineSpan(), 0, title.length(), 0);
- CharSequence displayContents = resultHandler.getDisplayContents();
- styled.append(displayContents);
- contentsTextView.setText(styled);
-
- int buttonCount = resultHandler.getButtonCount();
- ViewGroup buttonView = (ViewGroup) findViewById(R.id.result_button_view);
- buttonView.requestFocus();
- for (int x = 0; x < ResultHandler.MAX_BUTTON_COUNT; x++) {
- Button button = (Button) buttonView.getChildAt(x);
- if (x < buttonCount) {
- button.setVisibility(View.VISIBLE);
- button.setText(resultHandler.getButtonText(x));
- button.setOnClickListener(new ResultButtonListener(resultHandler, x));
- } else {
- button.setVisibility(View.GONE);
- }
- }
-
- if (mCopyToClipboard) {
- ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
- clipboard.setText(displayContents);
+ playBeepSoundAndVibrate();
+ drawResultPoints(barcode, rawResult);
+ switch (source) {
+ case NATIVE_APP_INTENT:
+ case PRODUCT_SEARCH_LINK:
+ handleDecodeExternally(rawResult, barcode);
+ break;
+ case ZXING_LINK:
+ case NONE:
+ handleDecodeInternally(rawResult, barcode);
+ break;
}
}
}
Canvas canvas = new Canvas(barcode);
Paint paint = new Paint();
paint.setColor(getResources().getColor(R.color.result_image_border));
- paint.setStrokeWidth(3);
+ paint.setStrokeWidth(3.0f);
paint.setStyle(Paint.Style.STROKE);
Rect border = new Rect(2, 2, barcode.getWidth() - 2, barcode.getHeight() - 2);
canvas.drawRect(border, paint);
paint.setColor(getResources().getColor(R.color.result_points));
if (points.length == 2) {
- paint.setStrokeWidth(4);
+ paint.setStrokeWidth(4.0f);
canvas.drawLine(points[0].getX(), points[0].getY(), points[1].getX(),
points[1].getY(), paint);
} else {
- paint.setStrokeWidth(10);
- for (int x = 0; x < points.length; x++) {
- canvas.drawPoint(points[x].getX(), points[x].getY(), paint);
+ paint.setStrokeWidth(10.0f);
+ for (ResultPoint point : points) {
+ canvas.drawPoint(point.getX(), point.getY(), paint);
}
}
}
}
- private void handleDecodeForScanIntent(Result rawResult, Bitmap barcode, int duration) {
- mViewfinderView.drawResultBitmap(barcode);
+ // Put up our own UI for how to handle the decoded contents.
+ private void handleDecodeInternally(Result rawResult, Bitmap barcode) {
+ statusView.setVisibility(View.GONE);
+ viewfinderView.setVisibility(View.GONE);
+ resultView.setVisibility(View.VISIBLE);
+
+ if (barcode == null) {
+ barcode = ((BitmapDrawable) getResources().getDrawable(R.drawable.unknown_barcode)).getBitmap();
+ }
+ ImageView barcodeImageView = (ImageView) findViewById(R.id.barcode_image_view);
+ barcodeImageView.setVisibility(View.VISIBLE);
+ barcodeImageView.setMaxWidth(MAX_RESULT_IMAGE_SIZE);
+ barcodeImageView.setMaxHeight(MAX_RESULT_IMAGE_SIZE);
+ barcodeImageView.setImageBitmap(barcode);
+
+ TextView formatTextView = (TextView) findViewById(R.id.format_text_view);
+ formatTextView.setVisibility(View.VISIBLE);
+ formatTextView.setText(getString(R.string.msg_default_format) + ": " +
+ rawResult.getBarcodeFormat().toString());
+
+ ResultHandler resultHandler = ResultHandlerFactory.makeResultHandler(this, rawResult);
+ TextView typeTextView = (TextView) findViewById(R.id.type_text_view);
+ typeTextView.setText(getString(R.string.msg_default_type) + ": " +
+ resultHandler.getType().toString());
+
+ TextView contentsTextView = (TextView) findViewById(R.id.contents_text_view);
+ CharSequence title = getString(resultHandler.getDisplayTitle());
+ SpannableStringBuilder styled = new SpannableStringBuilder(title + "\n\n");
+ styled.setSpan(new UnderlineSpan(), 0, title.length(), 0);
+ CharSequence displayContents = resultHandler.getDisplayContents();
+ styled.append(displayContents);
+ contentsTextView.setText(styled);
+
+ int buttonCount = resultHandler.getButtonCount();
+ ViewGroup buttonView = (ViewGroup) findViewById(R.id.result_button_view);
+ buttonView.requestFocus();
+ for (int x = 0; x < ResultHandler.MAX_BUTTON_COUNT; x++) {
+ TextView button = (TextView) buttonView.getChildAt(x);
+ if (x < buttonCount) {
+ button.setVisibility(View.VISIBLE);
+ button.setText(resultHandler.getButtonText(x));
+ button.setOnClickListener(new ResultButtonListener(resultHandler, x));
+ } else {
+ button.setVisibility(View.GONE);
+ }
+ }
+
+ if (copyToClipboard) {
+ ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+ clipboard.setText(displayContents);
+ }
+ }
+
+ // Briefly show the contents of the barcode, then handle the result outside Barcode Scanner.
+ private void handleDecodeExternally(Result rawResult, Bitmap barcode) {
+ viewfinderView.drawResultBitmap(barcode);
// Since this message will only be shown for a second, just tell the user what kind of
// barcode was found (e.g. contact info) rather than the full contents, which they won't
textView.setTextSize(18.0f);
textView.setText(getString(resultHandler.getDisplayTitle()));
- mStatusView.setBackgroundColor(getResources().getColor(R.color.transparent));
+ statusView.setBackgroundColor(getResources().getColor(R.color.transparent));
- if (mCopyToClipboard) {
- ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+ if (copyToClipboard) {
+ ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
clipboard.setText(resultHandler.getDisplayContents());
}
- // Hand back whatever action they requested - this can be changed to Intents.Scan.ACTION when
- // the deprecated intent is retired.
- Intent intent = new Intent(getIntent().getAction());
- intent.putExtra(Intents.Scan.RESULT, rawResult.toString());
- intent.putExtra(Intents.Scan.RESULT_FORMAT, rawResult.getBarcodeFormat().toString());
- Message message = Message.obtain(mHandler, R.id.return_scan_result);
- message.obj = intent;
- mHandler.sendMessageDelayed(message, INTENT_RESULT_DURATION);
+ if (source == Source.NATIVE_APP_INTENT) {
+ // Hand back whatever action they requested - this can be changed to Intents.Scan.ACTION when
+ // the deprecated intent is retired.
+ Intent intent = new Intent(getIntent().getAction());
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+ intent.putExtra(Intents.Scan.RESULT, rawResult.toString());
+ intent.putExtra(Intents.Scan.RESULT_FORMAT, rawResult.getBarcodeFormat().toString());
+ Message message = Message.obtain(handler, R.id.return_scan_result);
+ message.obj = intent;
+ handler.sendMessageDelayed(message, INTENT_RESULT_DURATION);
+ } else if (source == Source.PRODUCT_SEARCH_LINK) {
+ // Reformulate the URL which triggered us into a query, so that the request goes to the same
+ // TLD as the scan URL.
+ Message message = Message.obtain(handler, R.id.launch_product_query);
+ int end = sourceUrl.lastIndexOf("/scan");
+ message.obj = sourceUrl.substring(0, end) + "?q=" +
+ resultHandler.getDisplayContents().toString() + "&source=zxing";
+ handler.sendMessageDelayed(message, INTENT_RESULT_DURATION);
+ }
}
/**
* run. The easiest way to do this is to check android:versionCode from the manifest, and compare
* it to a value stored as a preference.
*/
- private void showHelpOnFirstLaunch() {
+ private boolean showHelpOnFirstLaunch() {
try {
PackageInfo info = getPackageManager().getPackageInfo(PACKAGE_NAME, 0);
int currentVersion = info.versionCode;
+ // Since we're paying to talk to the PackageManager anyway, it makes sense to cache the app
+ // version name here for display in the about box later.
+ this.versionName = info.versionName;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
int lastVersion = prefs.getInt(PreferencesActivity.KEY_HELP_VERSION_SHOWN, 0);
if (currentVersion > lastVersion) {
prefs.edit().putInt(PreferencesActivity.KEY_HELP_VERSION_SHOWN, currentVersion).commit();
- Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.setClassName(this, HelpActivity.class.getName());
+ Intent intent = new Intent(this, HelpActivity.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+ // Show the default page on a clean install, and the what's new page on an upgrade.
+ String page = (lastVersion == 0) ? HelpActivity.DEFAULT_PAGE : HelpActivity.WHATS_NEW_PAGE;
+ intent.putExtra(HelpActivity.REQUESTED_PAGE_KEY, page);
startActivity(intent);
+ return true;
}
} catch (PackageManager.NameNotFoundException e) {
-
+ Log.w(TAG, e);
}
+ return false;
}
/**
* latency possible.
*/
private void initBeepSound() {
- if (mPlayBeep && mMediaPlayer == null) {
- mMediaPlayer = new MediaPlayer();
- mMediaPlayer.setAudioStreamType(AudioManager.STREAM_SYSTEM);
- mMediaPlayer.setOnCompletionListener(mBeepListener);
+ if (playBeep && mediaPlayer == null) {
+ // The volume on STREAM_SYSTEM is not adjustable, and users found it too loud,
+ // so we now play on the music stream.
+ setVolumeControlStream(AudioManager.STREAM_MUSIC);
+ mediaPlayer = new MediaPlayer();
+ mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+ mediaPlayer.setOnCompletionListener(beepListener);
AssetFileDescriptor file = getResources().openRawResourceFd(R.raw.beep);
try {
- mMediaPlayer.setDataSource(file.getFileDescriptor(), file.getStartOffset(),
+ mediaPlayer.setDataSource(file.getFileDescriptor(), file.getStartOffset(),
file.getLength());
file.close();
- mMediaPlayer.setVolume(BEEP_VOLUME, BEEP_VOLUME);
- mMediaPlayer.prepare();
+ mediaPlayer.setVolume(BEEP_VOLUME, BEEP_VOLUME);
+ mediaPlayer.prepare();
} catch (IOException e) {
- mMediaPlayer = null;
+ mediaPlayer = null;
}
}
}
private void playBeepSoundAndVibrate() {
- if (mPlayBeep && mMediaPlayer != null) {
- mMediaPlayer.start();
+ if (playBeep && mediaPlayer != null) {
+ mediaPlayer.start();
}
- if (mVibrate) {
- Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+ if (vibrate) {
+ Vibrator vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
vibrator.vibrate(VIBRATE_DURATION);
}
}
private void initCamera(SurfaceHolder surfaceHolder) {
- CameraManager.get().openDriver(surfaceHolder);
- if (mHandler == null) {
- boolean beginScanning = mLastResult == null;
- mHandler = new CaptureActivityHandler(this, mDecodeMode, beginScanning);
+ try {
+ CameraManager.get().openDriver(surfaceHolder);
+ } catch (IOException ioe) {
+ Log.w(TAG, ioe);
+ displayFrameworkBugMessageAndExit();
+ return;
+ } catch (RuntimeException e) {
+ // Barcode Scanner has seen crashes in the wild of this variety:
+ // java.?lang.?RuntimeException: Fail to connect to camera service
+ Log.e(TAG, e.toString());
+ displayFrameworkBugMessageAndExit();
+ return;
+ }
+ if (handler == null) {
+ boolean beginScanning = lastResult == null;
+ handler = new CaptureActivityHandler(this, decodeFormats, characterSet, beginScanning);
}
}
+ private void displayFrameworkBugMessageAndExit() {
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setTitle(getString(R.string.app_name));
+ builder.setMessage(getString(R.string.msg_camera_framework_bug));
+ builder.setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialogInterface, int i) {
+ finish();
+ }
+ });
+ builder.show();
+ }
+
private void resetStatusView() {
- mResultView.setVisibility(View.GONE);
- mStatusView.setVisibility(View.VISIBLE);
- mStatusView.setBackgroundColor(getResources().getColor(R.color.status_view));
- mViewfinderView.setVisibility(View.VISIBLE);
+ resultView.setVisibility(View.GONE);
+ statusView.setVisibility(View.VISIBLE);
+ statusView.setBackgroundColor(getResources().getColor(R.color.status_view));
+ viewfinderView.setVisibility(View.VISIBLE);
TextView textView = (TextView) findViewById(R.id.status_text_view);
textView.setGravity(Gravity.LEFT | Gravity.CENTER_VERTICAL);
textView.setTextSize(14.0f);
textView.setText(R.string.msg_default_status);
- mLastResult = null;
+ lastResult = null;
}
public void drawViewfinder() {
- mViewfinderView.drawViewfinder();
+ viewfinderView.drawViewfinder();
}
/**
mediaPlayer.seekTo(0);
}
}
-
}
projects / zxing.git / blobdiff