diff --git a/README.md b/README.md
index 001756f2..d43f748b 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
  
  ## 重要提示1：提issue前请先搜索，先从已有issue里找找线索。如果发现bug，请先和Demo对照自查下，如果Demo也有bug，请再提issue。Demo正常你那不正常的，提issue时请贴上你的初始化代码，注明必要的复现步骤。这样能避免多余的沟通，帮助你更快获取答案。
  
- ## 重要提示2：1.9.0版本后移除了"prefs:root="的调用，这个API已经被列为私有API，请大家尽快升级。目前最新版本2.1.7
+ ## 重要提示2：1.9.0版本后移除了"prefs:root="的调用，这个API已经被列为私有API，请大家尽快升级。目前最新版本2.1.8
  
      关于升级iOS10和Xcdoe8的提示:    
  在Xcode8环境下将项目运行在iOS10的设备/模拟器中，访问相册和相机需要额外配置info.plist文件。分别是Privacy - Photo Library Usage Description和Privacy - Camera Usage Description字段，详见Demo中info.plist中的设置。
@@ -97,7 +97,7 @@ A：1.8.4版本已支持
 A：考虑下，优先级低  
 
       最近更新    
-2.1.7 优化gif图播放的体验，加入iCloud同步进度条；新增notScaleImage属性，设置为YES时内部不去缩放图片             
+2.1.8 优化gif图播放的体验，加入iCloud同步进度条；新增notScaleImage属性，设置为YES时内部不去缩放图片             
 2.1.6 新增allowCameraLocation属性，默认为YES，置为NO时不会在照相/摄像时定位，修复一个序号紊乱的bug              
 2.1.5 修复开启showSelectedIndex后照片列表页iCloud图片进度条紊乱的bug              
 2.1.4 新增多个页面和组件的样式自定义block，允许自定义绝大多数UI样式              
diff --git a/TZImagePickerController.podspec b/TZImagePickerController.podspec
index c49837f5..ee3ebf29 100644
--- a/TZImagePickerController.podspec
+++ b/TZImagePickerController.podspec
@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name         = "TZImagePickerController"
-  s.version      = "2.1.7"
+  s.version      = "2.1.8"
   s.summary      = "A clone of UIImagePickerController, support picking multiple photos、original photo and video"
   s.homepage     = "https://github.com/banchichen/TZImagePickerController"
   s.license      = "MIT"
   s.author       = { "banchichen" => "tanzhenios@foxmail.com" }
   s.platform     = :ios
   s.ios.deployment_target = "6.0"
-  s.source       = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "2.1.7" }
+  s.source       = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "2.1.8" }
   s.requires_arc = true
   s.resources    = "TZImagePickerController/TZImagePickerController/*.{png,bundle}"
   s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}"
diff --git a/TZImagePickerController/Info.plist b/TZImagePickerController/Info.plist
index 40e080f4..10b1bc48 100644
--- a/TZImagePickerController/Info.plist
+++ b/TZImagePickerController/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.7</string>
+	<string>2.1.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/TZImagePickerController/TZImagePickerController/TZImagePickerController.h b/TZImagePickerController/TZImagePickerController/TZImagePickerController.h
index 7d08148d..56b13eb6 100644
--- a/TZImagePickerController/TZImagePickerController/TZImagePickerController.h
+++ b/TZImagePickerController/TZImagePickerController/TZImagePickerController.h
@@ -4,7 +4,7 @@
 //
 //  Created by 谭真 on 15/12/24.
 //  Copyright © 2015年 谭真. All rights reserved.
-//  version 2.1.7 - 2018.07.05
+//  version 2.1.8 - 2018.07.05
 //  更多信息，请前往项目的github地址：https://github.com/banchichen/TZImagePickerController
 
 /*
diff --git a/TZImagePickerController/TZImagePickerController/TZImagePickerController.m b/TZImagePickerController/TZImagePickerController/TZImagePickerController.m
index da388792..36306929 100644
--- a/TZImagePickerController/TZImagePickerController/TZImagePickerController.m
+++ b/TZImagePickerController/TZImagePickerController/TZImagePickerController.m
@@ -4,7 +4,7 @@
 //
 //  Created by 谭真 on 15/12/24.
 //  Copyright © 2015年 谭真. All rights reserved.
-//  version 2.1.7 - 2018.07.05
+//  version 2.1.8 - 2018.07.05
 //  更多信息，请前往项目的github地址：https://github.com/banchichen/TZImagePickerController
 
 #import "TZImagePickerController.h"
diff --git a/TZImagePickerController/TZImagePickerController/TZPhotoPreviewCell.m b/TZImagePickerController/TZImagePickerController/TZPhotoPreviewCell.m
index ce833eb8..e66e6a2a 100644
--- a/TZImagePickerController/TZImagePickerController/TZPhotoPreviewCell.m
+++ b/TZImagePickerController/TZImagePickerController/TZPhotoPreviewCell.m
@@ -92,7 +92,7 @@ - (void)layoutSubviews {
 
 
 @interface TZPhotoPreviewView ()<UIScrollViewDelegate>
-
+@property (assign, nonatomic) BOOL isRequestingGIF;
 @end
 
 @implementation TZPhotoPreviewView
@@ -149,32 +149,39 @@ - (void)configProgressView {
 
 - (void)setModel:(TZAssetModel *)model {
     _model = model;
+    self.isRequestingGIF = NO;
     [_scrollView setZoomScale:1.0 animated:NO];
     if (model.type == TZAssetModelMediaTypePhotoGif) {
         // 先显示缩略图
         [[TZImageManager manager] getPhotoWithAsset:model.asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
             self.imageView.image = photo;
             [self resizeSubviews];
+            if (self.isRequestingGIF) {
+                return;
+            }
             // 再显示gif动图
-            if (!isDegraded) {
-                [[TZImageManager manager] getOriginalPhotoDataWithAsset:model.asset progressHandler:^(double progress, NSError *error, BOOL *stop, NSDictionary *info) {
-                    progress = progress > 0.02 ? progress : 0.02;
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        self.progressView.progress = progress;
-                        if (progress >= 1) {
-                            self.progressView.hidden = YES;
-                        } else {
-                            self.progressView.hidden = NO;
-                        }
-                    });
-                } completion:^(NSData *data, NSDictionary *info, BOOL isDegraded) {
-                    if (!isDegraded) {
+            self.isRequestingGIF = YES;
+            [[TZImageManager manager] getOriginalPhotoDataWithAsset:model.asset progressHandler:^(double progress, NSError *error, BOOL *stop, NSDictionary *info) {
+                progress = progress > 0.02 ? progress : 0.02;
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    self.progressView.progress = progress;
+                    if (progress >= 1) {
                         self.progressView.hidden = YES;
-                        self.imageView.image = [UIImage sd_tz_animatedGIFWithData:data];
-                        [self resizeSubviews];
+                    } else {
+                        self.progressView.hidden = NO;
                     }
-                }];
-            }
+                });
+#ifdef DEBUG
+                NSLog(@"[TZImagePickerController] getOriginalPhotoDataWithAsset:%f error:%@", progress, error);
+#endif
+            } completion:^(NSData *data, NSDictionary *info, BOOL isDegraded) {
+                if (!isDegraded) {
+                    self.isRequestingGIF = NO;
+                    self.progressView.hidden = YES;
+                    self.imageView.image = [UIImage sd_tz_animatedGIFWithData:data];
+                    [self resizeSubviews];
+                }
+            }];
         } progressHandler:nil networkAccessAllowed:NO];
     } else {
         self.asset = model.asset;
diff --git a/TZImagePickerControllerFramework/Info.plist b/TZImagePickerControllerFramework/Info.plist
index 28df86cd..40f508ba 100644
--- a/TZImagePickerControllerFramework/Info.plist
+++ b/TZImagePickerControllerFramework/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.7</string>
+	<string>2.1.8</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>