更新至v3.1

- 新增移动端支付宝Wap与支付宝App支付选择；
- 新增移动端银联在线支付；
- 新增移动端财付通支付；
- 优化移动端推送服务；
- 优化移动端第三方统计服务；
- 修正BUG若干；

README.md

@@ -59,8 +59,6 @@ QQ群: [329673575](329673575)
 
 ## 关于我们
 
-[![Geek-Zoo](http://geek-zoo.com/images/logo-01.png)](http://www.geek-zoo.com)
-
-[geek-zoo.com](http://www.geek-zoo.com)
+[![Geek-Zoo](http://www.geek-zoo.com/img/images/logo_2.png)](http://www.geek-zoo.com)
 
 Geek Zoo Studio成立于2009是一家以创新为核心的专业互联网及移动应用开发公司，具有国际化品牌的服务经验以及专业资深的互联网、移动应用开发经验，客户从初创公司到世界500强，遍及世界各地。我们为客户提供从产品设计、信息架构、逻辑流程、用户体验、视觉设计、前端开发、程序架构以及自主框架、产品体系，为用户提供一整套互联网解决方案及服务项目。

doc/ECMobile_iOS.md

@@ -0,0 +1,46 @@
+#修改工程
+
+1. 打开工程
+2. 找到[AppDelegate load]方法，修改 [ServerConfig sharedInstance].url
+3. 找到[AppDelegate updateConfig]方法，修改以下代码：
+<pre>
+// 配置微信
+weixin.config.appId			= @"<Your information>";
+weixin.config.appKey		= @"<Your information>";
+
+// 配置新浪
+sweibo.config.appKey		= @"<Your information>";
+sweibo.config.appSecret		= @"<Your information>";
+sweibo.config.redirectURI	= @"<Your information>";
+
+// 配置腾讯
+tweibo.config.appKey		= @"<Your information>";
+tweibo.config.appSecret		= @"<Your information>";
+tweibo.config.redirectURI	= @"<Your information>";
+
+// 配置支付宝
+alipay.config.parnter		= @"<Your information>";
+alipay.config.seller		= @"<Your information>";
+alipay.config.privateKey	= @"<Your information>";
+alipay.config.publicKey		= @"<Your information>";
+alipay.config.notifyURL		= @"<Your information>";
+alipay.config.wapCallBackURL	= @"<Your alipayWapURL>";
+
+// 配置语音识别
+siri.config.showUI			= NO;
+siri.config.appID			= @"<Your iflyKey>";
+
+// 配置友盟
+[MobClick startWithAppkey:@"<Your umengKey>" reportPolicy:BATCH channelId:nil];
+
+// 配置快递100
+[ExpressModel setKuaidi100Key:@"<Your kuaidi100Key>"];
+</pre>
+
+#联系方式
+
+官方论坛：http://bbs.ecmobile.cn/    
+
+QQ群1：329673575    
+QQ群2：239571314    
+QQ群3：347624547    

shop/framework/Bee_Precompile.h → iOS/framework/Bee_Precompile.h

@@ -82,6 +82,7 @@
 #import <QuartzCore/QuartzCore.h>
 #import <AudioToolbox/AudioToolbox.h>
 #import <TargetConditionals.h>
+#import <AssetsLibrary/AssetsLibrary.h>
 
 #import <AVFoundation/AVFoundation.h>
 #import <CoreGraphics/CoreGraphics.h>

shop/framework/mvc/controller/Bee_Message.h → iOS/framework/mvc/controller/Bee_Message.h

@@ -223,6 +223,7 @@ AS_INT( STATE_CANCELLED )		// 消息被取消了
 - (void)internalStartTimer;
 - (void)internalStopTimer;
 - (void)internalNotifySending;
+- (void)internalNotifyWaiting;
 - (void)internalNotifySucceed;
 - (void)internalNotifyFailed;
 - (void)internalNotifyCancelled;

shop/framework/mvc/controller/Bee_Message.mm → iOS/framework/mvc/controller/Bee_Message.mm

@@ -474,6 +474,28 @@ - (void)internalNotifySending
 	INFO( @"Message '%@' sent", _message );
 }
 
+- (void)internalNotifyWaiting
+{
+	_recvTimeStamp = [NSDate timeIntervalSinceReferenceDate];
+
+	if ( NO == self.disabled )
+	{
+		if ( self.whenWaiting )
+		{
+			self.whenWaiting();
+		}
+
+		if ( self.whenUpdate )
+		{
+			self.whenUpdate();
+		}
+
+		[self callResponder];
+	}
+
+	INFO( @"Message '%@' waiting", _message );
+}
+
 - (void)internalNotifySucceed
 {
 	INFO( @"Message '%@' succeed", _message );
@@ -547,7 +569,6 @@ - (void)internalNotifyProgressUpdated
 	if ( NO == _toldProgress )
 		return;
 
-	_state = BeeMessage.STATE_WAITING;
 	_progressed = YES;
 
 	if ( NO == self.disabled )
@@ -557,10 +578,10 @@ - (void)internalNotifyProgressUpdated
 			self.whenProgressed();
 		}
 
-		if ( self.whenUpdate )
-		{
-			self.whenUpdate();
-		}
+        //		if ( self.whenUpdate )
+        //		{
+        //			self.whenUpdate();
+        //		}
 
 		[self callResponder];
 	}
@@ -1020,7 +1041,7 @@ - (void)changeState:(NSInteger)newState
 	}
 	else if ( BeeMessage.STATE_WAITING == _state )
 	{
-		// TODO: nothing to do
+		[self internalNotifyWaiting];
 	}
 	else if ( BeeMessage.STATE_SUCCEED == _state )
 	{

shop/framework/mvc/controller/Bee_MessageController.mm → iOS/framework/mvc/controller/Bee_MessageController.mm

@@ -107,7 +107,7 @@ + (BeeMessageController *)prepareInstanceForClass:(Class)rtti
 
     if ( [rtti respondsToSelector:@selector(sharedInstance)] )
     {
-        controller = [rtti sharedInstance];
+        controller = (BeeMessageController *)[rtti sharedInstance];
     }
     else
     {

shop/framework/mvc/controller/Bee_MessageQueue.mm → iOS/framework/mvc/controller/Bee_MessageQueue.mm

@@ -228,6 +228,7 @@ - (BOOL)sendMessage:(BeeMessage *)msg
 	[msg setSending:YES];
 
 	[__sharedQueue addObject:msg];
+
 	return YES;
 }
 

shop/framework/mvc/controller/Bee_Routine.mm → iOS/framework/mvc/controller/Bee_Routine.mm

@@ -138,7 +138,8 @@ + (BOOL)cancel
 
 + (BOOL)cancel:(id)target
 {
-	NSMutableArray * msgs = [NSMutableArray nonRetainingArray];
+//	NSMutableArray * msgs = [NSMutableArray nonRetainingArray];
+	NSMutableArray * msgs = [NSMutableArray array];
 
 	for ( BeeMessage * msg in [BeeMessageQueue sharedInstance].allMessages )
 	{

shop/framework/mvc/controller/extension/BeeMessage+BeeNetwork.mm → iOS/framework/mvc/controller/extension/BeeMessage+BeeNetwork.mm

@@ -219,21 +219,33 @@ - (NSString *)HTTPResponseString
 
 - (void)handleRequest:(BeeHTTPRequest *)request
 {
-	if ( request.sending )
+	if ( request.sendProgressed )
+	{
+		if ( self.toldProgress )
+		{
+			[self internalNotifyProgressUpdated];
+		}
+	}
+	else if ( request.sending )
 	{
 		// TODO:
 		request.timeOutSeconds = self.seconds;
+
+		[self changeState:BeeMessage.STATE_SENDING];
 	}
-	else if ( request.sendProgressed )
+	else if ( request.recvProgressed )
 	{
-		[self internalNotifyProgressUpdated];
+		if ( self.toldProgress )
+		{
+			[self internalNotifyProgressUpdated];
+		}
 	}
 	else if ( request.recving )
 	{
-	}
-	else if ( request.recvProgressed )
-	{
-		[self internalNotifyProgressUpdated];
+		if ( self.toldProgress )
+		{
+			[self changeState:BeeMessage.STATE_WAITING];
+		}
 	}
 	else if ( request.succeed )
 	{
@@ -253,7 +265,7 @@ - (void)handleRequest:(BeeHTTPRequest *)request
 			self.errorCode = request.errorCode;
 			self.errorDesc = nil;
 		}
-
+        
 		[self changeState:BeeMessage.STATE_FAILED];
 	}
 	else if ( request.cancelled )

shop/framework/mvc/model/Bee_Model.mm → iOS/framework/mvc/model/Bee_Model.mm

@@ -109,7 +109,7 @@ + (id)modelWithObserver:(id)observer
 
 	if ( [self respondsToSelector:@selector(sharedInstance)] )
 	{
-		model = [[self class] sharedInstance];
+		model = (BeeModel *)[[self class] sharedInstance];
 	}
 
 	if ( nil == model || NO == [model isKindOfClass:[BeeModel class]] )

shop/framework/mvc/view/app/Bee_UIApplication.m → iOS/framework/mvc/view/app/Bee_UIApplication.m

@@ -100,7 +100,7 @@ - (id)init
 	if ( self )
 	{
 //		[self load];
-		[self performLoad];
+//		[self performLoad];
 	}
 	return self;
 }
@@ -240,6 +240,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 			[self postNotification:BeeUIApplication.LAUNCHED];
 		}
 
+		[self.window.rootViewController viewWillAppear:NO];
+		[self.window.rootViewController viewDidAppear:NO];
+
 		UILocalNotification * localNotification = [launchOptions objectForKey:UIApplicationLaunchOptionsLocalNotificationKey];
 		if ( localNotification )
 		{
@@ -257,6 +260,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 	else
 	{
 		[self postNotification:BeeUIApplication.LAUNCHED];
+
+		[self.window.rootViewController viewWillAppear:NO];
+		[self.window.rootViewController viewDidAppear:NO];
 	}
 
 	_ready = YES;
@@ -290,17 +296,11 @@ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceAppl
 
 - (void)applicationDidBecomeActive:(UIApplication *)application
 {
-	[self.window.rootViewController viewWillAppear:NO];
-	[self.window.rootViewController viewDidAppear:NO];
-
 	[self postNotification:BeeUIApplication.STATE_CHANGED];
 }
 
 - (void)applicationWillResignActive:(UIApplication *)application
 {
-	[self.window.rootViewController viewWillDisappear:NO];
-	[self.window.rootViewController viewDidDisappear:NO];
-
 	[self postNotification:BeeUIApplication.STATE_CHANGED];
 }
 
@@ -386,11 +386,17 @@ - (void)application:(UIApplication *)application didReceiveLocalNotification:(UI
 
 - (void)applicationDidEnterBackground:(UIApplication *)application
 {
+	[self.window.rootViewController viewWillDisappear:NO];
+	[self.window.rootViewController viewDidDisappear:NO];
+
 	[self postNotification:BeeUIApplication.STATE_CHANGED];
 }
 
 - (void)applicationWillEnterForeground:(UIApplication *)application
 {
+	[self.window.rootViewController viewWillAppear:NO];
+	[self.window.rootViewController viewDidAppear:NO];
+
 	[self postNotification:BeeUIApplication.STATE_CHANGED];
 }
 

shop/framework/mvc/view/common/Bee_UIMetrics.h → iOS/framework/mvc/view/common/Bee_UIMetrics.h

@@ -119,6 +119,7 @@ extern CGSize	CGRectGetDistance( CGRect rect1, CGRect rect2 );		// 获取rect1
 
 #pragma mark -
 
+extern CGSize               CGSizeFromStringEx( NSString * text );
 extern UIEdgeInsets			UIEdgeInsetsFromStringEx( NSString * text );
 extern UIViewContentMode	UIViewContentModeFromString( NSString * text );
 extern UITextAlignment		UITextAlignmentFromString( NSString * text );

shop/framework/mvc/view/common/Bee_UIMetrics.m → iOS/framework/mvc/view/common/Bee_UIMetrics.m

@@ -487,6 +487,29 @@ CGSize CGRectGetDistance( CGRect rect1, CGRect rect2 )
 
 #pragma mark -
 
+CGSize CGSizeFromStringEx( NSString * text )
+{
+    NSArray * segments = [text componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+	if ( segments.count == 2 )
+	{
+		CGFloat w = [[segments objectAtIndex:0] floatValue];
+		CGFloat h = [[segments objectAtIndex:1] floatValue];
+
+		return CGSizeMake( w, h );
+	}
+	else if ( segments.count == 1 )
+	{
+		CGFloat w = [[segments objectAtIndex:0] floatValue];
+		CGFloat h = w;
+
+		return CGSizeMake( w, h );
+	}
+	else
+	{
+		return CGSizeMake( 0, 0 );
+	}
+}
+
 UIEdgeInsets UIEdgeInsetsFromStringEx( NSString * text )
 {
 	UIEdgeInsets insets = UIEdgeInsetsZero;