rhodes 2.0.0.beta1 → 2.0.0.beta2

data/platform/iphone/Classes/MapView/MapViewController.h

@@ -14,22 +14,25 @@
 #import "common/rhoparams.h"
 
 @interface MapViewController : UIViewController <MKReverseGeocoderDelegate,MKMapViewDelegate> {
-	MKMapView *mapView;
-	MKReverseGeocoder *geoCoder;
-	GoogleGeocoder* ggeoCoder;
-	UIToolbar* toolbar;
-	MKMapType mapType;
+    MKMapView *mapView;
+    MKReverseGeocoder *geoCoder;
+    GoogleGeocoder* ggeoCoder;
+    UIToolbar* toolbar;
+    MKMapType mapType;
     BOOL zoomEnabled;
     BOOL scrollEnabled;	
     BOOL showsUserLocation;
-	BOOL region_set;	
-	MKCoordinateRegion region;
-	NSString *gapikey;  
-	//IBOutlet UISegmentedControl *mapType;
+    BOOL region_set;	
+    MKCoordinateRegion region;
+    NSString *region_center;
+    CLLocationDegrees region_radius;
+    NSString *gapikey;  
+    //IBOutlet UISegmentedControl *mapType;
 }
 
 // 
-@property (copy) NSString* gapikey; 
+@property (copy) NSString *region_center;
+@property (copy) NSString *gapikey; 
 
 + (void)createMap:(rho_param*)params;
 - (void)setParams:(rho_param*)params;

data/platform/iphone/Classes/MapView/MapViewController.m

@@ -32,7 +32,7 @@
 
 @implementation MapViewController
 
-@synthesize gapikey;
+@synthesize region_center, gapikey;
 
 + (void)createMap:(rho_param *)params {
     id runnable = [RhoCreateMapTask class];
@@ -42,11 +42,12 @@
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
-		mapType =  MKMapTypeStandard;
-		zoomEnabled = TRUE;
-		scrollEnabled = TRUE;	
-		showsUserLocation = TRUE;
-		region_set = FALSE;
+        mapType =  MKMapTypeStandard;
+        zoomEnabled = TRUE;
+        scrollEnabled = TRUE;	
+        showsUserLocation = TRUE;
+        region_set = FALSE;
+        region_center = nil;
     }
     return self;
 }
@@ -71,27 +72,60 @@
                 mapType = MKMapTypeSatellite;
             else if (strcasecmp(map_type, "hybrid") == 0)
                 mapType = MKMapTypeHybrid;
+            else {
+                RAWLOG_ERROR1("Unknown map type: %s", map_type);
+                continue;
+            }
         }
         else if (strcasecmp(name, "region") == 0) {
-            if (value->type != RHO_PARAM_ARRAY)
-                continue;
-            if (value->v.array->size != 4)
-                continue;
-            
-            rho_param *lat = value->v.array->value[0];
-            rho_param *lon = value->v.array->value[1];
-            rho_param *latSpan = value->v.array->value[2];
-            rho_param *lonSpan = value->v.array->value[3];
-            
-            CLLocationCoordinate2D location;	
-            location.latitude = lat->type == RHO_PARAM_STRING ? strtod(lat->v.string, NULL) : 0;
-            location.longitude = lon->type == RHO_PARAM_STRING ? strtod(lon->v.string, NULL) : 0;
-            MKCoordinateSpan span;
-            span.latitudeDelta = latSpan->type == RHO_PARAM_STRING ? strtod(latSpan->v.string, NULL) : 0;
-            span.longitudeDelta = lonSpan->type == RHO_PARAM_STRING ? strtod(lonSpan->v.string, NULL) : 0;
-            region.span = span;
-            region.center = location;
-            region_set = TRUE;
+            if (value->type == RHO_PARAM_ARRAY) {
+                if (value->v.array->size != 4)
+                    continue;
+                
+                rho_param *lat = value->v.array->value[0];
+                rho_param *lon = value->v.array->value[1];
+                rho_param *latSpan = value->v.array->value[2];
+                rho_param *lonSpan = value->v.array->value[3];
+                
+                CLLocationCoordinate2D location;	
+                location.latitude = lat->type == RHO_PARAM_STRING ? strtod(lat->v.string, NULL) : 0;
+                location.longitude = lon->type == RHO_PARAM_STRING ? strtod(lon->v.string, NULL) : 0;
+                MKCoordinateSpan span;
+                span.latitudeDelta = latSpan->type == RHO_PARAM_STRING ? strtod(latSpan->v.string, NULL) : 0;
+                span.longitudeDelta = lonSpan->type == RHO_PARAM_STRING ? strtod(lonSpan->v.string, NULL) : 0;
+                region.span = span;
+                region.center = location;
+                region_set = TRUE;
+            }
+            else if (value->type == RHO_PARAM_HASH) {
+                char *center = NULL;
+                char *radius = NULL;
+                
+                for (int j = 0, limm = value->v.hash->size; j < limm; ++j) {
+                    char *rname = value->v.hash->name[j];
+                    rho_param *rvalue = value->v.hash->value[j];
+                    if (strcasecmp(rname, "center") == 0) {
+                        if (rvalue->type != RHO_PARAM_STRING) {
+                            RAWLOG_ERROR("Wrong type of 'center', should be String");
+                            continue;
+                        }
+                        center = rvalue->v.string;
+                    }
+                    else if (strcasecmp(rname, "radius") == 0) {
+                        if (rvalue->type != RHO_PARAM_STRING) {
+                            RAWLOG_ERROR("Wrong type of 'radius', should be String");
+                            continue;
+                        }
+                        radius = rvalue->v.string;
+                    }
+                }
+                
+                if (!center || !radius)
+                    continue;
+                
+                region_center = [NSString stringWithUTF8String:center];
+                region_radius = strtod(radius, NULL);
+            }
         }
         else if (strcasecmp(name, "zoom_enabled") == 0) {
             if (value->type != RHO_PARAM_STRING)
@@ -117,10 +151,20 @@
 }
 
 - (void)setAnnotations:(rho_param*)p {
-    int size = 0;
+    int size = 1;
     if (p && p->type == RHO_PARAM_ARRAY)
-        size = p->v.array->size;
+        size += p->v.array->size;
     NSMutableArray *annotations = [NSMutableArray arrayWithCapacity:size];
+    if (region_center) {
+        MapAnnotation *annObj = [[MapAnnotation alloc] init];
+        annObj.type = @"center";
+        annObj.address = region_center;
+        CLLocationCoordinate2D c;
+        c.latitude = c.longitude = 10000;
+        annObj.coordinate = c;
+        [annotations addObject:annObj];
+        [annObj release];
+    }
     if (p && p->type == RHO_PARAM_ARRAY) {
         for (int i = 0, lim = p->v.array->size; i < lim; ++i) {
             rho_param *ann = p->v.array->value[i];
@@ -176,70 +220,73 @@
         }
     }
     ggeoCoder = [[GoogleGeocoder alloc] initWithAnnotations:annotations apikey:gapikey];
-	ggeoCoder.actionTarget = self;
-	ggeoCoder.onDidFindAddress = @selector(didFindAddress:);
+    ggeoCoder.actionTarget = self;
+    ggeoCoder.onDidFindAddress = @selector(didFindAddress:);
 }
 
 - (void)setParams:(rho_param*)p {
     if (p && p->type == RHO_PARAM_HASH) {
+        rho_param *st = NULL;
+        rho_param *ann = NULL;
         for (int i = 0, lim = p->v.hash->size; i < lim; ++i) {
             char *name = p->v.hash->name[i];
             rho_param *value = p->v.hash->value[i];
             if (strcasecmp(name, "settings") == 0)
-                [self setSettings:value];
+                st = value;
             else if (strcasecmp(name, "annotations") == 0)
-                [self setAnnotations:value];
+                ann = value;
         }
+        if (st)
+            [self setSettings:st];
+        [self setAnnotations:ann];
     }
     rho_param_free(p);
 }
 
 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
 - (void)viewDidLoad {
-	[super viewDidLoad];
-	
-	//Initialize the toolbar
-	toolbar = [[UIToolbar alloc] init];
-	toolbar.barStyle = UIBarStyleBlack;
-	[toolbar sizeToFit];
-	CGFloat toolbarHeight = [toolbar frame].size.height;
-	CGRect rootViewBounds = self.view.bounds;
-	CGFloat rootViewHeight = CGRectGetHeight(rootViewBounds);
-	CGFloat rootViewWidth = CGRectGetWidth(rootViewBounds);
-	CGRect rectArea = CGRectMake(0, rootViewHeight - toolbarHeight, rootViewWidth, toolbarHeight);
-	[toolbar setFrame:rectArea];
-	UIBarButtonItem *closeButton = [[UIBarButtonItem alloc]
-								   initWithTitle:@"Close" style:UIBarButtonItemStyleBordered 
-								   target:self action:@selector(close_clicked:)];
-	[toolbar setItems:[NSArray arrayWithObjects:closeButton,nil]];
-	[self.view addSubview:toolbar];
+    [super viewDidLoad];
+    
+    //Initialize the toolbar
+    toolbar = [[UIToolbar alloc] init];
+    toolbar.barStyle = UIBarStyleBlack;
+    [toolbar sizeToFit];
+    CGFloat toolbarHeight = [toolbar frame].size.height;
+    CGRect rootViewBounds = self.view.bounds;
+    CGFloat rootViewHeight = CGRectGetHeight(rootViewBounds);
+    CGFloat rootViewWidth = CGRectGetWidth(rootViewBounds);
+    CGRect rectArea = CGRectMake(0, rootViewHeight - toolbarHeight, rootViewWidth, toolbarHeight);
+    [toolbar setFrame:rectArea];
+    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc]
+                               initWithTitle:@"Close" style:UIBarButtonItemStyleBordered 
+                               target:self action:@selector(close_clicked:)];
+    [toolbar setItems:[NSArray arrayWithObjects:closeButton,nil]];
+    [self.view addSubview:toolbar];
     [closeButton release];
-	
-	CGRect rectMapArea = CGRectMake(0, 0, rootViewWidth, rootViewHeight - toolbarHeight);
-	mapView=[[MKMapView alloc] initWithFrame:rectMapArea];
-	mapView.delegate=self;
+    
+    CGRect rectMapArea = CGRectMake(0, 0, rootViewWidth, rootViewHeight - toolbarHeight);
+    mapView=[[MKMapView alloc] initWithFrame:rectMapArea];
+    mapView.delegate=self;
 
-	mapView.showsUserLocation=showsUserLocation;
-	mapView.scrollEnabled=scrollEnabled;
-	mapView.zoomEnabled=zoomEnabled;
-	mapView.mapType=mapType;
-	
-	/*Geocoder Stuff*/
-	[ggeoCoder start];
-	
-	//geoCoder=[[MKReverseGeocoder alloc] initWithCoordinate:location];
-	//geoCoder.delegate=self;
-	//[geoCoder start];
-	
+    mapView.showsUserLocation=showsUserLocation;
+    mapView.scrollEnabled=scrollEnabled;
+    mapView.zoomEnabled=zoomEnabled;
+    mapView.mapType=mapType;
+    
+    /*Geocoder Stuff*/
+    [ggeoCoder start];
 	
-	/*Region and Zoom*/
-	if (region_set) {
-		[mapView setRegion:region animated:TRUE];
-		[mapView regionThatFits:region];
-	}
+    //geoCoder=[[MKReverseGeocoder alloc] initWithCoordinate:location];
+    //geoCoder.delegate=self;
+    //[geoCoder start];
 	
-	[self.view insertSubview:mapView atIndex:0];
-
+    /*Region and Zoom*/
+    if (region_set) {
+        [mapView setRegion:region animated:TRUE];
+        [mapView regionThatFits:region];
+    }
+    
+    [self.view insertSubview:mapView atIndex:0];
 }
 
 - (void)mapView:(MKMapView *)mapView annotationView:(MKAnnotationView *)view 
@@ -293,7 +340,19 @@
 }
 
 - (void)didFindAddress:(MapAnnotation*)annotation {
-    [mapView addAnnotation:annotation];
+    if ([[annotation type] isEqualToString:@"center"]) {
+        MKCoordinateSpan span;
+        span.latitudeDelta = region_radius;
+        span.longitudeDelta = region_radius;
+        region.center = annotation.coordinate;
+        region.span = span;
+        region_set = TRUE;
+        
+        [mapView setRegion:region animated:YES];
+        [mapView regionThatFits:region];
+    }
+    else
+        [mapView addAnnotation:annotation];
 }
 	
 - (void)reverseGeocoder:(MKReverseGeocoder *)geocoder didFindPlacemark:(MKPlacemark *)placemark{

data/platform/iphone/Classes/Rhodes.h

@@ -12,6 +12,7 @@
 #import "AppManager.h"
 #import "RhoMainView.h"
 
+#import "SplashViewController.h"
 #import "LogOptionsController.h"
 #import "LogViewController.h"
 #import "DateTimePickerDelegate.h"
@@ -25,6 +26,7 @@
     UIWindow *window;
     AVAudioPlayer *player;
     // Controllers
+    SplashViewController *splashViewController;
     LogOptionsController* logOptionsController;
     LogViewController* logViewController;
     DateTimePickerDelegate* dateTimePickerDelegate;

data/platform/iphone/Classes/Rhodes.m

@@ -207,6 +207,13 @@ static Rhodes *instance = NULL;
 - (void)setMainView:(id<RhoMainView,NSObject>)view {
     if (mainView == view)
         return;
+    
+    if (splashViewController) {
+        [splashViewController hideSplash];
+        [splashViewController release];
+        splashViewController = nil;
+    }
+    
     [mainView.view removeFromSuperview];
     [mainView release];
     mainView = [view retain];
@@ -218,9 +225,14 @@ static Rhodes *instance = NULL;
     NSFileManager *fileManager = [NSFileManager defaultManager];
     
     NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
+    NSString *pngPath = [NSString stringWithFormat:@"%@/apps/app/loading.png", resourcePath];
     NSString *htmPath = [NSString stringWithFormat:@"%@/apps/app/loading.html", resourcePath];
     
-    if ([fileManager fileExistsAtPath:htmPath]) {
+    if ([fileManager fileExistsAtPath:pngPath]) {
+        splashViewController = [[SplashViewController alloc] initWithParentView:window];
+        [splashViewController showSplash:pngPath];
+    }
+    else if ([fileManager fileExistsAtPath:htmPath]) {
         NSError *err;
         NSString *data = [NSString stringWithContentsOfFile:htmPath encoding:NSUTF8StringEncoding error:&err];
         [mainView loadHTMLString:data];

data/platform/iphone/Classes/SimpleMainView.m

@@ -204,7 +204,6 @@
     webView.autoresizesSubviews = YES;
     webView.clipsToBounds = NO;
     webView.delegate = [Rhodes sharedInstance];
-    //webView.frame = frame;
     
     [root addSubview:webView];
     

data/platform/iphone/Classes/TabbedMainView.m

@@ -66,6 +66,10 @@
     tabbar.view.frame = frame;
     tabbar.selectedIndex = 0;
     
+    CGRect childFrame = frame;
+    CGRect tbFrame = tabbar.tabBar.frame;
+    childFrame.size.height -= tbFrame.size.height;
+    
     int count = [items count]/4;
     NSMutableArray *views = [NSMutableArray arrayWithCapacity:count];
     NSMutableArray *tabs = [[NSMutableArray alloc] initWithCapacity:count];
@@ -82,7 +86,7 @@
             td.url = url;
             td.reload = [reload isEqualToString:@"true"];
             
-            SimpleMainView *subController = [[SimpleMainView alloc] initWithParentView:tabbar.view];
+            SimpleMainView *subController = [[SimpleMainView alloc] initWithParentView:tabbar.view frame:childFrame];
             subController.title = label;
             NSString *imagePath = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:icon];
             subController.tabBarItem.image = [UIImage imageWithContentsOfFile:imagePath];
@@ -102,11 +106,6 @@
     self.tabbarData = tabs;
     [tabs release];
     
-    CGRect vFrame = tabbar.view.frame;
-    CGRect tbFrame = tabbar.tabBar.frame;
-    tbFrame.origin.y = vFrame.size.height - tbFrame.size.height - vFrame.origin.y;
-    tabbar.tabBar.frame = tbFrame;
-    
     return self;
 }
 

data/platform/shared/common/RhoTime.h

@@ -68,10 +68,10 @@ public:
             struct tm* locTime = localtime(&m_nativeTime);
 
             if (inFileFormat)
-                nSize = sprintf(timeBuf, "%02d%02d%04d%02d%02d%02d", locTime->tm_mon, locTime->tm_mday, locTime->tm_year + 1900,
+                nSize = sprintf(timeBuf, "%02d%02d%04d%02d%02d%02d", locTime->tm_mon+1, locTime->tm_mday, locTime->tm_year + 1900,
                         locTime->tm_hour, locTime->tm_min, locTime->tm_sec );
             else
-                nSize = sprintf(timeBuf, "%02d/%02d/%04d %02d:%02d:%02d", locTime->tm_mon, locTime->tm_mday, locTime->tm_year + 1900,
+                nSize = sprintf(timeBuf, "%02d/%02d/%04d %02d:%02d:%02d", locTime->tm_mon+1, locTime->tm_mday, locTime->tm_year + 1900,
                         locTime->tm_hour, locTime->tm_min, locTime->tm_sec );
         }
 

data/platform/shared/common/RhodesApp.cpp

@@ -635,7 +635,7 @@ void CRhodesApp::callScreenRotationCallback(int width, int height, int degrees)
 		String strBody = "rho_callback=1";
 		
         strBody += "&width=";   strBody += convertToStringA(width);
-		strBody += "&heigth=";  strBody += convertToStringA(height);
+		strBody += "&height=";  strBody += convertToStringA(height);
 		strBody += "&degrees="; strBody += convertToStringA(degrees);
 		
         if ( m_strScreenRotationCallbackParams.length() > 0 )

data/platform/shared/db/DBAdapter.cpp

@@ -806,6 +806,12 @@ void* rho_db_get_handle(void* pDB)
     return db.getDbHandle();
 }
 
+void* rho_db_user_get_handle()
+{
+    rho::db::CDBAdapter& db = rho::db::CDBAdapter::getUserDB();
+    return db.getDbHandle();
+}
+
 int rho_db_prepare_statement(void* pDB, const char* szSql, int nByte, sqlite3_stmt **ppStmt)
 {
     rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);

data/platform/shared/net/CURLNetRequest.cpp

@@ -182,10 +182,30 @@ INetResponse* CURLNetRequest::pushMultipartData(const String& strUrl, VectorPtr<
 	
     curl_httppost *post = NULL, *last = NULL;
     curl_easy_setopt(curl, CURLOPT_POSTFIELDS, NULL);
+
     for (size_t i = 0, lim = arItems.size(); i < lim; ++i) {
         CMultipartItem *mi = arItems[i];
         
-        const char *name = mi->m_strName.c_str();
+        size_t cl;
+        if (mi->m_strFilePath.empty())
+            cl = mi->m_strBody.size();
+        else {
+            common::CRhoFile f;
+            if (!f.open(mi->m_strFilePath.c_str(), common::CRhoFile::OpenReadOnly))
+                cl = 0;
+            else {
+                cl = f.size();
+                f.close();
+            }
+        }
+
+        char buf[32];
+        buf[sizeof(buf) - 1] = '\0';
+        snprintf(buf, sizeof(buf) - 1, "Content-Length: %lu", (unsigned long)cl);
+        curl_slist *fh = NULL;
+        fh = curl_slist_append(fh, buf);
+
+        const char *name = mi->m_strName.empty() ? "blob" : mi->m_strName.c_str();
         int opt = mi->m_strFilePath.empty() ? CURLFORM_COPYCONTENTS : CURLFORM_FILE;
         const char *data = mi->m_strFilePath.empty() ? mi->m_strBody.c_str() : mi->m_strFilePath.c_str();
         const char *ct = mi->m_strContentType.empty() ? NULL : mi->m_strContentType.c_str();
@@ -194,12 +214,14 @@ INetResponse* CURLNetRequest::pushMultipartData(const String& strUrl, VectorPtr<
                          CURLFORM_COPYNAME, name,
                          opt, data,
                          CURLFORM_CONTENTTYPE, ct,
+                         CURLFORM_CONTENTHEADER, fh,
                          CURLFORM_END);
         }
         else {
             curl_formadd(&post, &last,
                          CURLFORM_COPYNAME, name,
                          opt, data,
+                         CURLFORM_CONTENTHEADER, fh,
                          CURLFORM_END);
         }
     }