Commit 0f62205

committed

冒泡 last_id 更改为 last_time

1 parent 7d8e19f commit 0f62205Copy full SHA for 0f62205

File tree

4 files changed

-18

lines changed

Coding_iOS
- Models
- Util/Manager
  - Coding_NetAPIManager.m

4 files changed

-18

lines changed

`‎Coding_iOS/Models/Tweet.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`@interface Tweet : NSObject`
`19`	`19`	`@property (readwrite, nonatomic, strong) NSString content, device, location, coord, *address;`
`20`	`20`	`@property (readwrite, nonatomic, strong) NSNumber liked, rewarded, activity_id, id, comments, likes, *rewards;`
`21`		`-@property (readwrite, nonatomic, strong) NSDate *created_at;`
	`21`	`+@property (readwrite, nonatomic, strong) NSDate created_at, sort_time;`
`22`	`22`	`@property (readwrite, nonatomic, strong) User *owner;`
`23`	`23`	`@property (readwrite, nonatomic, strong) NSMutableArray comment_list, like_users, *reward_users;`
`24`	`24`	`@property (readwrite, nonatomic, strong) NSDictionary *propertyArrayMap;`

`‎Coding_iOS/Models/Tweets.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ typedef NS_ENUM(NSInteger, TweetType)`
`25`	`25`
`26`	`26`
`27`	`27`	`@interface Tweets : NSObject`
`28`		`-@property (readwrite, nonatomic, strong) NSNumber *last_id;`
	`28`	`+@property (strong, nonatomic, readonly) NSDate *last_time;`
`29`	`29`	`@property (assign, nonatomic) BOOL canLoadMore, willLoadMore, isLoading;`
`30`	`30`	`@property (assign, nonatomic) TweetType tweetType;`
`31`	`31`	`@property (readwrite, nonatomic, strong) NSMutableArray *list;`
`@@ -37,7 +37,6 @@ typedef NS_ENUM(NSInteger, TweetType)`
`37`	`37`
`38`	`38`	`+ (Tweets *)tweetsWithType:(TweetType)tweetType;`
`39`	`39`	`+ (Tweets )tweetsWithUser:(User )curUser;`
`40`		`-- (NSString *)localResponsePath;`
`41`	`40`	`- (void)configWithTweets:(NSArray *)responseA;`
`42`	`41`
`43`	`42`	`- (NSString *)toPath;`

`‎Coding_iOS/Models/Tweets.m`

Lines changed: 4 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ - (instancetype)init`
`18`	`18`	`if (self) {`
`19`	`19`	`_propertyArrayMap = [NSDictionary dictionaryWithObjectsAndKeys:`
`20`	`20`	`@"Tweet", @"list", nil];`
	`21`	`+ _last_time = nil;`
`21`	`22`	`}`
`22`	`23`	`return self;`
`23`	`24`	`}`
`@@ -26,7 +27,6 @@ - (instancetype)init`
`26`	`27`	`+ (Tweets *)tweetsWithType:(TweetType)tweetType{`
`27`	`28`	`Tweets *tweets = [[Tweets alloc] init];`
`28`	`29`	`tweets.tweetType = tweetType;`
`29`		`- tweets.last_id = kDefaultLastId;`
`30`	`30`	`tweets.canLoadMore = NO;`
`31`	`31`	`tweets.isLoading = NO;`
`32`	`32`	`tweets.willLoadMore = NO;`
`@@ -78,25 +78,16 @@ - (NSDictionary *)toParams{`
`78`	`78`	`default:`
`79`	`79`	`break;`
`80`	`80`	`}`
`81`		`- [params setObject:(_willLoadMore? _last_id:kDefaultLastId) forKey:@"last_id"];`
`82`		`-// if (kDevice_Is_iPhone6Plus) {`
`83`		`-// params[@"default_like_count"] = @12;`
`84`		`-// }`
	`81`	`+ params[@"last_time"] = _willLoadMore? @((NSUInteger)([_last_time timeIntervalSince1970] * 1000)): nil;`
	`82`	`+`
`85`	`83`	`return params;`
`86`	`84`	`}`
`87`	`85`
`88`		`-- (NSString *)localResponsePath{`
`89`		`- if ([_last_id isEqualToNumber:kDefaultLastId]) {`
`90`		`- return [NSString stringWithFormat:@"ActivieiesWithType_%d", (int)_tweetType];`
`91`		`- }else{`
`92`		`- return nil;`
`93`		`- }`
`94`		`-}`
`95`	`86`	`- (void)configWithTweets:(NSArray *)responseA{`
`96`	`87`	`if (responseA && [responseA count] > 0) {`
`97`	`88`	`self.canLoadMore = (_tweetType != TweetTypePublicHot);`
`98`	`89`	`Tweet *lastTweet = [responseA lastObject];`
`99`		`- self.last_id = lastTweet.id;`
	`90`	`+ _last_time = lastTweet.sort_time;`
`100`	`91`	`if (_willLoadMore) {`
`101`	`92`	`[_list addObjectsFromArray:responseA];`
`102`	`93`	`}else{`

`‎Coding_iOS/Util/Manager/Coding_NetAPIManager.m`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1651,8 +1651,6 @@ - (void)request_Tweets_WithObj:(Tweets *)tweets andBlock:(void (^)(id data, NSEr`
`1651`	`1651`
`1652`	`1652`	`if (data) {`
`1653`	`1653`	`[MobClick event:kUmeng_Event_Request_RootList label:@"冒泡_列表"];`
`1654`		`-`
`1655`		`- [NSObject saveResponseData:data toPath:[tweets localResponsePath]];`
`1656`	`1654`	`id resultData = [data valueForKeyPath:@"data"];`
`1657`	`1655`	`NSArray *resultA = [NSObject arrayFromJSON:resultData ofObjects:@"Tweet"];`
`1658`	`1656`	`block(resultA, nil);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 0f62205

File tree

4 files changed

4 files changed

`‎Coding_iOS/Models/Tweet.h`

`‎Coding_iOS/Models/Tweets.h`

`‎Coding_iOS/Models/Tweets.m`

`‎Coding_iOS/Util/Manager/Coding_NetAPIManager.m`

0 commit comments