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

13450 merge 12267_new_flow and update to new flutter version

Browse Source
This commit is contained in:
nikitateplyakov
2019-11-20 16:37:36 +03:00
parent 8ca95b0d34 b5c4166f15
commit f535ec5fe0
16 changed files with 490 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ios/Runner/AppDelegate.m
View File

@@ -12,9 +12,7 @@
FlutterMethodChannel* platformChannel = [FlutterMethodChannel
methodChannelWithName:@"com.dinect.checker/instance_id"
binaryMessenger:controller];
__weak FlutterMethodChannel* weekPlatformChannel = platformChannel;
binaryMessenger:controller.binaryMessenger];
NSString *bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
@@ -116,7 +114,7 @@
result(buildSettings[@"currency"]);
} else if ([@"startScanner" isEqualToString:call.method]) {
ScannerViewController *modalViewController = [[ScannerViewController alloc] initWithStrings:call.arguments];
modalViewController.platformChannel = weekPlatformChannel;
modalViewController.platformChannel = platformChannel;
[controller presentViewController:modalViewController animated:YES completion:nil];
} else if ([@"isOnline" isEqualToString:call.method]) {
result(@YES);

2
ios/Runner/ScannerViewController.swift
View File

@@ -272,7 +272,7 @@ import ZXingObjC
} else {
print("Result is not nil (ios code)");
self.dismiss(animated: true) {
self.platformChannel?.invokeMethod("purchase", arguments: [result, str])
self.platformChannel?.invokeMethod("scanSuccess", arguments: [result!, str])
}
}
})