Commit 8fe68224 cgx

优化下拉刷新

1 个父辈 98874036
正在显示 105 个修改的文件 包含 37 行增加394 行删除
...@@ -2564,7 +2564,7 @@ ...@@ -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/WeChat/WechatSDK",
"$(PROJECT_DIR)/DreamSleep/Vendors/UMSDK/share/share_ios_6.10.5/SocialLibraries/QQ", "$(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; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
...@@ -2644,7 +2644,7 @@ ...@@ -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/WeChat/WechatSDK",
"$(PROJECT_DIR)/DreamSleep/Vendors/UMSDK/share/share_ios_6.10.5/SocialLibraries/QQ", "$(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; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
...@@ -2786,7 +2786,7 @@ ...@@ -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/WeChat/WechatSDK",
"$(PROJECT_DIR)/DreamSleep/Vendors/UMSDK/share/share_ios_6.10.5/SocialLibraries/QQ", "$(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; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
// 设置普通状态的动画图片 // 设置普通状态的动画图片
NSMutableArray *idleImages = [NSMutableArray array]; 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]]; UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"pulldown_000%zd", i]];
[idleImages addObject:image]; [idleImages addObject:image];
} }
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
// 设置即将刷新状态的动画图片(一松开就会刷新的状态) // 设置即将刷新状态的动画图片(一松开就会刷新的状态)
NSMutableArray *refreshingImages = [NSMutableArray array]; NSMutableArray *refreshingImages = [NSMutableArray array];
for (NSUInteger i = 40; i < 43; i++) { for (NSUInteger i = 0; i < 3; i++) {
UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"pulldown_000%zd", i]]; UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"loading_%zd", i]];
[refreshingImages addObject:image]; [refreshingImages addObject:image];
} }
[self setImages:refreshingImages forState:MJRefreshStatePulling]; [self setImages:refreshingImages forState:MJRefreshStatePulling];
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00030.png", "filename" : "loading_0.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00031.png", "filename" : "loading_1.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00032.png", "filename" : "loading_2.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00000.png", "filename" : "pulldown_0000.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00001.png", "filename" : "pulldown_0001.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00010.png", "filename" : "pulldown_00010.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00011.png", "filename" : "pulldown_00011.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00012.png", "filename" : "pulldown_00012.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00013.png", "filename" : "pulldown_00013.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00014.png", "filename" : "pulldown_00014.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00015.png", "filename" : "pulldown_00015.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00016.png", "filename" : "pulldown_00016.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00017.png", "filename" : "pulldown_00017.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00018.png", "filename" : "pulldown_00018.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00019.png", "filename" : "pulldown_00019.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00002.png", "filename" : "pulldown_0002.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00020.png", "filename" : "pulldown_00020.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00021.png", "filename" : "pulldown_00021.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00022.png", "filename" : "pulldown_00022.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00023.png", "filename" : "pulldown_00023.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00024.png", "filename" : "pulldown_00024.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00025.png", "filename" : "pulldown_00025.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00026.png", "filename" : "pulldown_00026.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00027.png", "filename" : "pulldown_00027.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00028.png", "filename" : "pulldown_00028.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00029.png", "filename" : "pulldown_00029.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00003.png", "filename" : "pulldown_0003.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{
"images" : [
{
"filename" : "下拉刷新_00033.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00034.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00035.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00036.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00037.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00038.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00039.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00004.png", "filename" : "pulldown_0004.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{
"images" : [
{
"filename" : "下拉刷新_00040.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00041.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00042.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00043.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00044.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00045.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00046.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00047.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00048.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "下拉刷新_00049.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00005.png", "filename" : "pulldown_0005.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00006.png", "filename" : "pulldown_0006.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
{ {
"images" : [ "images" : [
{ {
"filename" : "下拉刷新_00007.png", "filename" : "pulldown_0007.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!