rhodes 3.2.1 → 3.2.2.beta

data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/camera/CameraManager.java

@@ -64,6 +64,7 @@ public final class CameraManager {
   private final Context context;
   private final CameraConfigurationManager configManager;
   private Camera camera;
+  private int mCameraIndex = 0;
   private Rect framingRect;
   private Rect framingRectInPreview;
   private boolean initialized;
@@ -82,9 +83,9 @@ public final class CameraManager {
    *
    * @param context The Activity which wants to use the camera.
    */
-  public static void init(Context context) {
+  public static void init(Context context, int camera_index) {
     if (cameraManager == null) {
-      cameraManager = new CameraManager(context);
+      cameraManager = new CameraManager(context, camera_index);
     }
   }
 
@@ -97,8 +98,9 @@ public final class CameraManager {
     return cameraManager;
   }
 
-  private CameraManager(Context context) {
+  private CameraManager(Context context, int camera_index) {
 
+	this.mCameraIndex = camera_index;
     this.context = context;
     this.configManager = new CameraConfigurationManager(context);
 
@@ -121,7 +123,12 @@ public final class CameraManager {
    */
   public void openDriver(SurfaceHolder holder) throws IOException {
     if (camera == null) {
-      camera = Camera.open();
+      if (mCameraIndex == 0) {	
+    	  camera = Camera.open();
+      }
+      else {
+    	  camera = com.rhomobile.rhodes.camera.Camera.getCameraService().getFrontCamera();  
+      }
       if (camera == null) {
         throw new IOException();
       }

data/lib/extensions/barcode/ext/barcode/platform/android/src/com/rhomobile/barcode/Barcode.java

@@ -65,13 +65,14 @@ public class Barcode {
 
      private static String ourCallback = null;
      
-     public static void take(String callback) {
+     public static void take(String callback, int camera_index) {
     	 ourCallback = callback;
     	 
 //    	 PerformOnUiThread.exec( new Runnable() {
 //    		 public void run() {
 				RhodesActivity ra = RhodesActivity.safeGetInstance();
 				Intent intent = new Intent(ra, com.google.zxing.client.android.CaptureActivity.class);
+				intent.putExtra(com.google.zxing.client.android.CaptureActivity.CAMERA_INDEX_EXTRA, camera_index);
 				ra.startActivity(intent);
 //    		 }
 //    	 });

data/lib/extensions/barcode/ext/barcode/platform/iphone/Barcode.xcodeproj/project.pbxproj

@@ -18,6 +18,15 @@
 		FA4D3F4E136B07B2009D6E63 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA4D3F4D136B07B2009D6E63 /* CoreMedia.framework */; };
 		FA4D3F50136B07BB009D6E63 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA4D3F4F136B07BB009D6E63 /* CoreVideo.framework */; };
 		FA4D3F52136B07CA009D6E63 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FA4D3F51136B07CA009D6E63 /* libiconv.dylib */; };
+		FAA838881455B0BA0002F4E6 /* BarcodeViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = FAA838831455B0BA0002F4E6 /* BarcodeViewFactory.h */; };
+		FAA838891455B0BA0002F4E6 /* BarcodeViewFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAA838841455B0BA0002F4E6 /* BarcodeViewFactory.mm */; };
+		FAA8388A1455B0BA0002F4E6 /* BarcodeViewFactoryRegister.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAA838851455B0BA0002F4E6 /* BarcodeViewFactoryRegister.mm */; };
+		FAA8388B1455B0BA0002F4E6 /* BarcodeViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = FAA838861455B0BA0002F4E6 /* BarcodeViewManager.h */; };
+		FAA8388C1455B0BA0002F4E6 /* BarcodeViewManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAA838871455B0BA0002F4E6 /* BarcodeViewManager.mm */; };
+		FAA838901455B1F60002F4E6 /* BarcodeViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = FAA8388E1455B1F60002F4E6 /* BarcodeViewController.h */; };
+		FAA838911455B1F60002F4E6 /* BarcodeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FAA8388F1455B1F60002F4E6 /* BarcodeViewController.m */; };
+		FAA839321455F7210002F4E6 /* BarcodeCallbackHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = FAA839301455F7210002F4E6 /* BarcodeCallbackHelper.h */; };
+		FAA839331455F7210002F4E6 /* BarcodeCallbackHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAA839311455F7210002F4E6 /* BarcodeCallbackHelper.mm */; };
 		FAAE06AD11EF4F02001787D8 /* ImageProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAAE06AA11EF4F02001787D8 /* ImageProvider.cpp */; };
 		FAAE06AE11EF4F02001787D8 /* ImageProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = FAAE06AB11EF4F02001787D8 /* ImageProvider.h */; };
 		FAAE06AF11EF4F02001787D8 /* ImageProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAAE06AC11EF4F02001787D8 /* ImageProvider.mm */; };
@@ -38,6 +47,15 @@
 		FA4D3F4D136B07B2009D6E63 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
 		FA4D3F4F136B07BB009D6E63 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
 		FA4D3F51136B07CA009D6E63 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
+		FAA838831455B0BA0002F4E6 /* BarcodeViewFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BarcodeViewFactory.h; path = Classes/BarcodeViewFactory.h; sourceTree = "<group>"; };
+		FAA838841455B0BA0002F4E6 /* BarcodeViewFactory.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BarcodeViewFactory.mm; path = Classes/BarcodeViewFactory.mm; sourceTree = "<group>"; };
+		FAA838851455B0BA0002F4E6 /* BarcodeViewFactoryRegister.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BarcodeViewFactoryRegister.mm; path = Classes/BarcodeViewFactoryRegister.mm; sourceTree = "<group>"; };
+		FAA838861455B0BA0002F4E6 /* BarcodeViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BarcodeViewManager.h; path = Classes/BarcodeViewManager.h; sourceTree = "<group>"; };
+		FAA838871455B0BA0002F4E6 /* BarcodeViewManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BarcodeViewManager.mm; path = Classes/BarcodeViewManager.mm; sourceTree = "<group>"; };
+		FAA8388E1455B1F60002F4E6 /* BarcodeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BarcodeViewController.h; path = Classes/BarcodeViewController.h; sourceTree = "<group>"; };
+		FAA8388F1455B1F60002F4E6 /* BarcodeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BarcodeViewController.m; path = Classes/BarcodeViewController.m; sourceTree = "<group>"; };
+		FAA839301455F7210002F4E6 /* BarcodeCallbackHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BarcodeCallbackHelper.h; path = Classes/BarcodeCallbackHelper.h; sourceTree = "<group>"; };
+		FAA839311455F7210002F4E6 /* BarcodeCallbackHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BarcodeCallbackHelper.mm; path = Classes/BarcodeCallbackHelper.mm; sourceTree = "<group>"; };
 		FAAE06AA11EF4F02001787D8 /* ImageProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ImageProvider.cpp; path = Classes/ImageProvider.cpp; sourceTree = "<group>"; };
 		FAAE06AB11EF4F02001787D8 /* ImageProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ImageProvider.h; path = Classes/ImageProvider.h; sourceTree = "<group>"; };
 		FAAE06AC11EF4F02001787D8 /* ImageProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ImageProvider.mm; path = Classes/ImageProvider.mm; sourceTree = "<group>"; };
@@ -104,6 +122,15 @@
 		08FB77AEFE84172EC02AAC07 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				FAA839301455F7210002F4E6 /* BarcodeCallbackHelper.h */,
+				FAA839311455F7210002F4E6 /* BarcodeCallbackHelper.mm */,
+				FAA8388E1455B1F60002F4E6 /* BarcodeViewController.h */,
+				FAA8388F1455B1F60002F4E6 /* BarcodeViewController.m */,
+				FAA838831455B0BA0002F4E6 /* BarcodeViewFactory.h */,
+				FAA838841455B0BA0002F4E6 /* BarcodeViewFactory.mm */,
+				FAA838851455B0BA0002F4E6 /* BarcodeViewFactoryRegister.mm */,
+				FAA838861455B0BA0002F4E6 /* BarcodeViewManager.h */,
+				FAA838871455B0BA0002F4E6 /* BarcodeViewManager.mm */,
 				FA4D3F0E136AFA94009D6E63 /* barcode.m */,
 				FAAE06AA11EF4F02001787D8 /* ImageProvider.cpp */,
 				FAAE06AB11EF4F02001787D8 /* ImageProvider.h */,
@@ -154,6 +181,10 @@
 			files = (
 				AA747D9F0F9514B9006C5449 /* Barcode_Prefix.pch in Headers */,
 				FAAE06AE11EF4F02001787D8 /* ImageProvider.h in Headers */,
+				FAA838881455B0BA0002F4E6 /* BarcodeViewFactory.h in Headers */,
+				FAA8388B1455B0BA0002F4E6 /* BarcodeViewManager.h in Headers */,
+				FAA838901455B1F60002F4E6 /* BarcodeViewController.h in Headers */,
+				FAA839321455F7210002F4E6 /* BarcodeCallbackHelper.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -211,6 +242,11 @@
 				FAAE06AF11EF4F02001787D8 /* ImageProvider.mm in Sources */,
 				FAAE072811EF4F22001787D8 /* barcode_wrap.c in Sources */,
 				FA4D3F0F136AFA94009D6E63 /* barcode.m in Sources */,
+				FAA838891455B0BA0002F4E6 /* BarcodeViewFactory.mm in Sources */,
+				FAA8388A1455B0BA0002F4E6 /* BarcodeViewFactoryRegister.mm in Sources */,
+				FAA8388C1455B0BA0002F4E6 /* BarcodeViewManager.mm in Sources */,
+				FAA838911455B1F60002F4E6 /* BarcodeViewController.m in Sources */,
+				FAA839331455F7210002F4E6 /* BarcodeCallbackHelper.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeCallbackHelper.h

@@ -0,0 +1,25 @@
+
+
+#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+
+
+
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+	
+void Barcode_executeRhoCallBackWithParams(NSString* callbackURL,
+	NSString* intName, int intValue,
+    NSString* str1Name, NSString* str1Value,
+    NSString* str2Name, NSString* str2Value,
+    NSString* str3Name, NSString* str3Value,
+    NSString* dataName, NSData* dataValue
+);
+
+#ifdef __cplusplus
+}
+#endif //__cplusplus

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeCallbackHelper.mm

@@ -0,0 +1,195 @@
+
+
+
+// rhodes/platform/shared/rubyext/WebView.h
+#import "rubyext/WebView.h"
+//void rho_webview_navigate(const char* url, int index);
+
+
+// rhodes/platform/shared/common/RhodesApp.h
+#import "common/RhodesApp.h"
+//void rho_net_request(const char *url);
+//char* rho_http_normalizeurl(const char* szUrl);
+
+//#include "net/INetRequest.h"
+
+#include "ruby/ext/rho/rhoruby.h"
+
+#include <string.h>
+
+#import "BarcodeCallbackHelper.h"
+
+
+/*
+ VALUE rho_ruby_create_string(const char* szVal);
+ VALUE rho_ruby_create_string_withlen(int len);
+ VALUE rho_ruby_create_boolean(unsigned char b);
+ VALUE rho_ruby_create_integer(__int64 i);
+ VALUE rho_ruby_create_double(double d);
+ VALUE rho_ruby_create_time(long t);
+ void rho_ruby_add_to_array(VALUE ar, VALUE val);
+ 
+ time_t rho_ruby_get_time(VALUE rTime);
+ 
+ VALUE rho_ruby_create_byte_array(unsigned char* buf, int length);	
+ int rho_ruby_unpack_byte_array(VALUE array_value, unsigned char* buf, int max_length);
+
+*/
+
+
+
+class BarcodeRhoCallbackIntContainer : public rho::ICallbackObject
+{
+public:
+	BarcodeRhoCallbackIntContainer(int number)
+	{
+		mNumber = number;
+	}
+	virtual ~BarcodeRhoCallbackIntContainer() {
+	}
+	
+	// return Ruby object
+	virtual unsigned long getObjectValue() {
+		unsigned long rrr = rho_ruby_create_integer(mNumber);
+		return rrr;
+	}
+	
+private:
+	int mNumber;
+	
+};
+
+class BarcodeRhoCallbackStringContainer : public rho::ICallbackObject
+{
+public:
+	BarcodeRhoCallbackStringContainer(NSString* str)
+	{
+		const char* utf8str = [str UTF8String];
+		mString = new char[strlen(utf8str) + 1];
+		strcpy(mString, utf8str);
+	}
+	virtual ~BarcodeRhoCallbackStringContainer() {
+		delete mString;
+	}
+	
+	// return Ruby object
+	virtual unsigned long getObjectValue() {
+		unsigned long rrr = rho_ruby_create_string((const char*)mString);
+		return rrr;
+	}
+	
+private:
+	char* mString;
+	
+};
+
+class BarcodeRhoCallbackDataContainer : public rho::ICallbackObject
+{
+public:
+	BarcodeRhoCallbackDataContainer(NSData* data)
+	{
+		mDataSize = [data length];
+		mData = new unsigned char[mDataSize+1];
+		[data getBytes:mData length:mDataSize];
+	}
+	virtual ~BarcodeRhoCallbackDataContainer() {
+		delete mData;
+	}
+	
+	// return Ruby object
+	virtual unsigned long getObjectValue() {
+		return rho_ruby_create_byte_array(mData, mDataSize);
+	}
+	
+private:
+	unsigned char*	mData;
+	int				mDataSize;
+	
+};
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+
+
+void Barcode_executeRhoCallBackWithParams(NSString* callbackURL,
+							   NSString* intName, int intValue,
+							   NSString* str1Name, NSString* str1Value,
+							   NSString* str2Name, NSString* str2Value,
+							   NSString* str3Name, NSString* str3Value,
+							   NSString* dataName, NSData* dataValue
+							   ) 
+{
+	NSString* strBody = @"&rho_callback=1";
+	
+	if (intName != nil) {
+		strBody = [strBody stringByAppendingString:@"&"];
+		
+		//NSNumber *number = [NSNumber numberWithInt:intValue];
+		//NSString* intValueStr = [NSString stringWithFormat:@"%@",number];
+		//NSString* strParam = @"";						 
+		//strParam = [strParam stringByAppendingString:intName];
+		//strParam = [strParam stringByAppendingString:@"="];
+		//strParam = [strParam stringByAppendingString:intValueStr];
+		NSString* strParam = [NSString stringWithUTF8String:(RHODESAPP().addCallbackObject( new BarcodeRhoCallbackIntContainer(intValue), [intName UTF8String]).c_str())]; 
+		
+		strBody = [strBody stringByAppendingString:strParam];
+	}
+	if ((str1Name != nil) && (str1Value != null)) {
+		strBody = [strBody stringByAppendingString:@"&"];
+		
+		//NSString* strParam = @"";						 
+		//strParam = [strParam stringByAppendingString:str1Name];
+		//strParam = [strParam stringByAppendingString:@"="];
+		//strParam = [strParam stringByAppendingString:str1Value];
+		NSString* strParam = [NSString stringWithUTF8String:(RHODESAPP().addCallbackObject( new BarcodeRhoCallbackStringContainer(str1Value), [str1Name UTF8String]).c_str())]; 
+
+		strBody = [strBody stringByAppendingString:strParam];
+	}
+	if ((str2Name != nil) && (str2Value != null)) {
+		strBody = [strBody stringByAppendingString:@"&"];
+
+		//NSString* strParam = @"";						 
+		//strParam = [strParam stringByAppendingString:str2Name];
+		//strParam = [strParam stringByAppendingString:@"="];
+		//strParam = [strParam stringByAppendingString:str2Value];
+		NSString* strParam = [NSString stringWithUTF8String:(RHODESAPP().addCallbackObject( new BarcodeRhoCallbackStringContainer(str2Value), [str2Name UTF8String]).c_str())]; 
+
+		strBody = [strBody stringByAppendingString:strParam];
+	}
+	if ((str3Name != nil) && (str3Value != null)) {
+		strBody = [strBody stringByAppendingString:@"&"];
+		
+		//NSString* strParam = @"";						 
+		//strParam = [strParam stringByAppendingString:str3Name];
+		//strParam = [strParam stringByAppendingString:@"="];
+		//strParam = [strParam stringByAppendingString:str3Value];
+		NSString* strParam = [NSString stringWithUTF8String:(RHODESAPP().addCallbackObject( new BarcodeRhoCallbackStringContainer(str3Value), [str3Name UTF8String]).c_str())]; 
+		
+		strBody = [strBody stringByAppendingString:strParam];
+	}
+	if (dataName != nil) {
+		strBody = [strBody stringByAppendingString:@"&"];
+		NSString* strParam = [NSString stringWithUTF8String:(RHODESAPP().addCallbackObject( new BarcodeRhoCallbackDataContainer(dataValue), [dataName UTF8String]).c_str())]; 
+		strBody = [strBody stringByAppendingString:strParam];
+	}
+	
+	const char* cb = [callbackURL UTF8String];
+	const char* b = [strBody UTF8String];
+    char* norm_url = rho_http_normalizeurl(cb);
+
+	rho_net_request_with_data(rho_http_normalizeurl(cb), b);
+    
+    rho_http_free(norm_url);
+    
+    
+}
+
+	
+#ifdef __cplusplus
+	}
+#endif //__cplusplus
+	
+

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewController.h

@@ -0,0 +1,59 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#import <UIKit/UIKit.h>
+//#import "RhoMainView.h"
+//#import "RhoViewController.h"
+//#import "ZBarSDK/Headers/ZBarSDK/ZBarSDK.h"
+#import "ZBarSDK.h"
+
+
+@interface BarcodeViewController : UIViewController <ZBarReaderViewDelegate> {
+	UIView *signatureView; 
+	UIToolbar *toolbar;
+
+    ZBarReaderView *readerView;
+    UITextView *resultText;
+    ZBarCameraSimulator *cameraSim;
+    
+    NSString* callback_url;
+    
+}
+
+@property (nonatomic, retain) ZBarReaderView *readerView;
+@property (nonatomic, retain) UITextView *resultText;
+@property (nonatomic, retain) NSString* callback_url;
+
+
++(void)createBarcodeView:(NSString*) callback;
+
+- (id)initWithRect:(CGRect)rect;
+
+- (void)loadView;
+
++(UIView*) getCurrentView;
+
+@end

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewController.m

@@ -0,0 +1,346 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#import "BarcodeViewController.h"
+#import "BarcodeViewManager.h"
+
+//#import "AppManager.h"
+//#import "Rhodes.h"
+#import "common/RhodesApp.h"
+
+#include "common/RhoConf.h"
+#include "common/RhodesApp.h"
+#include "logging/RhoLog.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "BarcodeViewController"
+
+#include "BarcodeCallbackHelper.h"
+
+static BarcodeViewController* bv = nil;
+
+
+
+@interface RhoCreateBarcodeViewTask : NSObject {}
+
++ (void)run:(NSString*)value;
+
+@end
+
+@implementation RhoCreateBarcodeViewTask
+
+static RhoCreateBarcodeViewTask* instance_create = nil;
+
+-(void)runCommand:(NSString*)callback {
+    //if (mc) {
+    //    [mc close];
+    //    mc = nil;
+    //}
+    BarcodeViewController* bvc = [[BarcodeViewController alloc] initWithCallback:callback];
+	bv = bvc;
+	[BarcodeViewManager openView];
+    
+}
+
++(void) run:(NSString*)value {
+	if (instance_create == nil) {
+		instance_create = [[RhoCreateBarcodeViewTask alloc] init];
+	}
+    [instance_create performSelectorOnMainThread:@selector(runCommand:) withObject:value waitUntilDone:NO];
+}
+
+@end
+
+
+
+
+
+
+
+@implementation BarcodeViewController
+
+
++(void)createBarcodeView:(NSString*) callback {
+    [RhoCreateBarcodeViewTask run:callback];
+}
+
+
+- (id)initWithCallback:(NSString*)callback {
+	[self initWithRect:CGRectMake(0,0,320,460)];
+    callback_url = callback;
+	return self;
+}
+
+
+
+- (id)initWithRect:(CGRect)rect{
+	[self init];
+	
+	self.view.frame = rect;
+
+	//content.backgroundColor = [UIColor redColor];
+	//1ontent.backgroundColor = [UIColor groupTableViewBackgroundColor];
+	
+	toolbar = [[UIToolbar alloc] init];
+	toolbar.barStyle = UIBarStyleBlack;
+	
+	toolbar.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
+	toolbar.autoresizesSubviews = YES;
+	
+	{
+		UIBarButtonItem *btn_fixed = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
+		UIBarButtonItem* btn_cancel = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(doCancel:)];
+		UIBarButtonItem* btn_space = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
+		
+		NSMutableArray *btns = [NSMutableArray arrayWithCapacity:6];
+		[btns addObject:btn_fixed];
+		[btns addObject:btn_cancel];
+		[btns addObject:btn_fixed];
+		[btns addObject:btn_space];
+		
+		[btn_fixed release];
+		[btn_cancel release];
+		[btn_space release];
+		
+		[toolbar setItems:btns];
+		
+	}
+	
+	
+	[toolbar sizeToFit];
+	CGRect srect = self.view.frame;
+	CGRect trect = toolbar.frame;
+	srect.size.height -= trect.size.height;
+	srect.origin.y = 0;
+	trect.origin.x = 0;
+	trect.origin.y = srect.origin.y+srect.size.height;
+	trect.size.width = srect.size.width;
+	toolbar.frame = trect;
+	toolbar.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
+	
+	CGRect rrect = srect;
+    srect.size.height -= 40;
+    rrect.size.height = 40;
+    rrect.origin.y += srect.size.height;
+    
+    resultText = [[UITextView alloc] initWithFrame:rrect];
+	resultText.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin;
+	resultText.autoresizesSubviews = YES;
+	resultText.frame = rrect;
+    resultText.textAlignment = UITextAlignmentCenter;
+    resultText.font = [resultText.font fontWithSize:22];
+    
+    readerView = [[ZBarReaderView alloc] initWithImageScanner:[[ZBarImageScanner alloc] init]];//initWithFrame:srect];//CGRectZero];
+    
+	readerView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	readerView.autoresizesSubviews = YES;
+	readerView.frame = srect;
+
+	//signatureView = [[SignatureView alloc] initWithFrame:CGRectZero];
+	//signatureView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	//signatureView.autoresizesSubviews = YES;
+	//signatureView.frame = srect;
+	
+	[self.view addSubview:readerView];
+	[self.view addSubview:resultText];
+	[self.view addSubview:toolbar];
+
+	//[readerView start];
+    
+    // the delegate receives decode results
+    readerView.readerDelegate = self;
+    
+    // you can use this to support the simulator
+    if(TARGET_IPHONE_SIMULATOR) {
+        cameraSim = [[ZBarCameraSimulator alloc]
+                     initWithViewController: self];
+        cameraSim.readerView = readerView;
+    }
+    
+    [self.view layoutSubviews];
+    
+    
+	return self;
+
+}
+
+
+// Implement loadView to create a view hierarchy programmatically, without using a nib.
+- (void)loadView {
+	UIView* content = [[UIView alloc] initWithFrame:CGRectZero];
+	content.autoresizesSubviews = YES;
+
+	self.view = content;
+	[content release];
+    
+    
+    
+    
+}
+
+- (void)doDone:(id)sender {
+	if (callback_url == nil) {
+		return;
+	}
+    
+    Barcode_executeRhoCallBackWithParams(callback_url, nil,0,
+                                         @"status", @"ok",
+                                         @"barcode", resultText.text,
+                                         nil, nil, nil, nil);
+                                         
+    
+    /*
+	NSString* strBody = @"";
+	strBody = [strBody stringByAppendingString:@"&rho_callback=1&status=ok"];
+	strBody = [strBody stringByAppendingString:@"&barcode="];
+	strBody = [strBody stringByAppendingString:resultText.text];
+    char* norm_url = rho_http_normalizeurl([callback_url UTF8String]);
+	rho_net_request_with_data(norm_url, [strBody UTF8String]);
+    rho_http_free(norm_url);
+     */
+    [BarcodeViewManager closeView];
+}
+
+- (void)doCancel:(id)sender {
+	if (callback_url == nil) {
+		return;
+	}
+    Barcode_executeRhoCallBackWithParams(callback_url, nil,0,
+                                         @"status", @"cancel",
+                                         nil, nil,
+                                         nil, nil, nil, nil);
+
+    [BarcodeViewManager closeView];
+}
+
+
+
+///*
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    
+    
+    
+	//[self.view 
+}
+//*/
+
+
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
+}
+
+- (void) willRotateToInterfaceOrientation: (UIInterfaceOrientation) orient
+                                 duration: (NSTimeInterval) duration
+{
+    // compensate for view rotation so camera preview is not rotated
+    [readerView willRotateToInterfaceOrientation: orient
+                                        duration: duration];
+}
+
+- (void) viewDidAppear: (BOOL) animated
+{
+    // run the reader when the view is visible
+    [readerView start];
+}
+
+- (void) viewWillDisappear: (BOOL) animated
+{
+    [readerView stop];
+}
+
+- (void) readerView: (ZBarReaderView*) view
+     didReadSymbols: (ZBarSymbolSet*) syms
+          fromImage: (UIImage*) img
+{
+    // do something useful with results
+    for(ZBarSymbol *sym in syms) {
+        resultText.text = sym.data;
+        
+        {
+            UIBarButtonItem *btn_fixed = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
+            UIBarButtonItem* btn_cancel = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(doCancel:)];
+            UIBarButtonItem* btn_space = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
+            UIBarButtonItem* btn_done = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(doDone:)];
+            
+            NSMutableArray *btns = [NSMutableArray arrayWithCapacity:6];
+            [btns addObject:btn_fixed];
+            [btns addObject:btn_cancel];
+            [btns addObject:btn_fixed];
+            [btns addObject:btn_space];
+            [btns addObject:btn_done];
+            
+            [btn_fixed release];
+            [btn_cancel release];
+            [btn_space release];
+            [btn_done release];
+            
+            [toolbar setItems:btns];
+            
+        }
+        
+        
+        
+        
+        break;
+    }
+}
+
+
++(UIView*)getCurrentView
+{
+    return bv.view;
+}
+
+
+
+- (void)didReceiveMemoryWarning {
+	// Releases the view if it doesn't have a superview.
+    [super didReceiveMemoryWarning];
+	
+	// Release any cached data, images, etc that aren't in use.
+}
+
+- (void)viewDidUnload {
+	// Release any retained subviews of the main view.
+	// e.g. self.myOutlet = nil;
+}
+
+
+- (void)dealloc {
+	[readerView removeFromSuperview];
+	[toolbar removeFromSuperview];
+    [resultText removeFromSuperview];
+	[readerView release];
+	[toolbar release];
+    [resultText release];
+    [super dealloc];
+}
+
+
+
+@end