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

Suppress status message on Intent scan if result duration is requested to be 0

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2406 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2012-09-12 11:57:06 +00:00
parent 34230c345a
commit e6115611f3
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -568,10 +568,20 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
viewfinderView.drawResultBitmap(barcode); viewfinderView.drawResultBitmap(barcode);
} }
long resultDurationMS;
if (getIntent() == null) {
resultDurationMS = DEFAULT_INTENT_RESULT_DURATION_MS;
} else {
resultDurationMS = getIntent().getLongExtra(Intents.Scan.RESULT_DISPLAY_DURATION_MS,
DEFAULT_INTENT_RESULT_DURATION_MS);
}
// Since this message will only be shown for a second, just tell the user what kind of // 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 // barcode was found (e.g. contact info) rather than the full contents, which they won't
// have time to read. // have time to read.
if (resultDurationMS > 0) {
statusView.setText(getString(resultHandler.getDisplayTitle())); statusView.setText(getString(resultHandler.getDisplayTitle()));
}
if (copyToClipboard && !resultHandler.areContentsSecure()) { if (copyToClipboard && !resultHandler.areContentsSecure()) {
ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
@ -616,7 +626,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
} }
} }
} }
sendReplyMessage(R.id.return_scan_result, intent); sendReplyMessage(R.id.return_scan_result, intent, resultDurationMS);
} else if (source == IntentSource.PRODUCT_SEARCH_LINK) { } else if (source == IntentSource.PRODUCT_SEARCH_LINK) {
@ -624,7 +634,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
// TLD as the scan URL. // TLD as the scan URL.
int end = sourceUrl.lastIndexOf("/scan"); int end = sourceUrl.lastIndexOf("/scan");
String replyURL = sourceUrl.substring(0, end) + "?q=" + resultHandler.getDisplayContents() + "&source=zxing"; String replyURL = sourceUrl.substring(0, end) + "?q=" + resultHandler.getDisplayContents() + "&source=zxing";
sendReplyMessage(R.id.launch_product_query, replyURL); sendReplyMessage(R.id.launch_product_query, replyURL, resultDurationMS);
} else if (source == IntentSource.ZXING_LINK) { } else if (source == IntentSource.ZXING_LINK) {
@ -638,18 +648,16 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
// can't happen; UTF-8 is always supported. Continue, I guess, without encoding // can't happen; UTF-8 is always supported. Continue, I guess, without encoding
} }
String replyURL = returnUrlTemplate.replace(RETURN_CODE_PLACEHOLDER, codeReplacement); String replyURL = returnUrlTemplate.replace(RETURN_CODE_PLACEHOLDER, codeReplacement);
sendReplyMessage(R.id.launch_product_query, replyURL); sendReplyMessage(R.id.launch_product_query, replyURL, resultDurationMS);
} }
} }
} }
private void sendReplyMessage(int id, Object arg) { private void sendReplyMessage(int id, Object arg, long delayMS) {
Message message = Message.obtain(handler, id, arg); Message message = Message.obtain(handler, id, arg);
long resultDurationMS = getIntent().getLongExtra(Intents.Scan.RESULT_DISPLAY_DURATION_MS, if (delayMS > 0L) {
DEFAULT_INTENT_RESULT_DURATION_MS); handler.sendMessageDelayed(message, delayMS);
if (resultDurationMS > 0L) {
handler.sendMessageDelayed(message, resultDurationMS);
} else { } else {
handler.sendMessage(message); handler.sendMessage(message);
} }