mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-01-12 19:57:27 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #149 from mechkg/master

Browse source 
Added basic support for using CaptureActivity from other activities via startActivityForResult
This commit is contained in:
Sean Owen 2014-05-20 20:31:26 +01:00
parent 081378fe93 cf35e85024
commit aedd6262e6
2 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
glass/AndroidManifest.xml
View file

@ -35,6 +35,12 @@
<intent-filter>
<action android:name="com.google.android.glass.action.VOICE_TRIGGER" />
</intent-filter>
<intent-filter>
<action android:name="com.google.zxing.client.android.SCAN"/>
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.google.android.glass.VoiceTrigger"
android:resource="@xml/barcode_scanner_show" />
</activity>
@ -42,4 +48,3 @@
</application>
</manifest>

33
glass/src/com/google/zxing/client/glass/CaptureActivity.java
View file

@ -45,8 +45,10 @@ import java.io.IOException;
public final class CaptureActivity extends Activity implements SurfaceHolder.Callback {
private static final String TAG = CaptureActivity.class.getSimpleName();
private static final String SCAN_ACTION = "com.google.zxing.client.android.SCAN";
private boolean hasSurface;
private boolean returnResult;
private SurfaceHolder holderWithCallback;
private Camera camera;
private DecodeRunnable decodeRunnable;
@ -55,6 +57,18 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
// returnResult should be true if activity was started using
// startActivityForResult() with SCAN_ACTION intent
returnResult = false;
Intent intent = getIntent();
if (intent != null) {
String action = intent.getAction();
if (action != null)
returnResult = action.equals(SCAN_ACTION);
}
Window window = getWindow();
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
setContentView(R.layout.capture);
@ -156,12 +170,19 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
}
void setResult(Result result) {
TextView statusView = (TextView) findViewById(R.id.status_view);
String text = result.getText();
statusView.setText(text);
statusView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.max(14, 72 - text.length() / 2));
statusView.setVisibility(View.VISIBLE);
this.result = result;
if (returnResult) {
Intent scanResult = new Intent();
scanResult.putExtra("SCAN_RESULT", result.getText());
setResult(RESULT_OK, scanResult);
finish();
} else {
TextView statusView = (TextView) findViewById(R.id.status_view);
String text = result.getText();
statusView.setText(text);
statusView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.max(14, 72 - text.length() / 2));
statusView.setVisibility(View.VISIBLE);
this.result = result;
}
}
private void handleResult(Result result) {