优化下拉刷新

DreamSleep/DreamSleep.xcodeproj/project.pbxproj

@@ -2564,7 +2564,7 @@
 					"$(PROJECT_DIR)/DreamSleep/Vendors/UMSDK/share/share_ios_6.10.5/SocialLibraries/WeChat/WechatSDK",
 					"$(PROJECT_DIR)/DreamSleep/Vendors/UMSDK/share/share_ios_6.10.5/SocialLibraries/QQ",
 				);
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -2644,7 +2644,7 @@
 					"$(PROJECT_DIR)/DreamSleep/Vendors/UMSDK/share/share_ios_6.10.5/SocialLibraries/WeChat/WechatSDK",
 					"$(PROJECT_DIR)/DreamSleep/Vendors/UMSDK/share/share_ios_6.10.5/SocialLibraries/QQ",
 				);
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -2786,7 +2786,7 @@
 					"$(PROJECT_DIR)/DreamSleep/Vendors/UMSDK/share/share_ios_6.10.5/SocialLibraries/WeChat/WechatSDK",
 					"$(PROJECT_DIR)/DreamSleep/Vendors/UMSDK/share/share_ios_6.10.5/SocialLibraries/QQ",
 				);
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

DreamSleep/DreamSleep/Basement/Network/DSGifHeader.m

@@ -16,7 +16,7 @@
     
     // 设置普通状态的动画图片
     NSMutableArray *idleImages = [NSMutableArray array];
-    for (NSUInteger i = 0; i < 50; i++) {
+    for (NSUInteger i = 0; i < 30; i++) {
         UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"pulldown_000%zd", i]];
         [idleImages addObject:image];
     }
@@ -24,8 +24,8 @@
     
     // 设置即将刷新状态的动画图片（一松开就会刷新的状态）
     NSMutableArray *refreshingImages = [NSMutableArray array];
-    for (NSUInteger i = 40; i < 43; i++) {
-        UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"pulldown_000%zd", i]];
+    for (NSUInteger i = 0; i < 3; i++) {
+        UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"loading_%zd", i]];
         [refreshingImages addObject:image];
     }
     [self setImages:refreshingImages forState:MJRefreshStatePulling];

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00030.imageset/Contents.json → DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/loading_0.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00030.png",
+      "filename" : "loading_0.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00031.imageset/Contents.json → DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/loading_1.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00031.png",
+      "filename" : "loading_1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00032.imageset/Contents.json → DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/loading_2.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00032.png",
+      "filename" : "loading_2.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_0000.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00000.png",
+      "filename" : "pulldown_0000.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_0001.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00001.png",
+      "filename" : "pulldown_0001.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00010.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00010.png",
+      "filename" : "pulldown_00010.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00011.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00011.png",
+      "filename" : "pulldown_00011.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00012.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00012.png",
+      "filename" : "pulldown_00012.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00013.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00013.png",
+      "filename" : "pulldown_00013.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00014.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00014.png",
+      "filename" : "pulldown_00014.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00015.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00015.png",
+      "filename" : "pulldown_00015.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00016.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00016.png",
+      "filename" : "pulldown_00016.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00017.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00017.png",
+      "filename" : "pulldown_00017.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00018.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00018.png",
+      "filename" : "pulldown_00018.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00019.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00019.png",
+      "filename" : "pulldown_00019.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_0002.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00002.png",
+      "filename" : "pulldown_0002.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00020.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00020.png",
+      "filename" : "pulldown_00020.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00021.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00021.png",
+      "filename" : "pulldown_00021.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00022.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00022.png",
+      "filename" : "pulldown_00022.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00023.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00023.png",
+      "filename" : "pulldown_00023.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00024.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00024.png",
+      "filename" : "pulldown_00024.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00025.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00025.png",
+      "filename" : "pulldown_00025.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00026.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00026.png",
+      "filename" : "pulldown_00026.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00027.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00027.png",
+      "filename" : "pulldown_00027.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00028.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00028.png",
+      "filename" : "pulldown_00028.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00029.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00029.png",
+      "filename" : "pulldown_00029.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_0003.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00003.png",
+      "filename" : "pulldown_0003.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00033.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00033.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00034.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00034.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00035.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00035.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00036.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00036.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00037.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00037.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00038.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00038.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00039.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00039.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_0004.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00004.png",
+      "filename" : "pulldown_0004.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00040.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00040.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00041.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00041.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00042.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00042.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00043.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00043.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00044.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00044.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00045.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00045.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00046.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00046.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00047.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00047.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00048.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00048.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_00049.imageset/Contents.json

-{
-  "images" : [
-    {
-      "filename" : "下拉刷新_00049.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_0005.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00005.png",
+      "filename" : "pulldown_0005.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_0006.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00006.png",
+      "filename" : "pulldown_0006.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

DreamSleep/DreamSleep/Resource/Assets.xcassets/PullDown/pulldown_0007.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "下拉刷新_00007.png",
+      "filename" : "pulldown_0007.png",
       "idiom" : "universal",
       "scale" : "1x"
     },