Merge branch 'master' of git.wanmeizhensuo.com:gengmeiios/GMRefresh

Example/GMRefresh/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -2,37 +2,52 @@
   "images" : [
     {
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
       "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
       "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }

Example/Podfile.lock

@@ -5,7 +5,7 @@ PODS:
     - GMCache
     - MagicalRecord
     - MJExtension
-  - GMRefresh (1.0.6):
+  - GMRefresh (1.0.7):
     - GMPhobos
     - MJRefresh
   - MagicalRecord (2.3.2):
@@ -43,7 +43,7 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   GMCache: b78d8e46db864405e91d226ce640cc80d966c611
   GMPhobos: abab7c666c8a75549adea937e40e101d4d341b0d
-  GMRefresh: 64bccb48e2161969e5877168c33a7927d3020e42
+  GMRefresh: f9c68dc35d360f5603b6fd12d1879bc4c604fca4
   MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
   MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
   MJRefresh: 53e3e3219f204425ee6d3e62e8733d3295944cd6

GMRefresh/Classes/GMGifImageView.m

@@ -11,6 +11,8 @@
 
 #import "GMRefreshConstant.h"
 
+#define imgCount 12
+
 @interface GMGifImageView ()
 @property (nonatomic, strong) NSMutableArray *refreshingImages;
 @property (nonatomic, strong) UITableView *table;
@@ -47,7 +49,7 @@
 - (NSMutableArray *)refreshingImages {
     if (!_refreshingImages) {
         _refreshingImages = [NSMutableArray arrayWithCapacity:1];
-        for (NSUInteger i = 1; i<=23; i++) {
+        for (NSUInteger i = 1; i<=imgCount; i++) {
             
             NSString *imageName = [NSString stringWithFormat:@"pullLoading%ld", i];
             NSString *imagePath = GMRefreshImageName(imageName);

GMRefresh/Classes/GMRefreshFooter.m

@@ -11,6 +11,8 @@
 #import "MJRefreshComponent+Private.h"
 @import GMPhobos;
 
+#define ImageCount 12
+
 @interface GMRefreshFooter()
 @property (nonatomic, strong) UIImageView *prepareImageView;
 @end
@@ -24,7 +26,7 @@
     self.stateLabel.hidden = YES;
     // 设置正在刷新状态的动画图片
     NSMutableArray *refreshingImages = [NSMutableArray array];
-    for (NSUInteger i = 1; i<=20; i++) {
+    for (NSUInteger i = 1; i<=ImageCount; i++) {
         NSString *imageName = [NSString stringWithFormat:@"pullLoading%ld", i];
         NSString *imagePath = GMRefreshImageName(imageName);
         UIImage *image = [UIImage imageNamed:imagePath];
@@ -37,7 +39,7 @@
 - (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

@@ -13,6 +13,7 @@
 
 #define GM_REFRESH_WIDTH            46
 #define GM_REFRESH_HEIGHT           14
+#define KimgCount 12
 
 @implementation GMRefreshHeader
 {
@@ -31,7 +32,7 @@
 
     // 设置正在刷新状态的动画图片
     NSMutableArray *refreshingImages = [NSMutableArray array];
-    for (NSUInteger i = 1; i<=23; i++) {
+    for (NSUInteger i = 1; i<=KimgCount; i++) {
         NSString *imageName = [NSString stringWithFormat:@"pullLoading%ld", i];
         NSString *imagePath = GMRefreshImageName(imageName);
         UIImage *image = [UIImage imageNamed:imagePath];
@@ -99,8 +100,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]) {