From 0f57824761d0aa5221ccc2b7f92663eca3b774c5 Mon Sep 17 00:00:00 2001 From: Jadyn <> Date: Mon, 21 Sep 2020 16:08:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LBXScanDemo/LBXScanDemo/StyleDIY.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LBXScanDemo/LBXScanDemo/StyleDIY.m b/LBXScanDemo/LBXScanDemo/StyleDIY.m index dabeba5..640a769 100644 --- a/LBXScanDemo/LBXScanDemo/StyleDIY.m +++ b/LBXScanDemo/LBXScanDemo/StyleDIY.m @@ -44,7 +44,7 @@ + (LBXScanViewStyle*)qqStyle style.notRecoginitonArea = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.6]; - + NSLog(@"提交1"); return style; } From 7ac19a81449be30fdfb0c346bfb6e92d8d55a3e7 Mon Sep 17 00:00:00 2001 From: Jadyn <> Date: Mon, 21 Sep 2020 16:08:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E4=BA=A42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LBXScanDemo/LBXScanDemo/DIYScanViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LBXScanDemo/LBXScanDemo/DIYScanViewController.m b/LBXScanDemo/LBXScanDemo/DIYScanViewController.m index 769c941..998b642 100644 --- a/LBXScanDemo/LBXScanDemo/DIYScanViewController.m +++ b/LBXScanDemo/LBXScanDemo/DIYScanViewController.m @@ -66,7 +66,7 @@ - (void)popAlertMsgWithScanResult:(NSString*)strResult strResult = @"识别失败"; } - + NSLog(@"提交2"); __weak __typeof(self) weakSelf = self; [LBXAlertAction showAlertWithTitle:@"扫码内容" msg:strResult buttonsStatement:@[@"知道了"] chooseBlock:^(NSInteger buttonIdx) { From d65e2eb485308a6c8dcc8ddeb67750f47fbc352d Mon Sep 17 00:00:00 2001 From: Jadyn <> Date: Mon, 21 Sep 2020 16:09:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A43?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LBXScanDemo/LBXScanDemo/CreateBarCodeViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LBXScanDemo/LBXScanDemo/CreateBarCodeViewController.m b/LBXScanDemo/LBXScanDemo/CreateBarCodeViewController.m index 945ce4f..b43e23b 100644 --- a/LBXScanDemo/LBXScanDemo/CreateBarCodeViewController.m +++ b/LBXScanDemo/LBXScanDemo/CreateBarCodeViewController.m @@ -37,7 +37,7 @@ - (void)viewDidLoad { self.edgesForExtendedLayout = UIRectEdgeNone; } self.view.backgroundColor = [UIColor whiteColor]; - + NSLog(@"提交3"); [self showSetttingButton]; } From 4b2a4943abbe600a0cb33a532534471531ac3c8b Mon Sep 17 00:00:00 2001 From: Jadyn <> Date: Thu, 24 Sep 2020 16:42:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E5=92=8C=E6=9D=A1=E5=BD=A2=E7=A0=81=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E5=8F=AF=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LBXScanDemo/LBXScanDemo/CreateBarCodeViewController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/LBXScanDemo/LBXScanDemo/CreateBarCodeViewController.m b/LBXScanDemo/LBXScanDemo/CreateBarCodeViewController.m index b43e23b..41372ae 100644 --- a/LBXScanDemo/LBXScanDemo/CreateBarCodeViewController.m +++ b/LBXScanDemo/LBXScanDemo/CreateBarCodeViewController.m @@ -74,6 +74,7 @@ - (void)viewDidAppear:(BOOL)animated [view addSubview:_qrImgView]; self.qrView = view; + NSLog(@"设置条形码和二维码同时可扫描"); //条形码 self.tView = [[UIView alloc]initWithFrame:CGRectMake( (CGRectGetWidth(self.view.frame)-CGRectGetWidth(self.view.frame)*5/6)/2,