Commit 54f376a4f93458099f2c57b94e688b4cb2ffa967
1 parent
5e5e5748
no message
Showing
1 changed file
with
11 additions
and
2 deletions
CNLiveQrCodeModule/Classes/Controller/CNLiveScanResultController.m
| @@ -61,7 +61,7 @@ | @@ -61,7 +61,7 @@ | ||
| 61 | #pragma mark - 代理 | 61 | #pragma mark - 代理 |
| 62 | - (void)navigationBar:(CNLiveQrCodeNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{ | 62 | - (void)navigationBar:(CNLiveQrCodeNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{ |
| 63 | if ([actionEvents isEqualToString:@"1"]) { | 63 | if ([actionEvents isEqualToString:@"1"]) { |
| 64 | -// [self goBack]; | 64 | + [self goBack]; |
| 65 | } | 65 | } |
| 66 | } | 66 | } |
| 67 | 67 | ||
| @@ -93,7 +93,16 @@ | @@ -93,7 +93,16 @@ | ||
| 93 | } | 93 | } |
| 94 | return _webView; | 94 | return _webView; |
| 95 | } | 95 | } |
| 96 | - | 96 | +#pragma mark - 响应方法 |
| 97 | +- (void)goBack { | ||
| 98 | + if (self.presentingViewController != nil) { | ||
| 99 | + [self dismissViewControllerAnimated:YES completion:nil]; | ||
| 100 | + | ||
| 101 | + } | ||
| 102 | + else { | ||
| 103 | + [self.navigationController popViewControllerAnimated:YES]; | ||
| 104 | + } | ||
| 105 | +} | ||
| 97 | /** | 106 | /** |
| 98 | * 创建图片 | 107 | * 创建图片 |
| 99 | * | 108 | * |