Explorar el Código

1.修改iOS Apex CRM扫码。

Pen Li hace 7 años
padre
commit
64011ab1fd

+ 4 - 0
RedAnt CRM/APEX CRM/APEX CRM.xcodeproj/project.pbxproj

@@ -35,6 +35,7 @@
 		42A8A21A21AE8309003B854B /* RAPhotoPreview.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 42A8A21921AE8309003B854B /* RAPhotoPreview.xcassets */; };
 		42A8A21F21AE842E003B854B /* RAPhotoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 42A8A21E21AE842E003B854B /* RAPhotoModel.m */; };
 		42A8A22321AE8603003B854B /* UIImage+RedAnt.m in Sources */ = {isa = PBXBuildFile; fileRef = 42A8A22221AE8603003B854B /* UIImage+RedAnt.m */; };
+		42D49F7D21CC983A004F449E /* qrcode.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 42D49F7C21CC983A004F449E /* qrcode.xcassets */; };
 		42F53F8621B617E4008EAEFC /* signature.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42F53F8021B617E3008EAEFC /* signature.storyboard */; };
 		42F53F8721B617E4008EAEFC /* Signature.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 42F53F8121B617E3008EAEFC /* Signature.xcassets */; };
 		42F53F8821B617E4008EAEFC /* SignatureView.m in Sources */ = {isa = PBXBuildFile; fileRef = 42F53F8321B617E3008EAEFC /* SignatureView.m */; };
@@ -116,6 +117,7 @@
 		42A8A21E21AE842E003B854B /* RAPhotoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAPhotoModel.m; sourceTree = "<group>"; };
 		42A8A22121AE8603003B854B /* UIImage+RedAnt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+RedAnt.h"; sourceTree = "<group>"; };
 		42A8A22221AE8603003B854B /* UIImage+RedAnt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+RedAnt.m"; sourceTree = "<group>"; };
+		42D49F7C21CC983A004F449E /* qrcode.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = qrcode.xcassets; sourceTree = "<group>"; };
 		42F53F8021B617E3008EAEFC /* signature.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = signature.storyboard; sourceTree = "<group>"; };
 		42F53F8121B617E3008EAEFC /* Signature.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Signature.xcassets; sourceTree = "<group>"; };
 		42F53F8221B617E3008EAEFC /* SignatureView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignatureView.h; sourceTree = "<group>"; };
@@ -181,6 +183,7 @@
 				4212AB8121AD22AA00BE4E45 /* QRCode.storyboard */,
 				4212AB8221AD22AA00BE4E45 /* RAQRCodeScannerViewController.h */,
 				4212AB8321AD22AA00BE4E45 /* RAQRCodeScannerViewController.m */,
+				42D49F7C21CC983A004F449E /* qrcode.xcassets */,
 			);
 			name = QRCode;
 			path = ../../../common/QRCode;
@@ -577,6 +580,7 @@
 				42F53F9321B651B6008EAEFC /* date.strings in Resources */,
 				42F53F8721B617E4008EAEFC /* Signature.xcassets in Resources */,
 				42A8A21A21AE8309003B854B /* RAPhotoPreview.xcassets in Resources */,
+				42D49F7D21CC983A004F449E /* qrcode.xcassets in Resources */,
 				7106E81521A684F50056DD20 /* LaunchScreen.storyboard in Resources */,
 				4212AB9D21AD2AFE00BE4E45 /* InfoPlist.strings in Resources */,
 				7106E81221A684F50056DD20 /* Assets.xcassets in Resources */,

+ 8 - 3
RedAnt CRM/APEX CRM/APEX CRM/RAWKWebView.m

@@ -181,11 +181,16 @@
 - (void)ra_openQRCodeScanner:(NSDictionary *)params {
     
     RAQRCodeScannerViewController *scanVC = [RAQRCodeScannerViewController viewControllerFromStoryboard];
-    
-    scanVC.completion = ^(NSString *value) {
+
+    scanVC.QRCodeViewControllerDidCompletion = ^(RAQRCodeScannerViewController *qrcodeViewController, NSString *value) {
         
         [self returnToWebPage:params value:value];
-
+        [qrcodeViewController.navigationController popViewControllerAnimated:YES];
+    };
+    
+    scanVC.QRCodeViewControllerDidCanceled = ^(RAQRCodeScannerViewController *qrcodeViewController) {
+      
+        [qrcodeViewController.navigationController popViewControllerAnimated:YES];
     };
     
     [self.ra_viewController.navigationController pushViewController:scanVC animated:YES];