tret2003/checker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#12267 change scan flow

Browse Source
This commit is contained in:
nikitateplyakov
2019-02-11 18:21:52 +08:00
parent d499269940
commit 5975252e8c
13 changed files with 334 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/app/src/main/java/com/dinect/checker/MainActivity.java
View File

@@ -38,6 +38,7 @@ public class MainActivity extends FlutterActivity {
private MethodChannel mChannel;
private Map mScannerArgs;
private Result scannerResult;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -59,6 +60,7 @@ public class MainActivity extends FlutterActivity {
result.success(BuildConfig.currency);
break;
case "startScanner":
scannerResult = result;
startScannerActivity(call);
break;
case "isOnline":
@@ -169,7 +171,7 @@ public class MainActivity extends FlutterActivity {
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == START_SCANNER_REQUEST_CODE) {
if (resultCode == RESULT_CANCELED) {
finish();
scannerResult.error("Scanning is cancelled", null, null);
} else if (resultCode == RESULT_OK) {
if (data != null && data.getExtras() != null) {
String user = data.getExtras().getString("user", null);
@@ -178,7 +180,9 @@ public class MainActivity extends FlutterActivity {
ArrayList<String> args = new ArrayList<>(2);
args.add(user);
args.add(card);
mChannel.invokeMethod("purchase", args);
if(scannerResult != null) {
scannerResult.success(args);
}
} else {
String menuItem = data.getExtras().getString("item", null);
if (menuItem != null) {