Parcourir la source

1.修改iOS RAImage扫码。

Pen Li il y a 7 ans
Parent
commit
29e07fc11a

+ 4 - 0
RA Image/RA Image.xcodeproj/project.pbxproj

@@ -46,6 +46,7 @@
 		42CE45CF217D73E6003ECD01 /* Signature.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 42CE45C9217D73E6003ECD01 /* Signature.xcassets */; };
 		42CE45CF217D73E6003ECD01 /* Signature.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 42CE45C9217D73E6003ECD01 /* Signature.xcassets */; };
 		42CE45D0217D73E6003ECD01 /* SignatureView.m in Sources */ = {isa = PBXBuildFile; fileRef = 42CE45CB217D73E6003ECD01 /* SignatureView.m */; };
 		42CE45D0217D73E6003ECD01 /* SignatureView.m in Sources */ = {isa = PBXBuildFile; fileRef = 42CE45CB217D73E6003ECD01 /* SignatureView.m */; };
 		42CE45D1217D73E6003ECD01 /* SignatureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42CE45CD217D73E6003ECD01 /* SignatureViewController.m */; };
 		42CE45D1217D73E6003ECD01 /* SignatureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42CE45CD217D73E6003ECD01 /* SignatureViewController.m */; };
+		42D49F7F21CCB9F7004F449E /* qrcode.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 42D49F7E21CCB9F7004F449E /* qrcode.xcassets */; };
 		42D64CC11FD12B21003F49F9 /* RAConvertor.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D64CC01FD12B21003F49F9 /* RAConvertor.m */; };
 		42D64CC11FD12B21003F49F9 /* RAConvertor.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D64CC01FD12B21003F49F9 /* RAConvertor.m */; };
 		42E1B0FD1EB1C8EE00EEF27C /* LoginSwitchCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42E1B0FB1EB1C8EE00EEF27C /* LoginSwitchCell.m */; };
 		42E1B0FD1EB1C8EE00EEF27C /* LoginSwitchCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42E1B0FB1EB1C8EE00EEF27C /* LoginSwitchCell.m */; };
 		42E1B0FE1EB1C8EE00EEF27C /* LoginTextFiledCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42E1B0FC1EB1C8EE00EEF27C /* LoginTextFiledCell.m */; };
 		42E1B0FE1EB1C8EE00EEF27C /* LoginTextFiledCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42E1B0FC1EB1C8EE00EEF27C /* LoginTextFiledCell.m */; };
@@ -159,6 +160,7 @@
 		42CE45CB217D73E6003ECD01 /* SignatureView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignatureView.m; sourceTree = "<group>"; };
 		42CE45CB217D73E6003ECD01 /* SignatureView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignatureView.m; sourceTree = "<group>"; };
 		42CE45CC217D73E6003ECD01 /* SignatureViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignatureViewController.h; sourceTree = "<group>"; };
 		42CE45CC217D73E6003ECD01 /* SignatureViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignatureViewController.h; sourceTree = "<group>"; };
 		42CE45CD217D73E6003ECD01 /* SignatureViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignatureViewController.m; sourceTree = "<group>"; };
 		42CE45CD217D73E6003ECD01 /* SignatureViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignatureViewController.m; sourceTree = "<group>"; };
+		42D49F7E21CCB9F7004F449E /* qrcode.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = qrcode.xcassets; sourceTree = "<group>"; };
 		42D64CBF1FD12B20003F49F9 /* RAConvertor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAConvertor.h; path = ../../common/RAConvertor.h; sourceTree = "<group>"; };
 		42D64CBF1FD12B20003F49F9 /* RAConvertor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAConvertor.h; path = ../../common/RAConvertor.h; sourceTree = "<group>"; };
 		42D64CC01FD12B21003F49F9 /* RAConvertor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAConvertor.m; path = ../../common/RAConvertor.m; sourceTree = "<group>"; };
 		42D64CC01FD12B21003F49F9 /* RAConvertor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAConvertor.m; path = ../../common/RAConvertor.m; sourceTree = "<group>"; };
 		42E1B0F91EB1C8EE00EEF27C /* LoginSwitchCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginSwitchCell.h; sourceTree = "<group>"; };
 		42E1B0F91EB1C8EE00EEF27C /* LoginSwitchCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginSwitchCell.h; sourceTree = "<group>"; };
@@ -255,6 +257,7 @@
 		4203E5F221BA5E88003E90BD /* QRCode */ = {
 		4203E5F221BA5E88003E90BD /* QRCode */ = {
 			isa = PBXGroup;
 			isa = PBXGroup;
 			children = (
 			children = (
+				42D49F7E21CCB9F7004F449E /* qrcode.xcassets */,
 				4203E5F321BA5E88003E90BD /* QRCode.storyboard */,
 				4203E5F321BA5E88003E90BD /* QRCode.storyboard */,
 				4203E5F421BA5E88003E90BD /* RAQRCodeScannerViewController.h */,
 				4203E5F421BA5E88003E90BD /* RAQRCodeScannerViewController.h */,
 				4203E5F521BA5E88003E90BD /* RAQRCodeScannerViewController.m */,
 				4203E5F521BA5E88003E90BD /* RAQRCodeScannerViewController.m */,
@@ -766,6 +769,7 @@
 			files = (
 			files = (
 				71DCDC471EAF234E00BA045A /* LaunchScreen.storyboard in Resources */,
 				71DCDC471EAF234E00BA045A /* LaunchScreen.storyboard in Resources */,
 				71DCDC441EAF234E00BA045A /* Assets.xcassets in Resources */,
 				71DCDC441EAF234E00BA045A /* Assets.xcassets in Resources */,
+				42D49F7F21CCB9F7004F449E /* qrcode.xcassets in Resources */,
 				71DCDC501EAF353000BA045A /* modelist.json in Resources */,
 				71DCDC501EAF353000BA045A /* modelist.json in Resources */,
 				426E6B291EB8720400942BE1 /* Mode.storyboard in Resources */,
 				426E6B291EB8720400942BE1 /* Mode.storyboard in Resources */,
 				4203E60021BA5E88003E90BD /* camera.xcassets in Resources */,
 				4203E60021BA5E88003E90BD /* camera.xcassets in Resources */,

+ 7 - 3
RA Image/RA Image/BasicModeViewController.m

@@ -193,7 +193,7 @@
 //    [self presentViewController:scannerVC animated:YES completion:nil];
 //    [self presentViewController:scannerVC animated:YES completion:nil];
     
     
     RAQRCodeScannerViewController *scannerVC = [RAQRCodeScannerViewController viewControllerFromStoryboard];
     RAQRCodeScannerViewController *scannerVC = [RAQRCodeScannerViewController viewControllerFromStoryboard];
-    scannerVC.completion = ^(NSString *value) {
+    scannerVC.QRCodeViewControllerDidCompletion = ^(RAQRCodeScannerViewController *qrcodeViewController, NSString *value) {
         
         
         if (value.length) {
         if (value.length) {
             
             
@@ -203,8 +203,12 @@
             }
             }
             
             
         }
         }
-
-        
+        [qrcodeViewController.navigationController popViewControllerAnimated:YES];
+    };
+    
+    scannerVC.QRCodeViewControllerDidCanceled = ^(RAQRCodeScannerViewController *qrcodeViewController) {
+      
+        [qrcodeViewController.navigationController popViewControllerAnimated:YES];
     };
     };
     
     
     [self.navigationController pushViewController:scannerVC animated:YES];
     [self.navigationController pushViewController:scannerVC animated:YES];