Hesham/BarcodeScanner2
1
0
Fork 0
mirror of https://bitbucket.org/HeshamTB/barcodescanner2.git synced 2024-11-22 08:42:15 +01:00
Code Issues Releases Activity

Merge branch 'master' into test-branch

Browse Source
This commit is contained in:
HeshamTB 2018-07-01 00:38:52 +03:00
commit 096a05cb1d
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/team3/kau/ie201/barcodescanner2/MainActivity.java
View File

@ -115,7 +115,6 @@ public class MainActivity extends AppCompatActivity implements OnClickListener {
//take shot of barcode 2 //take shot of barcode 2
IntentIntegrator scanIntegrator = new IntentIntegrator(this); IntentIntegrator scanIntegrator = new IntentIntegrator(this);
scanIntegrator.initiateScan(0); scanIntegrator.initiateScan(0);
} }
else if (result.equalsIgnoreCase("member1") else if (result.equalsIgnoreCase("member1")
@ -131,11 +130,6 @@ public class MainActivity extends AppCompatActivity implements OnClickListener {
flashLightOn(); flashLightOn();
IntentIntegrator scanIntegrator = new IntentIntegrator(this); IntentIntegrator scanIntegrator = new IntentIntegrator(this);
scanIntegrator.initiateScan(0); scanIntegrator.initiateScan(0);
//Scan again if cont. is checked
//make flash on!
//open door
//FlashLightUtilForL flash = new FlashLightUtilForL(this);
//flash.turnOnFlashLight();
} }
else { else {
@ -160,6 +154,7 @@ public class MainActivity extends AppCompatActivity implements OnClickListener {
"No scan data received!", Toast.LENGTH_SHORT); "No scan data received!", Toast.LENGTH_SHORT);
toast.show(); toast.show();
} }
} }
catch (Exception e){ catch (Exception e){