mirror of
https://bitbucket.org/HeshamTB/barcodescanner2.git
synced 2024-12-23 04:31:50 +01:00
Merge branch 'master' into test-branch
This commit is contained in:
commit
096a05cb1d
@ -115,7 +115,6 @@ public class MainActivity extends AppCompatActivity implements OnClickListener {
|
||||
//take shot of barcode 2
|
||||
IntentIntegrator scanIntegrator = new IntentIntegrator(this);
|
||||
scanIntegrator.initiateScan(0);
|
||||
|
||||
}
|
||||
|
||||
else if (result.equalsIgnoreCase("member1")
|
||||
@ -131,11 +130,6 @@ public class MainActivity extends AppCompatActivity implements OnClickListener {
|
||||
flashLightOn();
|
||||
IntentIntegrator scanIntegrator = new IntentIntegrator(this);
|
||||
scanIntegrator.initiateScan(0);
|
||||
//Scan again if cont. is checked
|
||||
//make flash on!
|
||||
//open door
|
||||
//FlashLightUtilForL flash = new FlashLightUtilForL(this);
|
||||
//flash.turnOnFlashLight();
|
||||
}
|
||||
|
||||
else {
|
||||
@ -160,6 +154,7 @@ public class MainActivity extends AppCompatActivity implements OnClickListener {
|
||||
"No scan data received!", Toast.LENGTH_SHORT);
|
||||
toast.show();
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
catch (Exception e){
|
||||
|
Loading…
Reference in New Issue
Block a user