import com.google.zxing.BarcodeFormat;
import com.google.zxing.Result;
import com.google.zxing.ResultPoint;
+import com.google.zxing.client.android.camera.CameraManager;
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 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.widget.TextView;
import java.io.IOException;
+import java.text.DateFormat;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Date;
import java.util.Vector;
import java.util.regex.Pattern;
*/
public final class CaptureActivity extends Activity implements SurfaceHolder.Callback {
- private static final String TAG = "CaptureActivity";
+ private static final String TAG = CaptureActivity.class.getSimpleName();
+
private static final Pattern COMMA_PATTERN = Pattern.compile(",");
private static final int SHARE_ID = Menu.FIRST;
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 long INTENT_RESULT_DURATION = 1500L;
private static final float BEEP_VOLUME = 0.10f;
private static final long VIBRATE_DURATION = 200L;
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";
+ private static final String RETURN_CODE_PLACEHOLDER = "{CODE}";
+ private static final String RETURN_URL_PARAM = "ret";
static final Vector<BarcodeFormat> PRODUCT_FORMATS;
static final Vector<BarcodeFormat> ONE_D_FORMATS;
private boolean copyToClipboard;
private Source source;
private String sourceUrl;
+ private String returnUrlTemplate;
private Vector<BarcodeFormat> decodeFormats;
private String characterSet;
private String versionName;
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);
}
};
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.
+ } else if (dataString != null && dataString.startsWith(ZXING_URL)) {
+ // Scan formats requested in query string (all formats if none specified).
+ // If a return URL is specified, send the results there. Otherwise, handle the results ourselves.
source = Source.ZXING_LINK;
sourceUrl = dataString;
- decodeFormats = null;
+ Uri inputUri = Uri.parse(sourceUrl);
+ returnUrlTemplate = inputUri.getQueryParameter(RETURN_URL_PARAM);
+ decodeFormats = parseDecodeFormats(inputUri);
resetStatusView();
} else {
// Scan all formats and handle the results ourselves (launched from Home).
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
playBeep = prefs.getBoolean(PreferencesActivity.KEY_PLAY_BEEP, true);
+ if (playBeep) {
+ // See if sound settings overrides this
+ AudioManager audioService = (AudioManager) getSystemService(AUDIO_SERVICE);
+ if (audioService.getRingerMode() != AudioManager.RINGER_MODE_NORMAL) {
+ playBeep = false;
+ }
+ }
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);
+ List<String> scanFormats = null;
+ String scanFormatsString = intent.getStringExtra(Intents.Scan.SCAN_FORMATS);
+ if (scanFormatsString != null) {
+ scanFormats = Arrays.asList(COMMA_PATTERN.split(scanFormatsString));
+ }
+ return parseDecodeFormats(scanFormats, intent.getStringExtra(Intents.Scan.MODE));
+ }
+
+ private static Vector<BarcodeFormat> parseDecodeFormats(Uri inputUri) {
+ List<String> formats = inputUri.getQueryParameters(Intents.Scan.SCAN_FORMATS);
+ if (formats != null && formats.size() == 1 && formats.get(0) != null){
+ formats = Arrays.asList(COMMA_PATTERN.split(formats.get(0)));
+ }
+ return parseDecodeFormats(formats, inputUri.getQueryParameter(Intents.Scan.MODE));
+ }
+
+ private static Vector<BarcodeFormat> parseDecodeFormats(List<String> scanFormats,
+ String decodeMode) {
if (scanFormats != null) {
Vector<BarcodeFormat> formats = new Vector<BarcodeFormat>();
try {
- for (String format : COMMA_PATTERN.split(scanFormats)) {
+ for (String format : 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;
@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)
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 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;
handleDecodeExternally(rawResult, barcode);
break;
case ZXING_LINK:
+ if(returnUrlTemplate == null){
+ handleDecodeInternally(rawResult, barcode);
+ } else {
+ handleDecodeExternally(rawResult, barcode);
+ }
+ break;
case NONE:
handleDecodeInternally(rawResult, barcode);
break;
viewfinderView.setVisibility(View.GONE);
resultView.setVisibility(View.VISIBLE);
+ ImageView barcodeImageView = (ImageView) findViewById(R.id.barcode_image_view);
if (barcode == null) {
- barcode = ((BitmapDrawable) getResources().getDrawable(R.drawable.unknown_barcode)).getBitmap();
+ barcodeImageView.setImageResource(R.drawable.zxing_icon);
+ } else {
+ barcodeImageView.setImageBitmap(barcode);
}
- 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);
ResultHandler resultHandler = ResultHandlerFactory.makeResultHandler(this, rawResult);
TextView typeTextView = (TextView) findViewById(R.id.type_text_view);
+ typeTextView.setVisibility(View.VISIBLE);
typeTextView.setText(getString(R.string.msg_default_type) + ": " +
resultHandler.getType().toString());
+ DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
+ String formattedTime = formatter.format(new Date(rawResult.getTimestamp()));
+ TextView timeTextView = (TextView) findViewById(R.id.time_text_view);
+ timeTextView.setVisibility(View.VISIBLE);
+ timeTextView.setText(getString(R.string.msg_default_time) + ": " + formattedTime);
+
TextView contentsTextView = (TextView) findViewById(R.id.contents_text_view);
CharSequence title = getString(resultHandler.getDisplayTitle());
SpannableStringBuilder styled = new SpannableStringBuilder(title + "\n\n");
// 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 = sourceUrl.substring(0, end) + "?q=" +
resultHandler.getDisplayContents().toString() + "&source=zxing";
handler.sendMessageDelayed(message, INTENT_RESULT_DURATION);
+ } else if (source == Source.ZXING_LINK) {
+ // Replace each occurrence of RETURN_CODE_PLACEHOLDER in the returnUrlTemplate
+ // with the scanned code. This allows both queries and REST-style URLs to work.
+ Message message = Message.obtain(handler, R.id.launch_product_query);
+ message.obj = returnUrlTemplate.replace(RETURN_CODE_PLACEHOLDER, resultHandler.getDisplayContents().toString());
+ handler.sendMessageDelayed(message, INTENT_RESULT_DURATION);
}
}
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 (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());
+ Log.w(TAG, "Unexpected error initializating camera", e);
displayFrameworkBugMessageAndExit();
return;
}
projects / zxing.git / blobdiff