Merge branch 'lym/master' into 'master'

Lym/master

See merge request !16

GMRefresh/Classes/GMGifImageView.m

@@ -11,7 +11,7 @@
 
 #import "GMRefreshConstant.h"
 
-#define imgCount 12
+#define imgCount 16
 
 @interface GMGifImageView ()
 @property (nonatomic, strong) NSMutableArray *refreshingImages;
@@ -38,8 +38,9 @@
         self.animationDuration = duration;
         [superView addSubview:self];
         CGFloat width = 100;
+        CGFloat height = 130;
         CGFloat x = (superView.frame.size.width -width) * 0.5;
-        self.frame = CGRectMake(x, -100, width, width);
+        self.frame = CGRectMake(x, -130, width, height);
 
  
     }
@@ -63,7 +64,7 @@
 
 - (void)startGifRefresh:(BOOL)topAnimation {
     /* 根据图片设置控件的高度 */
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         self.hidden = NO;
         [self startAnimating];
     });

GMRefresh/Classes/GMRefreshFooter.m

@@ -11,7 +11,7 @@
 #import "MJRefreshComponent+Private.h"
 @import GMPhobos;
 
-#define ImageCount 12
+#define ImageCount 16
 
 @interface GMRefreshFooter()
 @property (nonatomic, strong) UIImageView *prepareImageView;

GMRefresh/Classes/GMRefreshHeader.m

@@ -13,7 +13,7 @@
 
 #define GM_REFRESH_WIDTH            46
 #define GM_REFRESH_HEIGHT           14
-#define KimgCount 12
+#define KimgCount 16
 
 @implementation GMRefreshHeader
 {