|
|
@@ -314,17 +314,40 @@
|
|
|
NSLog(@"%@", [_output availableMetadataObjectTypes]);
|
|
|
NSString* log = [NSString stringWithFormat:@"%@ \n",[_output availableMetadataObjectTypes]];
|
|
|
self.tvdbg_log.text = [self.tvdbg_log.text stringByAppendingString:log];
|
|
|
- self.output.metadataObjectTypes = @[
|
|
|
- AVMetadataObjectTypeQRCode,
|
|
|
-// AVMetadataObjectTypeEAN13Code,
|
|
|
-// AVMetadataObjectTypeEAN8Code,
|
|
|
-// AVMetadataObjectTypeUPCECode,
|
|
|
-// AVMetadataObjectTypeCode39Code,
|
|
|
-// AVMetadataObjectTypeCode39Mod43Code,
|
|
|
-// AVMetadataObjectTypeCode93Code,
|
|
|
- AVMetadataObjectTypeCode128Code
|
|
|
-// AVMetadataObjectTypePDF417Code
|
|
|
- ];
|
|
|
+
|
|
|
+ if(self.scanType==RAScanTypeAll)
|
|
|
+ {
|
|
|
+ self.output.metadataObjectTypes = self.output.availableMetadataObjectTypes;
|
|
|
+ }
|
|
|
+ else if(self.scanType == RAScanTypeBarcode)
|
|
|
+ {
|
|
|
+ self.output.metadataObjectTypes = @[
|
|
|
+// AVMetadataObjectTypeQRCode,
|
|
|
+ AVMetadataObjectTypeEAN13Code,
|
|
|
+ AVMetadataObjectTypeEAN8Code,
|
|
|
+ AVMetadataObjectTypeUPCECode,
|
|
|
+ AVMetadataObjectTypeCode39Code,
|
|
|
+ AVMetadataObjectTypeCode39Mod43Code,
|
|
|
+ AVMetadataObjectTypeCode93Code,
|
|
|
+ AVMetadataObjectTypeCode128Code
|
|
|
+ // AVMetadataObjectTypePDF417Code
|
|
|
+ ];
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ self.output.metadataObjectTypes = @[
|
|
|
+ AVMetadataObjectTypeQRCode,
|
|
|
+ // AVMetadataObjectTypeEAN13Code,
|
|
|
+ // AVMetadataObjectTypeEAN8Code,
|
|
|
+ // AVMetadataObjectTypeUPCECode,
|
|
|
+ // AVMetadataObjectTypeCode39Code,
|
|
|
+ // AVMetadataObjectTypeCode39Mod43Code,
|
|
|
+ // AVMetadataObjectTypeCode93Code,
|
|
|
+// AVMetadataObjectTypeCode128Code
|
|
|
+ AVMetadataObjectTypePDF417Code
|
|
|
+ ];
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
log = [NSString stringWithFormat:@"set : \n %@ \n",self.output.metadataObjectTypes];
|
|
|
|