github/phonegap-plugins
1
1
Fork 0
mirror of https://github.com/purplecabbage/phonegap-plugins.git synced 2026-04-24 03:00:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Issue #213: Barcode Scanner / Android: ADT 14: Non-Constant Expressions: Migration Necessary

Browse Source
This commit is contained in:
macdonst
2011-11-02 00:40:28 -04:00
parent ed6262976d
commit cd487a813a
3 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Android/BarcodeScanner/LibraryProject/src/com/google/zxing/client/android/CaptureActivityHandler.java
View File

@@ -65,44 +65,37 @@ public final class CaptureActivityHandler extends Handler {
@Override
public void handleMessage(Message message) {
switch (message.what) {
case R.id.auto_focus:
if (message.what == R.id.auto_focus) {
//Log.d(TAG, "Got auto-focus message");
// When one auto focus pass finishes, start another. This is the closest thing to
// continuous AF. It does seem to hunt a bit, but I'm not sure what else to do.
if (state == State.PREVIEW) {
CameraManager.get().requestAutoFocus(this, R.id.auto_focus);
}
break;
case R.id.restart_preview:
} else if (message.what == R.id.restart_preview) {
Log.d(TAG, "Got restart preview message");
restartPreviewAndDecode();
break;
case R.id.decode_succeeded:
} else if (message.what == R.id.decode_succeeded) {
Log.d(TAG, "Got decode succeeded message");
state = State.SUCCESS;
Bundle bundle = message.getData();
Bitmap barcode = bundle == null ? null :
(Bitmap) bundle.getParcelable(DecodeThread.BARCODE_BITMAP);
activity.handleDecode((Result) message.obj, barcode);
break;
case R.id.decode_failed:
} else if (message.what == R.id.decode_failed) {
// We're decoding as fast as possible, so when one decode fails, start another.
state = State.PREVIEW;
CameraManager.get().requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
break;
case R.id.return_scan_result:
} else if (message.what == R.id.return_scan_result) {
Log.d(TAG, "Got return scan result message");
activity.setResult(Activity.RESULT_OK, (Intent) message.obj);
activity.finish();
break;
case R.id.launch_product_query:
} else if (message.what == R.id.launch_product_query) {
Log.d(TAG, "Got product query message");
String url = (String) message.obj;
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
activity.startActivity(intent);
break;
}
}

7
Android/BarcodeScanner/LibraryProject/src/com/google/zxing/client/android/DecodeHandler.java
View File

@@ -51,14 +51,11 @@ final class DecodeHandler extends Handler {
if (!running) {
return;
}
switch (message.what) {
case R.id.decode:
if (message.what == R.id.decode) {
decode((byte[]) message.obj, message.arg1, message.arg2);
break;
case R.id.quit:
} else if (message.what == R.id.quit) {
running = false;
Looper.myLooper().quit();
break;
}
}

7
Android/BarcodeScanner/LibraryProject/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java
View File

@@ -78,15 +78,12 @@ public final class SearchBookContentsActivity extends Activity {
private final Handler handler = new Handler() {
@Override
public void handleMessage(Message message) {
switch (message.what) {
case R.id.search_book_contents_succeeded:
if (message.what == R.id.search_book_contents_succeeded) {
handleSearchResults((JSONObject) message.obj);
resetForNewQuery();
break;
case R.id.search_book_contents_failed:
} else if (message.what == R.id.search_book_contents_failed) {
resetForNewQuery();
headerView.setText(R.string.msg_sbc_failed);
break;
}
}
};