重新提交pull

BeeFramework/Core/Foundation/Bee_SystemInfo.h

@@ -36,6 +36,10 @@
 #define IOS5_OR_LATER	( [[[UIDevice currentDevice] systemVersion] compare:@"5.0"] != NSOrderedAscending )
 #define IOS4_OR_LATER	( [[[UIDevice currentDevice] systemVersion] compare:@"4.0"] != NSOrderedAscending )
 #define IOS3_OR_LATER	( [[[UIDevice currentDevice] systemVersion] compare:@"3.0"] != NSOrderedAscending )
+#define IS_SCREEN_4_INCH ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(640, 1136), [[UIScreen mainScreen] currentMode].size) : NO)
+#define IS_SCREEN_35_INCH ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(640, 960), [[UIScreen mainScreen] currentMode].size) : NO)
+#define UI_MAX_HEIGHT [UIScreen mainScreen].bounds.size.height
+#define UI_MAX_WIDTH [UIScreen mainScreen].bounds.size.width
 
 @interface BeeSystemInfo : NSObject
 

BeeFramework/Core/Foundation/Extension/NSDictionary+BeeExtension.h

@@ -69,8 +69,12 @@ typedef NSDictionary *	(^NSDictionaryAppendBlock)( NSString * key, id value );
 - (NSMutableDictionary *)mutableDictAtPath:(NSString *)path;
 - (NSMutableDictionary *)mutableDictAtPath:(NSString *)path otherwise:(NSMutableDictionary *)other;
 
+-(id)convertForClass:(Class)clazz;
+
+
 @end
 
+
 #pragma mark -
 
 @interface NSMutableDictionary(BeeExtension)

BeeFramework/Core/Foundation/Extension/NSDictionary+BeeExtension.m

@@ -32,6 +32,8 @@
 
 #import "Bee_Precompile.h"
 #import "NSDictionary+BeeExtension.h"
+#import "Bee_Runtime.h"
+#import "NSObject+BeeTypeConversion.h"
 
 #include <objc/runtime.h>
 
@@ -277,8 +279,69 @@ - (NSMutableDictionary *)mutableDictAtPath:(NSString *)path otherwise:(NSMutable
 	return obj ? obj : other;
 }
 
+-(id)convertForClass:(Class)clazz{
+    id object = [[clazz alloc] init];
+
+    NSUInteger			propertyCount = 0;
+    objc_property_t *	properties = class_copyPropertyList( clazz, &propertyCount );
+
+    for ( NSUInteger i = 0; i < propertyCount; i++ )
+    {
+        const char *	name = property_getName(properties[i]);
+        NSString *		propertyName = [NSString stringWithCString:name encoding:NSUTF8StringEncoding];
+        const char *	attr = property_getAttributes(properties[i]);
+        NSUInteger		type = [BeeTypeEncoding typeOf:attr];
+
+        NSObject * tempvalue = [self objectForKey:propertyName];
+
+        NSObject *value = nil;
+        if (tempvalue) {
+            if ( BeeTypeEncoding.NSNUMBER == type )
+            {
+                value = [tempvalue asNSNumber];
+            }
+            else if ( BeeTypeEncoding.NSSTRING == type )
+            {
+                value = [tempvalue asNSString];
+            }
+            else if ( BeeTypeEncoding.NSDATE == type )
+            {
+                value = [tempvalue asNSDate];
+            }
+            else if ( BeeTypeEncoding.NSARRAY == type )
+            {
+                if ([tempvalue isKindOfClass:[NSArray class]]) {
+                    value = tempvalue;
+                }
+            }
+            else if ( BeeTypeEncoding.NSDICTIONARY == type )
+            {
+                if ([tempvalue isKindOfClass:[NSDictionary class]]) {
+                    value = tempvalue;
+                }
+            }
+            else if ( BeeTypeEncoding.OBJECT == type )
+            {
+                NSString *className = [BeeTypeEncoding classNameOf:attr];
+                if ([tempvalue isKindOfClass:NSClassFromString(className)]) {
+                    value = tempvalue;
+                }else if ([tempvalue isKindOfClass:[NSDictionary class]]) {
+                    value = [(NSDictionary *)tempvalue convertForClass:NSClassFromString(className)];
+                }
+
+            }
+
+        }
+
+        [object setValue:value forKey:propertyName];
+    }
+    free( properties );
+    return [object autorelease];
+}
+
 @end
 
+
 #pragma mark -
 
 @implementation NSMutableDictionary(BeeExtension)

BeeFramework/Core/Foundation/Extension/NSNumber+BeeExtension.h

@@ -38,7 +38,7 @@
 #define __UINT( __x )			[NSNumber numberWithUnsignedInt:(NSUInteger)__x]
 #define	__FLOAT( __x )			[NSNumber numberWithFloat:(float)__x]
 #define	__DOUBLE( __x )			[NSNumber numberWithDouble:(double)__x]
-
+#define __BOOL( __x )           [NSNumber numberWithBool:(BOOL)__x]
 #pragma mark -
 
 @interface NSNumber(BeeExtension)

BeeFramework/Core/Network/Bee_RequestQueue.h

@@ -80,6 +80,9 @@
 
 + (BeeRequest *)GET:(NSString *)url;
 + (BeeRequest *)POST:(NSString *)url;
++ (BeeRequest *)POST:(NSString *)url postdata:(NSDictionary *)postdata;
+
+- (BeeRequest *)FILE:(NSString *)url savepath:(NSString *)savepath allowResume:(BOOL)allowResume sync:(BOOL)sync;
 
 + (BOOL)requesting:(NSString *)url;
 + (BOOL)requesting:(NSString *)url byResponder:(id)responder;

BeeFramework/Core/Network/Bee_RequestQueue.m

@@ -58,6 +58,7 @@ - (BOOL)checkResourceBroken:(NSString *)url;
 
 - (BeeRequest *)GET:(NSString *)url sync:(BOOL)sync;
 - (BeeRequest *)POST:(NSString *)url sync:(BOOL)sync;
+- (BeeRequest *)POST:(NSString *)url sync:(BOOL)sync postdata:(NSDictionary *)postdata;
 
 - (void)cancelRequest:(BeeRequest *)request;
 - (void)cancelRequestByResponder:(id)responder;
@@ -204,6 +205,76 @@ + (BeeRequest *)GET:(NSString *)url
 	return [[BeeRequestQueue sharedInstance] GET:url sync:NO];
 }
 
++ (BeeRequest *)FILE:(NSString *)url savepath:(NSString *)savepath allowResume:(BOOL)allowResume sync:(BOOL)sync{
+    return [[BeeRequestQueue sharedInstance] FILE:url savepath:savepath allowResume:allowResume sync:sync];
+}
+
+- (BeeRequest *)FILE:(NSString *)url savepath:(NSString *)savepath allowResume:(BOOL)allowResume sync:(BOOL)sync {
+    if ( NO == _online )
+		return nil;
+
+	if ( [self checkResourceBroken:url] )
+	{
+		return nil;
+	}
+
+	BeeRequest * request = nil;
+	if ( NO == sync && _merge )
+	{
+		for ( BeeRequest * req in _requests )
+		{
+			if ( [req.url.absoluteString isEqualToString:url] )
+			{
+				return req;
+			}
+		}
+	}
+
+#if defined(__BEE_DEVELOPMENT__) && __BEE_DEVELOPMENT__
+	CC( @"GET %@\n", url );
+#endif	// #if defined(__BEE_DEVELOPMENT__) && __BEE_DEVELOPMENT__
+
+	request = [[BeeRequest alloc] initWithURL:[NSURL URLWithString:url]];
+	[request setDelegate:self];
+    [request setDownloadProgressDelegate:self];
+    [request setShowAccurateProgress:YES];
+    [request setDownloadDestinationPath:savepath];
+    [request setAllowResumeForFileDownloads:YES];
+	[request setNumberOfTimesToRetryOnTimeout:4];
+#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_4_0
+	[request setShouldContinueWhenAppEntersBackground:YES];
+#endif	// #if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_4_0
+	[request setThreadPriority:0.5];
+	[request setQueuePriority:NSOperationQueuePriorityLow];
+
+	[_requests addObject:request];
+
+	if ( self.whenCreate )
+	{
+		self.whenCreate( request );
+	}
+	if ( sync )
+	{
+		[request startSynchronous];
+	}
+	else
+	{
+		if ( _delay )
+		{
+			[request performSelector:@selector(startAsynchronous)
+						  withObject:nil
+						  afterDelay:_delay];
+		}
+		else
+		{
+			[request startAsynchronous];
+		}
+	}
+	return [request autorelease];
+}
+
+
+
 - (BeeRequest *)GET:(NSString *)url sync:(BOOL)sync
 {
 	if ( NO == _online )
@@ -280,7 +351,16 @@ + (BeeRequest *)POST:(NSString *)url
 	return [[BeeRequestQueue sharedInstance] POST:url sync:NO];
 }
 
-- (BeeRequest *)POST:(NSString *)url sync:(BOOL)sync
++ (BeeRequest *)POST:(NSString *)url postdata:(NSDictionary *)postdata
+{
+	return [[BeeRequestQueue sharedInstance] POST:url sync:NO postdata:postdata];
+}
+
+- (BeeRequest *)POST:(NSString *)url sync:(BOOL)sync{
+    return [self POST:url sync:sync postdata:nil];
+}
+
+- (BeeRequest *)POST:(NSString *)url sync:(BOOL)sync postdata:(NSDictionary *)postdata
 {
 	if ( NO == _online )
 		return nil;
@@ -294,7 +374,7 @@ - (BeeRequest *)POST:(NSString *)url sync:(BOOL)sync
 	request = [[BeeRequest alloc] initWithURL:[NSURL URLWithString:url]];
 	request.timeOutSeconds = DEFAULT_POST_TIMEOUT;
 	request.requestMethod = @"POST";
-	request.postFormat = ASIMultipartFormDataPostFormat; // ASIRawPostFormat;
+	//request.postFormat = ASIMultipartFormDataPostFormat; // ASIRawPostFormat;
 	[request setDelegate:self];
 	[request setDownloadProgressDelegate:self];
 	[request setUploadProgressDelegate:self];
@@ -305,6 +385,12 @@ - (BeeRequest *)POST:(NSString *)url sync:(BOOL)sync
 
 	[request setThreadPriority:1.0];
 	[request setQueuePriority:NSOperationQueuePriorityHigh];
+
+    if (postdata && [postdata count]>0) {
+        for (NSString * key in postdata.allKeys) {
+            [request addPostValue:[postdata objectForKey:key] forKey:key];
+        }
+    }
 
 	[_requests addObject:request];	
 

BeeFramework/Core/Network/Extension/NSObject+BeeRequest.h

@@ -46,6 +46,8 @@
 
 - (BeeRequest *)HTTP_GET:(NSString *)url;
 - (BeeRequest *)HTTP_POST:(NSString *)url;
+- (BeeRequest *)HTTP_POST:(NSString *)url postdata:(NSDictionary *)postdata;
+- (BeeRequest *)FILE:(NSString *)url savepath:(NSString *)savepath allowResume:(BOOL)allowResume sync:(BOOL)sync;
 
 - (BOOL)isRequestResponder;
 - (BOOL)requestingURL;

BeeFramework/Core/Network/Extension/NSObject+BeeRequest.m

@@ -66,6 +66,20 @@ - (BeeRequest *)HTTP_POST:(NSString *)url
 	return req;
 }
 
+- (BeeRequest *)HTTP_POST:(NSString *)url postdata:(NSDictionary *)postdata
+{
+	BeeRequest * req = [BeeRequestQueue POST:url postdata:postdata];
+	[req addResponder:self];
+	return req;
+}
+
+
+- (BeeRequest *)FILE:(NSString *)url savepath:(NSString *)savepath allowResume:(BOOL)allowResume sync:(BOOL)sync{
+    BeeRequest * req = [BeeRequestQueue FILE:url savepath:savepath allowResume:allowResume sync:sync];
+    [req addResponder:self];
+    return req;
+}
+
 - (BOOL)isRequestResponder
 {
 	if ( [self respondsToSelector:@selector(handleRequest:)] )

BeeFramework/Core/Storage/Bee_Database.h

@@ -135,6 +135,16 @@ typedef BOOL			(^BeeDatabaseBoolBlock)( void );
 @property (nonatomic, readonly) BeeDatabaseBlockN	OR_LIKE;
 @property (nonatomic, readonly) BeeDatabaseBlockN	OR_NOT_LIKE;
 
+@property (nonatomic, readonly) BeeDatabaseBlockN	LIKE_BEFORE;
+@property (nonatomic, readonly) BeeDatabaseBlockN	NOT_LIKE_BEFORE;
+@property (nonatomic, readonly) BeeDatabaseBlockN	OR_LIKE_BEFORE;
+@property (nonatomic, readonly) BeeDatabaseBlockN	OR_NOT_LIKE_BEFORE;
+
+@property (nonatomic, readonly) BeeDatabaseBlockN	LIKE_AFTER;
+@property (nonatomic, readonly) BeeDatabaseBlockN	NOT_LIKE_AFTER;
+@property (nonatomic, readonly) BeeDatabaseBlockN	OR_LIKE_AFTER;
+@property (nonatomic, readonly) BeeDatabaseBlockN	OR_NOT_LIKE_AFTER;
+
 @property (nonatomic, readonly) BeeDatabaseBlockN	GROUP_BY;
 
 @property (nonatomic, readonly) BeeDatabaseBlockN	HAVING;