X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=android%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fandroid%2FCaptureActivity.java;h=02437ea9a20ed6dfe650204fefc4efc95cdcdf2e;hp=c82e4a812aa3143247b61b2eaae74314a8b1e712;hb=118cc9f113634f4d6227e7ccc2ec6137c52999af;hpb=d78dcfa216d199cb91e1066e6e1e17fcfb06f576 diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java index c82e4a81..02437ea9 100755 --- a/android/src/com/google/zxing/client/android/CaptureActivity.java +++ b/android/src/com/google/zxing/client/android/CaptureActivity.java @@ -16,8 +16,6 @@ package com.google.zxing.client.android; -import android.util.TypedValue; -import android.widget.Toast; import com.google.zxing.BarcodeFormat; import com.google.zxing.Result; import com.google.zxing.ResultMetadataType; @@ -39,6 +37,7 @@ import android.content.pm.PackageManager; import android.content.res.AssetFileDescriptor; import android.content.res.Configuration; import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; @@ -53,6 +52,7 @@ import android.os.Vibrator; import android.preference.PreferenceManager; import android.text.ClipboardManager; import android.util.Log; +import android.util.TypedValue; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; @@ -64,13 +64,14 @@ import android.view.Window; import android.view.WindowManager; import android.widget.ImageView; import android.widget.TextView; +import android.widget.Toast; import java.io.IOException; import java.text.DateFormat; import java.util.Arrays; +import java.util.Date; import java.util.HashSet; import java.util.List; -import java.util.Date; import java.util.Map; import java.util.Set; import java.util.Vector; @@ -81,6 +82,7 @@ import java.util.regex.Pattern; * example included in the Android SDK. * * @author dswitkin@google.com (Daniel Switkin) + * @author Sean Owen */ public final class CaptureActivity extends Activity implements SurfaceHolder.Callback { @@ -118,7 +120,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal PRODUCT_FORMATS.add(BarcodeFormat.EAN_13); PRODUCT_FORMATS.add(BarcodeFormat.EAN_8); PRODUCT_FORMATS.add(BarcodeFormat.RSS14); - ONE_D_FORMATS = new Vector(PRODUCT_FORMATS.size() + 3); + ONE_D_FORMATS = new Vector(PRODUCT_FORMATS.size() + 4); ONE_D_FORMATS.addAll(PRODUCT_FORMATS); ONE_D_FORMATS.add(BarcodeFormat.CODE_39); ONE_D_FORMATS.add(BarcodeFormat.CODE_93); @@ -166,7 +168,14 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal private String versionName; private HistoryManager historyManager; - private final OnCompletionListener beepListener = new BeepListener(); + /** + * When the beep has finished playing, rewind to queue up another one. + */ + private final OnCompletionListener beepListener = new OnCompletionListener() { + public void onCompletion(MediaPlayer mediaPlayer) { + mediaPlayer.seekTo(0); + } + }; private final DialogInterface.OnClickListener aboutListener = new DialogInterface.OnClickListener() { @@ -209,6 +218,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal @Override protected void onResume() { super.onResume(); + resetStatusView(); SurfaceView surfaceView = (SurfaceView) findViewById(R.id.preview_view); SurfaceHolder surfaceHolder = surfaceView.getHolder(); @@ -230,37 +240,30 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal // 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.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. + // If a return URL is specified, send the results there. Otherwise, handle it ourselves. source = Source.ZXING_LINK; sourceUrl = dataString; 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). source = Source.NONE; decodeFormats = null; - resetStatusView(); } characterSet = intent.getStringExtra(Intents.Scan.CHARACTER_SET); } else { source = Source.NONE; decodeFormats = null; characterSet = null; - if (lastResult == null) { - resetStatusView(); - } } SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); @@ -471,15 +474,10 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal if (prefs.getBoolean(PreferencesActivity.KEY_BULK_MODE, false)) { Toast.makeText(this, R.string.msg_bulk_mode_scanned, Toast.LENGTH_SHORT).show(); // Wait a moment or else it will scan the same barcode continuously about 3 times - try { - Thread.sleep(BULK_MODE_SCAN_DELAY_MS); - } catch (InterruptedException ie) { - // continue - } - resetStatusView(); if (handler != null) { - handler.sendEmptyMessage(R.id.restart_preview); + handler.sendEmptyMessageDelayed(R.id.restart_preview, BULK_MODE_SCAN_DELAY_MS); } + resetStatusView(); } else { handleDecodeInternally(rawResult, barcode); } @@ -508,8 +506,13 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal paint.setColor(getResources().getColor(R.color.result_points)); if (points.length == 2) { paint.setStrokeWidth(4.0f); - canvas.drawLine(points[0].getX(), points[0].getY(), points[1].getX(), - points[1].getY(), paint); + drawLine(canvas, paint, points[0], points[1]); + } else if (points.length == 4 && + (rawResult.getBarcodeFormat().equals(BarcodeFormat.UPC_A)) || + (rawResult.getBarcodeFormat().equals(BarcodeFormat.EAN_13))) { + // Hacky special case -- draw two lines, for the barcode and metadata + drawLine(canvas, paint, points[0], points[1]); + drawLine(canvas, paint, points[2], points[3]); } else { paint.setStrokeWidth(10.0f); for (ResultPoint point : points) { @@ -519,6 +522,10 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal } } + private static void drawLine(Canvas canvas, Paint paint, ResultPoint a, ResultPoint b) { + canvas.drawLine(a.getX(), a.getY(), b.getX(), b.getY(), paint); + } + // Put up our own UI for how to handle the decoded contents. private void handleDecodeInternally(Result rawResult, Bitmap barcode) { statusView.setVisibility(View.GONE); @@ -527,11 +534,11 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal ImageView barcodeImageView = (ImageView) findViewById(R.id.barcode_image_view); if (barcode == null) { - barcodeImageView.setImageResource(R.drawable.launcher_icon_large); + barcodeImageView.setImageBitmap(BitmapFactory.decodeResource(getResources(), + R.drawable.launcher_icon)); } else { barcodeImageView.setImageBitmap(barcode); } - barcodeImageView.setVisibility(View.VISIBLE); TextView formatTextView = (TextView) findViewById(R.id.format_text_view); formatTextView.setText(rawResult.getBarcodeFormat().toString()); @@ -570,8 +577,8 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal TextView contentsTextView = (TextView) findViewById(R.id.contents_text_view); CharSequence displayContents = resultHandler.getDisplayContents(); contentsTextView.setText(displayContents); - // Crudely scale betweeen 22 and 36 -- bigger font for shorter text - int scaledSize = Math.max(22, 36 - displayContents.length() / 4); + // Crudely scale betweeen 22 and 32 -- bigger font for shorter text + int scaledSize = Math.max(22, 32 - displayContents.length() / 4); contentsTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, scaledSize); int buttonCount = resultHandler.getButtonCount(); @@ -631,7 +638,8 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal // 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()); + message.obj = returnUrlTemplate.replace(RETURN_CODE_PLACEHOLDER, + resultHandler.getDisplayContents().toString()); handler.sendMessageDelayed(message, INTENT_RESULT_DURATION); } } @@ -717,8 +725,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal return; } if (handler == null) { - boolean beginScanning = lastResult == null; - handler = new CaptureActivityHandler(this, decodeFormats, characterSet, beginScanning); + handler = new CaptureActivityHandler(this, decodeFormats, characterSet); } } @@ -726,11 +733,8 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal 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.setPositiveButton(R.string.button_ok, new FinishListener(this)); + builder.setOnCancelListener(new FinishListener(this)); builder.show(); } @@ -745,13 +749,4 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal public void drawViewfinder() { viewfinderView.drawViewfinder(); } - - /** - * When the beep has finished playing, rewind to queue up another one. - */ - private static class BeepListener implements OnCompletionListener { - public void onCompletion(MediaPlayer mediaPlayer) { - mediaPlayer.seekTo(0); - } - } }