mirror of
https://github.com/wahyd4/BarcodeScanner.git
synced 2026-08-09 21:15:54 +10:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
58e773af70 | ||
|
|
bb3812c0cb | ||
|
|
029cb4de7d | ||
|
|
1e2535ad01 | ||
|
|
695f524777 |
+7
-2
@@ -2,7 +2,7 @@
|
||||
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
id="com.phonegap.plugins.barcodescanner"
|
||||
version="0.2.1">
|
||||
version="0.3.1">
|
||||
|
||||
<name>BarcodeScanner</name>
|
||||
|
||||
@@ -12,6 +12,11 @@
|
||||
<platform name="ios">
|
||||
<plugins-plist key="BarcodeScanner" string="CDVBarcodeScanner" />
|
||||
|
||||
<!-- Cordova >= 2.3 -->
|
||||
<config-file target="config.xml" parent="plugins">
|
||||
<plugin name="BarcodeScanner" value="CDVBarcodeScanner"/>
|
||||
</config-file>
|
||||
|
||||
<resource-file src="scannerOverlay.xib" />
|
||||
|
||||
<header-file src="zxing-all-in-one.h" />
|
||||
@@ -38,7 +43,7 @@
|
||||
value="com.phonegap.plugins.barcodescanner.BarcodeScanner"/>
|
||||
</config-file>
|
||||
|
||||
<config-file target="res/xml/config.xml" parent="/cordova/plugins">
|
||||
<config-file target="res/xml/config.xml" parent="plugins">
|
||||
<plugin name="BarcodeScanner"
|
||||
value="com.phonegap.plugins.barcodescanner.BarcodeScanner"/>
|
||||
</config-file>
|
||||
|
||||
@@ -121,7 +121,7 @@ public class BarcodeScanner extends Plugin {
|
||||
//Log.d(LOG_TAG, "This should never happen");
|
||||
}
|
||||
this.success(new PluginResult(PluginResult.Status.OK, obj), this.callback);
|
||||
} if (resultCode == Activity.RESULT_CANCELED) {
|
||||
} else if (resultCode == Activity.RESULT_CANCELED) {
|
||||
JSONObject obj = new JSONObject();
|
||||
try {
|
||||
obj.put(TEXT, "");
|
||||
|
||||
@@ -300,7 +300,7 @@ parentViewController:(UIViewController*)parentViewController
|
||||
- (NSString*)setUpCaptureSession {
|
||||
NSError* error = nil;
|
||||
|
||||
AVCaptureSession* captureSession = [[AVCaptureSession alloc] init];
|
||||
AVCaptureSession* captureSession = [[[AVCaptureSession alloc] init] autorelease];
|
||||
self.captureSession = captureSession;
|
||||
|
||||
AVCaptureDevice* device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
|
||||
|
||||
Reference in New Issue
Block a user