Merge branch 'lym/master' into 'master'

Lym/master

See merge request !12

Example/GMRefresh.xcodeproj/project.pbxproj

@@ -252,6 +252,10 @@
 				LastUpgradeCheck = 0720;
 				ORGANIZATIONNAME = "北京更美互动信息科技有限公司";
 				TargetAttributes = {
+					6003F589195388D20070C39A = {
+						DevelopmentTeam = 86R4V3XFLU;
+						ProvisioningStyle = Manual;
+					};
 					6003F5AD195388D20070C39A = {
 						TestTargetID = 6003F589195388D20070C39A;
 					};
@@ -326,23 +330,21 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-GMRefresh_Example/Pods-GMRefresh_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/GMCache/GMCache.framework",
-				"${BUILT_PRODUCTS_DIR}/GMKit/GMKit.framework",
 				"${BUILT_PRODUCTS_DIR}/GMPhobos/GMPhobos.framework",
 				"${BUILT_PRODUCTS_DIR}/GMRefresh/GMRefresh.framework",
+				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
-				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
-				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
+				"${BUILT_PRODUCTS_DIR}/MagicalRecord/MagicalRecord.framework",
 				"${BUILT_PRODUCTS_DIR}/TMCache/TMCache.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMCache.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMPhobos.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMRefresh.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MagicalRecord.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TMCache.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -499,13 +501,16 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = 86R4V3XFLU;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "GMRefresh/GMRefresh-Prefix.pch";
 				INFOPLIST_FILE = "GMRefresh/GMRefresh-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_BUNDLE_IDENTIFIER = com.wanmeizhensuo.ZhengXing;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = user_dev;
 				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
 			};
@@ -517,13 +522,16 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = 86R4V3XFLU;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "GMRefresh/GMRefresh-Prefix.pch";
 				INFOPLIST_FILE = "GMRefresh/GMRefresh-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_BUNDLE_IDENTIFIER = com.wanmeizhensuo.ZhengXing;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = user_dev;
 				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
 			};

Example/Podfile

@@ -8,7 +8,8 @@ platform :ios, '8.0'
 target 'GMRefresh_Example' do
     
     pod 'GMRefresh', :path => '../'
-    
+#    pod 'GMPhobos', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git', :commit => 'ed064ed2'
+
     target 'GMRefresh_Tests' do
         inherit! :search_paths
     end

Example/Podfile.lock

 PODS:
   - GMCache (1.0.1):
     - TMCache (= 2.1.0)
-  - GMKit (1.1.4):
-    - GMKit/Category (= 1.1.4)
-    - GMKit/Color (= 1.1.4)
-    - GMKit/Constant (= 1.1.4)
-    - GMKit/FDFullscreenPopGesture (= 1.1.4)
-    - GMKit/Kit (= 1.1.4)
-    - GMKit/Protocol (= 1.1.4)
-    - Masonry
-    - SDWebImage
-  - GMKit/Category (1.1.4):
-    - GMKit/Color (= 1.1.4)
-    - GMKit/Constant (= 1.1.4)
-    - GMKit/Protocol (= 1.1.4)
-    - Masonry
-    - SDWebImage
-  - GMKit/Color (1.1.4):
-    - Masonry
-    - SDWebImage
-  - GMKit/Constant (1.1.4):
-    - Masonry
-    - SDWebImage
-  - GMKit/FDFullscreenPopGesture (1.1.4):
-    - Masonry
-    - SDWebImage
-  - GMKit/Kit (1.1.4):
-    - GMKit/Category (= 1.1.4)
-    - GMKit/Color (= 1.1.4)
-    - GMKit/Constant (= 1.1.4)
-    - GMKit/Protocol (= 1.1.4)
-    - Masonry
-    - SDWebImage
-  - GMKit/Protocol (1.1.4):
-    - Masonry
-    - SDWebImage
-  - GMPhobos (1.3.4):
+  - GMPhobos (2.0.5):
     - GMCache
-    - GMKit
-  - GMRefresh (1.0.3):
+    - MagicalRecord
+    - MJExtension
+  - GMRefresh (1.0.4):
     - GMPhobos
     - MJRefresh
-  - Masonry (1.1.0)
-  - MJRefresh (3.2.2)
-  - SDWebImage (5.3.1):
-    - SDWebImage/Core (= 5.3.1)
-  - SDWebImage/Core (5.3.1)
+  - MagicalRecord (2.3.2):
+    - MagicalRecord/Core (= 2.3.2)
+  - MagicalRecord/Core (2.3.2)
+  - MJExtension (3.2.1)
+  - MJRefresh (3.4.3)
   - TMCache (2.1.0)
 
 DEPENDENCIES:
+  - "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `ed064ed2`)"
   - GMRefresh (from `../`)
 
 SPEC REPOS:
   "git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git":
     - GMCache
-    - GMKit
-    - GMPhobos
-  https://github.com/cocoapods/specs.git:
-    - Masonry
+  https://github.com/CocoaPods/Specs.git:
+    - MagicalRecord
+    - MJExtension
     - MJRefresh
-    - SDWebImage
     - TMCache
 
 EXTERNAL SOURCES:
+  GMPhobos:
+    :commit: ed064ed2
+    :git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"
   GMRefresh:
     :path: "../"
 
+CHECKOUT OPTIONS:
+  GMPhobos:
+    :commit: ed064ed2
+    :git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"
+
 SPEC CHECKSUMS:
   GMCache: b78d8e46db864405e91d226ce640cc80d966c611
-  GMKit: 11c9ab9a317f381a05b0e1e577dd95a495625edf
-  GMPhobos: 6c7ae144997ace1661fe315adcc78c394cb73291
-  GMRefresh: c775486db814a0c57b8c82d3b084fcc884d0d22b
-  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
-  MJRefresh: 72a46ecaa2a0feaf48fc5198dff95f25f8bb27c6
-  SDWebImage: 7137d57385fb632129838c1e6ab9528a22c666cc
+  GMPhobos: abab7c666c8a75549adea937e40e101d4d341b0d
+  GMRefresh: 635099e4d381d10564d7991d449898f0b54dfe74
+  MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
+  MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
+  MJRefresh: 53e3e3219f204425ee6d3e62e8733d3295944cd6
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
 
-PODFILE CHECKSUM: a967856f0f3fe38865db489c22abaf1fecccf026
+PODFILE CHECKSUM: 3bb388bc9c1a63689947d21bc4175bf6d8906093
 
-COCOAPODS: 1.7.4
+COCOAPODS: 1.9.2

GMRefresh/Classes/GMRefreshFooter.m

@@ -33,10 +33,11 @@
     [self setImages:refreshingImages forState:MJRefreshStateRefreshing];
 }
 
+
 - (void)executeRefreshingCallback
 {
     // 上拉数据时，页面上拉次数++
-    self.pageCtrl.up_loading_times++;
+//    self.pageCtrl.up_loading_times++;
     
     dispatch_async(dispatch_get_main_queue(), ^{
         MJRefreshHeader *header = _scrollView.mj_header;

GMRefresh/Classes/GMRefreshHeader.m

@@ -31,7 +31,7 @@
 
     // 设置正在刷新状态的动画图片
     NSMutableArray *refreshingImages = [NSMutableArray array];
-    for (NSUInteger i = 1; i<=20; i++) {
+    for (NSUInteger i = 1; i<=23; i++) {
         NSString *imageName = [NSString stringWithFormat:@"pullLoading%ld", i];
         NSString *imagePath = GMRefreshImageName(imageName);
         UIImage *image = [UIImage imageNamed:imagePath];
@@ -41,17 +41,17 @@
 
 
     // 手动下拉过程中的图片
-    _prepareImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:GMRefreshImageName(@"pullLoading1")]];
-    _prepareImageView.mj_w = GM_REFRESH_WIDTH;
-    _prepareImageView.mj_h = GM_REFRESH_HEIGHT;
-
-    _prepareImageView.mj_y = self.mj_h -_prepareImageView.mj_h / 2;
-
-    _prepareImageView.mj_x = (self.mj_w - _prepareImageView.mj_w) / 2;
-
-    _prepareImageView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
-    _prepareImageView.hidden = YES;
-    [self addSubview:_prepareImageView];
+//    _prepareImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:GMRefreshImageName(@"pullLoading1")]];
+//    _prepareImageView.mj_w = GM_REFRESH_WIDTH;
+//    _prepareImageView.mj_h = GM_REFRESH_HEIGHT;
+//
+//    _prepareImageView.mj_y = self.mj_h -_prepareImageView.mj_h / 2;
+//
+//    _prepareImageView.mj_x = (self.mj_w - _prepareImageView.mj_w) / 2;
+//
+//    _prepareImageView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
+//    _prepareImageView.hidden = YES;
+//    [self addSubview:_prepareImageView];
 }
 
 - (void)setPullingPercent:(CGFloat)pullingPercent
@@ -99,8 +99,8 @@
 - (void)executeRefreshingCallback
 {
     // 下拉加载时，页面下拉次数++，同时将当前数据进行上报
-    self.pageCtrl.down_loading_times++;
-    [[GMExposureManager sharedManager] endExpoTrcakerForPageCtrl:self.pageCtrl];
+//    self.pageCtrl.down_loading_times++;
+//    [[GMExposureManager sharedManager] endExpoTrcakerForPageCtrl:self.pageCtrl];
     dispatch_async(dispatch_get_main_queue(), ^{
         MJRefreshFooter *footer = _scrollView.mj_footer;
         if (footer && [footer isRefreshing]) {