summaryrefslogtreecommitdiff
path: root/sample/src/main/java
diff options
context:
space:
mode:
authorRalf Kistner <ralf@journeyapps.com>2018-03-04 13:53:43 +0300
committerGitHub <noreply@github.com>2018-03-04 13:53:43 +0300
commitc98a04a407472ea3d54344585c38bc0c2db02df5 (patch)
tree474f8a3277250c813faac7e55bd547ffb972e3a3 /sample/src/main/java
parent8e90d15117ee9f9bd96eb88b930b11cd37d2d40e (diff)
parent1817bb198b6d40e1f5316998d90cf76d5e0da4eb (diff)
downloadzxing-android-embedded-c98a04a407472ea3d54344585c38bc0c2db02df5.tar.xz
Merge pull request #287 from tingbob/master
Redefine the default activity request code for using switch statement.
Diffstat (limited to 'sample/src/main/java')
-rw-r--r--sample/src/main/java/example/zxing/MainActivity.java18
1 files changed, 18 insertions, 0 deletions
diff --git a/sample/src/main/java/example/zxing/MainActivity.java b/sample/src/main/java/example/zxing/MainActivity.java
index 79f74ec4..b3a0119b 100644
--- a/sample/src/main/java/example/zxing/MainActivity.java
+++ b/sample/src/main/java/example/zxing/MainActivity.java
@@ -21,6 +21,8 @@ import com.journeyapps.barcodescanner.CameraPreview;
public class MainActivity extends AppCompatActivity {
+ public final int CUSTOMIZED_REQUEST_CODE = 0x0000ffff;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -31,6 +33,10 @@ public class MainActivity extends AppCompatActivity {
new IntentIntegrator(this).initiateScan();
}
+ public void scanBarcodeWithCustomizedRequestCode(View view) {
+ new IntentIntegrator(this, CUSTOMIZED_REQUEST_CODE).initiateScan();
+ }
+
public void scanBarcodeInverted(View view){
IntentIntegrator integrator = new IntentIntegrator(this);
integrator.addExtra(Intents.Scan.INVERTED_SCAN, true);
@@ -87,6 +93,18 @@ public class MainActivity extends AppCompatActivity {
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
+ switch (requestCode) {
+ case CUSTOMIZED_REQUEST_CODE: {
+ Toast.makeText(this, "REQUEST_CODE = " + requestCode, Toast.LENGTH_LONG).show();
+ break;
+ }
+ case IntentIntegrator.REQUEST_CODE: {
+ Toast.makeText(this, "IntentIntegrator default REQUEST_CODE = " + requestCode, Toast.LENGTH_LONG).show();
+ break;
+ }
+ default:
+ break;
+ }
if(result != null) {
if(result.getContents() == null) {
Log.d("MainActivity", "Cancelled scan");