迁移到最新的xcode

XFFruit.xcodeproj/project.pbxproj

@@ -3271,6 +3271,7 @@
 					C1F696021AB870B400F9F5DD = {
 						CreatedOnToolsVersion = 6.2;
 						DevelopmentTeam = W54V2VB863;
+						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -4436,8 +4437,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer: jie zhang (9V9955H2BK)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: jie zhang (9V9955H2BK)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPYING_PRESERVES_HFS_DATA = NO;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
@@ -4450,7 +4452,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "e2cec26c-3666-4512-9b9a-cdb4cd9da56d";
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -4461,8 +4464,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPYING_PRESERVES_HFS_DATA = NO;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
@@ -4475,7 +4479,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "e2cec26c-3666-4512-9b9a-cdb4cd9da56d";
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;

XFFruit/Info.plist

@@ -37,6 +37,32 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
+    <key>NSAppleMusicUsageDescription</key>
+    <string>App需要您的同意,才能访问媒体资料库</string>
+    <key>NSBluetoothPeripheralUsageDescription</key>
+    <string>App需要您的同意,才能访问蓝牙</string>
+    <key>NSCalendarsUsageDescription</key>
+    <string>App需要您的同意,才能访问日历</string>
+    <key>NSCameraUsageDescription</key>
+    <string>App需要您的同意,才能访问相机</string>
+    <key>NSHealthShareUsageDescription</key>
+    <string>App需要您的同意,才能访问健康分享</string>
+    <key>NSHealthUpdateUsageDescription</key>
+    <string>App需要您的同意,才能访问健康更新 </string>
+    <key>NSLocationAlwaysUsageDescription</key>
+    <string>App需要您的同意,才能始终访问位置</string>
+    <key>NSLocationUsageDescription</key>
+    <string>App需要您的同意,才能访问位置</string>
+    <key>NSLocationWhenInUseUsageDescription</key>
+    <string>App需要您的同意,才能在使用期间访问位置</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>App需要您的同意,才能访问麦克风</string>
+    <key>NSMotionUsageDescription</key>
+    <string>App需要您的同意,才能访问运动与健身</string>
+    <key>NSPhotoLibraryUsageDescription</key>
+    <string>App需要您的同意,才能访问相册</string>
+    <key>NSRemindersUsageDescription</key>
+    <string>App需要您的同意,才能访问提醒事项</string>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

XFFruit/Utilities/IBTRefreshTableView/IBTRefreshTableView.h

@@ -13,7 +13,7 @@
 @interface IBTRefreshTableView : IBTTableView
 
 @property (assign, nonatomic) id <IBTScrollViewRefreshDelegate> refreshDelegate;
-@property (strong, nonatomic) UIRefreshControl *refreshControl;
+@property (strong, nonatomic) UIRefreshControl *refreshCtrl;
 @property (strong, nonatomic) IBTScrollLoadMoreView *loadMoreView;
 
 - (void)scrollToTopAnimated:(BOOL)animated;

XFFruit/Utilities/IBTRefreshTableView/IBTRefreshTableView.m

@@ -56,8 +56,8 @@
     [super didMoveToWindow];
     
     if (!self.window) {
-        if (_refreshControl) {
-            [_refreshControl endRefreshing];
+        if (_refreshCtrl) {
+            [_refreshCtrl endRefreshing];
         }
         
         if (_refreshFooterView) {
@@ -127,25 +127,25 @@
 }
 
 - (void)addRefreshControlWithText:(NSString *)text {
-    if (!_refreshControl) {
-        self.refreshControl = [[UIRefreshControl alloc] init];
-        [_refreshControl addTarget:self
+    if (!_refreshCtrl) {
+        self.refreshCtrl = [[UIRefreshControl alloc] init];
+        [_refreshCtrl addTarget:self
                             action:@selector(handleRefresh:)
                   forControlEvents:UIControlEventValueChanged];
     }
     
     if (text.length > 0) {
-        _refreshControl.attributedTitle = [[NSAttributedString alloc] initWithString:text];
+        _refreshCtrl.attributedTitle = [[NSAttributedString alloc] initWithString:text];
     }
     
-    if (!_refreshControl.superview) {
-        [self addSubview:_refreshControl];
+    if (!_refreshCtrl.superview) {
+        [self addSubview:_refreshCtrl];
     }
 }
 
 - (void)removeRefreshControl {
-    if (_refreshControl && _refreshControl.superview) {
-        [_refreshControl removeFromSuperview];
+    if (_refreshCtrl && _refreshCtrl.superview) {
+        [_refreshCtrl removeFromSuperview];
     }
 }
 
@@ -182,11 +182,11 @@
     //    }
     //
     //    if (textStr.length > 0) {
-    //        _refreshControl.attributedTitle = [[NSAttributedString alloc] initWithString:textStr];
+    //        _refreshCtrl.attributedTitle = [[NSAttributedString alloc] initWithString:textStr];
     //    }
     
-    if (_refreshControl.refreshing) {
-        [_refreshControl endRefreshing];
+    if (_refreshCtrl.refreshing) {
+        [_refreshCtrl endRefreshing];
         
         // Fix ContentInset became -60 when UIRefreshController endRefreshing
         // http://stackoverflow.com/questions/20101572/ios7-uirefreshcontrol-changes-contentinset