3.1.1兼容arm64

iOS/framework/system/foundation/Bee_Runtime.mm

@@ -555,7 +555,6 @@ + (NSArray *)allSubClassesOf:(Class)superClass
 
 		[results addObject:classType];
 	}
-
 	return results;
 }
 

iOS/shop/AppDelegate.m

@@ -52,7 +52,7 @@ - (void)load
 	[UserModel			sharedInstance];
 
 	// 配置ECSHOP
-	[ServerConfig sharedInstance].url = @"http://shop.ecmobile.me/ecmobile/?url=";
+	[ServerConfig sharedInstance].url = @"http://shop.ecmobile.cn/ecmobile/?url=";
 
 	// 配置闪屏
 	bee.services.wizard.config.showBackground = YES;
@@ -92,7 +92,7 @@ - (void)load
 			[BeeUINavigationBar setBackgroundImage:[UIImage imageNamed:@"nav_bg.png"]];
 		}
 	}
-
+		
 	[self updateConfig];
 
 	self.window.rootViewController = [AppBoard_iPhone sharedInstance];
@@ -119,40 +119,37 @@ - (void)updateConfig
 	ALIAS( bee.services.location,			lbs );
 
 	// 配置微信
-	weixin.config.appId			= @"<Your weixinID>";
-	weixin.config.appKey		= @"<Your weixinKey>";
-	
+	weixin.config.appId			= @"Your weixinID";
+	weixin.config.appKey		= @"Your weixinKey";
+
 	// 配置新浪
-	sweibo.config.appKey		= @"<Your sinaWeiboKey>";
-	sweibo.config.appSecret		= @"<Your sinaWeiboSecret>";
-	sweibo.config.redirectURI	= @"<Your sinaWeiboCallback>";
-	
+	sweibo.config.appKey		= @"Your sinaWeiboKey";
+	sweibo.config.appSecret		= @"Your sinaWeiboSecret";
+	sweibo.config.redirectURI	= @"Your sinaWeiboCallback";
+
 	// 配置腾讯
-	tweibo.config.appKey		= @"<Your tencentWeiboKey>";
-	tweibo.config.appSecret		= @"<Your tencentWeiboSecret>";
-	tweibo.config.redirectURI	= @"<Your tencentWeiboCallback>";
-	
+	tweibo.config.appKey		= @"Your tencentWeiboKey";
+	tweibo.config.appSecret		= @"Your tencentWeiboSecret";
+	tweibo.config.redirectURI	= @"Your tencentWeiboCallback";
+
 	// 配置支付宝
-	alipay.config.parnter		= @"<Your alipayPartnerID>";
-	alipay.config.seller		= @"<Your alipaySeller>";
-	alipay.config.privateKey	= @"<Your alipayPrivateKey>";
-	alipay.config.publicKey		= @"<Your alipayPublicKey>";
-	alipay.config.notifyURL		= @"<Your alipayCallback>";
-	alipay.config.wapCallBackURL	= @"<Your alipayWapURL>";
+	alipay.config.parnter		= @"Your alipayPartnerID";
+	alipay.config.seller		= @"Your alipaySeller";
+	alipay.config.privateKey	= @"Your alipayPrivateKey";
+	alipay.config.publicKey		= @"Your alipayPublicKey";
+	alipay.config.notifyURL		= @"Your alipayCallback";
+	alipay.config.wapCallBackURL = @"http://shop.ecmobile.cn/ecmobile/payment/app_callback.php?err=";
 
 	// 配置语音识别
 	siri.config.showUI			= NO;
-	siri.config.appID			= @"<Your iflyKey>";
+	siri.config.appID			= @"Your iflyKey";
 
 	// 配置友盟
 	[MobClick setAppVersion:[BeeSystemInfo appShortVersion]];
 	[MobClick setCrashReportEnabled:YES];
 	[MobClick setLatitude:lbs.location.coordinate.latitude longitude:lbs.location.coordinate.longitude];
 	[MobClick setLocation:lbs.location];
-	[MobClick startWithAppkey:@"<Your umengKey>" reportPolicy:BATCH channelId:nil];
-
-	// 配置快递100
-	[ExpressModel setKuaidi100Key:@"<Your kuaidi100Key>"];
+	[MobClick startWithAppkey:@"Your umengKey" reportPolicy:BATCH channelId:nil];
 }
 
 @end

iOS/shop/generated/ecmobile.mm

@@ -584,7 +584,7 @@ @implementation API
 
 //		NSString * requestURI = @"http://shop.ecmobile.me/ecmobile/?url=address/list";
 		NSString * requestURI = [NSString stringWithFormat:@"%@/address/list", [ServerConfig sharedInstance].url];
-		
+
 		msg.HTTP_POST( requestURI ).PARAM( @"json", requestBody.objectToString );
 	}
 	else if ( msg.succeed )
@@ -601,7 +601,6 @@ @implementation API
 
 		msg.OUTPUT( @"status", status );
 		msg.OUTPUT( @"data", data );
-
 	}
 	else if ( msg.failed )
 	{

iOS/shop/main.m

@@ -15,4 +15,4 @@ int main(int argc, char *argv[])
 	@autoreleasepool {
 	    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
 	}
-}
+}

iOS/shop/model/ExpressModel.h

@@ -24,6 +24,5 @@
 @property (nonatomic, retain) NSMutableArray *	content;
 
 + (NSString *)kuaidi100Key;
-+ (void)setKuaidi100Key:(NSString *)key;
 
 @end

iOS/shop/model/OrderModel.m

@@ -219,6 +219,7 @@ - (void)pay:(ORDER *)order
 	if ( msg.succeed )
 	{
 		STATUS * status = msg.GET_OUTPUT( @"status" );
+
 		if ( NO == status.succeed.boolValue )
 		{
 			msg.failed = YES;

iOS/shop/model/UserModel.m

@@ -54,7 +54,7 @@ - (void)unload
 - (UIImage *)avatar
 {
     NSString * avatarPath = [NSString stringWithFormat:@"%@/avatar-u-%@.png", [BeeSandbox libCachePath], self.user.id];
-    
+
     if ( [[NSFileManager defaultManager] fileExistsAtPath:avatarPath] )
     {
         NSData * data = [NSData dataWithContentsOfFile:avatarPath];

iOS/shop/shop-Info.plist

@@ -49,7 +49,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20140620</string>
+	<string>20141201</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIPrerenderedIcon</key>

iOS/shop/vendor/UMFeedback/UMFeedback.h

@@ -1,35 +1,137 @@
-/*
-  UMFeedback.h
-  Created by ming hua on 2012-03-19.
-  Updated by ming hua on 2013-10-10.
-  Version 1.4.1
-  Copyright (c) 2013年 umeng.com. All rights reserved.
- */
+//
+//  UMFeedback.h
+//  UMFeedback
+//
+//  Created by ming hua on 2012-03-19.
+//  Updated by ming hua on 2013-04-17.
+//  Updated by cui guilin on 2014-09-12.
+//  Version 1.4
+//  Copyright (c) 2012年 umeng.com. All rights reserved.
+//
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
 #define UMFBCheckFinishedNotification @"UMFBCheckFinishedNotification"
 #define UMFBWebViewDismissNotification @"UMFBWebViewDismissNotification"
 
+#pragma mark - Feedback Data Delegate
+
 @protocol UMFeedbackDataDelegate <NSObject>
+
 @optional
+/**
+ *  trigger when fetch data from server
+ *
+ *  @param error
+ */
 - (void)getFinishedWithError: (NSError *)error;
+
+/**
+ *  trigger when post data to server is finished
+ *
+ *  @param error
+ */
 - (void)postFinishedWithError:(NSError *)error;
+
 @end
 
+
+#pragma mark - Feedback Object
 @interface UMFeedback : NSObject
-@property(nonatomic, assign) id <UMFeedbackDataDelegate> delegate;
-@property(nonatomic, retain) NSMutableArray *newReplies;
-@property(nonatomic, retain) NSMutableArray *topicAndReplies;
 
-#pragma Umeng Feedback Setting
+/**
+ *  UMFeedback Data Delegate
+ */
+@property(nonatomic, unsafe_unretained) NSObject <UMFeedbackDataDelegate> *delegate;
+
+/**
+ *  the new replies
+ */
+@property(nonatomic, strong) NSMutableArray *theNewReplies;
+
+/**
+ *  the topic and replies
+ */
+@property(nonatomic, strong) NSMutableArray *topicAndReplies;
+
+#pragma mark Settings
+
+/**
+ *  A Boolean value indicating whether the feedback log is printed(YES) or not (NO). The default value is NO.
+ *
+ *  @param value YES to print long while NO to do not print.
+ */
 + (void)setLogEnabled:(BOOL)value;
-#pragma Umeng Feedback Show Html UI
-+ (void)showFeedback:(UIViewController *)viewController withAppkey:(NSString *)appKey;
-+ (void)showFeedback:(UIViewController *)viewController withAppkey:(NSString *)appKey dictionary:(NSDictionary *)dictionary;
-#pragma Umeng Feedback Data Api
+
++ (BOOL)feedbackLogEnabled;
+
+/**
+ *  set feedback app key. you can find out the app key at: http://www.umeng.com/apps/setting
+ *
+ *  @param appkey
+ */
++ (void)setAppkey:(NSString *)appkey;
+
++ (NSString *)uuid;
++ (NSString *)messageType;
+
+#pragma mark Show Feedback View
+
+/**
+ *  get the default feedback view controller
+ *
+ *  @return
+ */
++ (UIViewController *)feedbackViewController;
+
+/**
+ *  get the default modal feedback view controller
+ *
+ *  @return
+ */
++ (UIViewController *)feedbackModalViewController;
+
+
++ (void)didReceiveRemoteNotification:(NSDictionary *)userInfo;
+
+#pragma mark Umeng Feedback Data Api
+
+/**
+ *  the UMFeedback singleton
+ *
+ *  @return
+ */
 + (UMFeedback *)sharedInstance;
-- (void)setAppkey:(NSString *)appKey delegate:(id<UMFeedbackDataDelegate>)newDelegate;
+
+/**
+ *  get feedback replies from server
+ */
 - (void)get;
+
+/**
+ *  post feedback repli to server
+ *
+ *  @param feedback_dictionary <#feedback_dictionary description#>
+ */
 - (void)post:(NSDictionary *)feedback_dictionary;
+
+// set custom remark info
+/**
+ *  set custom user info
+ *
+ *  @param remarkInfo custom user info
+ */
+- (void)setRemarkInfo:(NSDictionary *)remarkInfo;
+
+- (void)updateUserInfo:(NSDictionary *)info;
+- (NSDictionary *)getUserInfo;
+
+// 不建议使用的
+
++ (void)showFeedback:(UIViewController *)viewController withAppkey:(NSString *)appKey;
++ (void)showFeedback:(UIViewController *)viewController withAppkey:(NSString *)appKey dictionary:(NSDictionary *)dictionary;
 + (void)checkWithAppkey:(NSString *)appkey;
+- (void)setAppkey:(NSString *)appKey delegate:(id<UMFeedbackDataDelegate>)newDelegate;
+
 @end

iOS/shop/view_iPhone/AppBoard_iPhone.m

@@ -69,8 +69,8 @@ @implementation AppBoard_iPhone
 #pragma mark -
 
 - (void)load
-{
-	self.configModel = [ConfigModel modelWithObserver:self];
+{	
+    self.configModel = [ConfigModel modelWithObserver:self];
 	self.userModel = [UserModel modelWithObserver:self];
 }
 
@@ -92,7 +92,7 @@ - (void)unload
 		bee.ui.router[self.TAB_SEARCH]	= [D0_SearchBoard_iPhone class];
 		bee.ui.router[self.TAB_CART]	= [C0_ShoppingCartBoard_iPhone class];
 		bee.ui.router[self.TAB_USER]	= [E0_ProfileBoard_iPhone sharedInstance];
-		
+
 		[self.view addSubview:bee.ui.router.view];
 		[self.view addSubview:bee.ui.tabbar];
 
@@ -102,6 +102,7 @@ - (void)unload
 		[self observeNotification:UserModel.LOGIN];
 		[self observeNotification:UserModel.LOGOUT];
 		[self observeNotification:UserModel.KICKOUT];
+
 //		[self observeNotification:BeeNetworkReachability.WIFI_REACHABLE];
 //		[self observeNotification:BeeNetworkReachability.WLAN_REACHABLE];
 //		[self observeNotification:BeeNetworkReachability.UNREACHABLE];
@@ -153,7 +154,7 @@ - (void)unload
 
 ON_SIGNAL3( AppBoard_iPhone, EXPIRE_TOUCHED, signal )
 {
-	[[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"http://www.ecmobile.me"]];
+	[[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"http://www.ecmobile.cn"]];
 }
 
 #pragma mark -

iOS/shop/view_iPhone/AppTabbar_iPhone.m

@@ -36,7 +36,7 @@ - (void)load
 
 	$(@"#badge-bg").HIDE();
 	$(@"#badge").HIDE();
-	
+
 	[self selectHome];
 }
 
@@ -115,7 +115,7 @@ - (void)selectUser
 ON_NOTIFICATION3( UserModel, LOGIN, notification )
 {
 	NSUInteger count = 0;
-	
+
 	for ( CART_GOODS * goods in [CartModel sharedInstance].goods )
 	{
 		count += goods.goods_number.intValue;

iOS/shop/view_iPhone/source/B0_BannerCell_iPhone.m

@@ -34,13 +34,13 @@ - (void)load
      */
 
     @weakify(self);
-    
+
     self.list.animationDuration = 0.25f;
-    
-    self.list.whenReloading = ^
+
+	self.list.whenReloading = ^
     {
         @normalize(self);
-        
+
         NSArray * datas = (NSArray *)self.data;
 
         self.list.total = datas.count;