冒泡 last_id 更改为 last_time

wanghengheng · wanghengheng · commit 0f6220547ac1 · 2016-07-15T11:20:11.000+08:00
diff --git a/Coding_iOS/Models/Tweet.h b/Coding_iOS/Models/Tweet.h
@@ -18,7 +18,7 @@
 @interface Tweet : NSObject
 @property (readwrite, nonatomic, strong) NSString *content, *device, *location, *coord, *address;
 @property (readwrite, nonatomic, strong) NSNumber *liked, *rewarded, *activity_id, *id, *comments, *likes, *rewards;
-@property (readwrite, nonatomic, strong) NSDate *created_at;
+@property (readwrite, nonatomic, strong) NSDate *created_at, *sort_time;
 @property (readwrite, nonatomic, strong) User *owner;
 @property (readwrite, nonatomic, strong) NSMutableArray *comment_list, *like_users, *reward_users;
 @property (readwrite, nonatomic, strong) NSDictionary *propertyArrayMap;
diff --git a/Coding_iOS/Models/Tweets.h b/Coding_iOS/Models/Tweets.h
@@ -25,7 +25,7 @@ typedef NS_ENUM(NSInteger, TweetType)
 
 
 @interface Tweets : NSObject
-@property (readwrite, nonatomic, strong) NSNumber *last_id;
+@property (strong, nonatomic, readonly) NSDate *last_time;
 @property (assign, nonatomic) BOOL canLoadMore, willLoadMore, isLoading;
 @property (assign, nonatomic) TweetType tweetType;
 @property (readwrite, nonatomic, strong) NSMutableArray *list;
@@ -37,7 +37,6 @@ typedef NS_ENUM(NSInteger, TweetType)
 
 + (Tweets *)tweetsWithType:(TweetType)tweetType;
 + (Tweets *)tweetsWithUser:(User *)curUser;
-- (NSString *)localResponsePath;
 - (void)configWithTweets:(NSArray *)responseA;
 
 - (NSString *)toPath;
diff --git a/Coding_iOS/Models/Tweets.m b/Coding_iOS/Models/Tweets.m
@@ -18,6 +18,7 @@ - (instancetype)init
     if (self) {
         _propertyArrayMap = [NSDictionary dictionaryWithObjectsAndKeys:
                              @"Tweet", @"list", nil];
+        _last_time = nil;
     }
     return self;
 }
@@ -26,7 +27,6 @@ - (instancetype)init
 + (Tweets *)tweetsWithType:(TweetType)tweetType{
     Tweets *tweets = [[Tweets alloc] init];
     tweets.tweetType = tweetType;
-    tweets.last_id = kDefaultLastId;
     tweets.canLoadMore = NO;
     tweets.isLoading = NO;
     tweets.willLoadMore = NO;
@@ -78,25 +78,16 @@ - (NSDictionary *)toParams{
         default:
             break;
     }
-    [params setObject:(_willLoadMore? _last_id:kDefaultLastId) forKey:@"last_id"];
-//    if (kDevice_Is_iPhone6Plus) {
-//        params[@"default_like_count"] = @12;
-//    }
+    params[@"last_time"] = _willLoadMore? @((NSUInteger)([_last_time timeIntervalSince1970] * 1000)): nil;
+
     return params;
 }
 
-- (NSString *)localResponsePath{
-    if ([_last_id isEqualToNumber:kDefaultLastId]) {
-        return [NSString stringWithFormat:@"ActivieiesWithType_%d", (int)_tweetType];
-    }else{
-        return nil;
-    }
-}
 - (void)configWithTweets:(NSArray *)responseA{
     if (responseA && [responseA count] > 0) {
         self.canLoadMore = (_tweetType != TweetTypePublicHot);
         Tweet *lastTweet = [responseA lastObject];
-        self.last_id = lastTweet.id;
+        _last_time = lastTweet.sort_time;
         if (_willLoadMore) {
             [_list addObjectsFromArray:responseA];
         }else{
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -1651,8 +1651,6 @@ - (void)request_Tweets_WithObj:(Tweets *)tweets andBlock:(void (^)(id data, NSEr
         
         if (data) {
             [MobClick event:kUmeng_Event_Request_RootList label:@"&#20882;&#27873;_&#21015;&#34920;"];
-
-            [NSObject saveResponseData:data toPath:[tweets localResponsePath]];
             id resultData = [data valueForKeyPath:@"data"];
             NSArray *resultA = [NSObject arrayFromJSON:resultData ofObjects:@"Tweet"];
             block(resultA, nil);
