https://coding.net/t/codingcorp/p/Coding-iOS/task/815318

wanghengheng · wanghengheng · commit ce4551537a08 · 2016-07-18T16:54:20.000+08:00
diff --git a/Coding_iOS/Controllers/Topic/CSTopicCreateVC.m b/Coding_iOS/Controllers/Topic/CSTopicCreateVC.m
@@ -96,17 +96,8 @@ - (void)viewDidLoad {
 
 - (void)refreshHotTopiclist{
     __weak typeof(self) wself = self;
-    [[Coding_NetAPIManager sharedManager] request_HotTopiclistWithBlock:^(NSArray *topiclist, NSError *error) {
-        if (topiclist) {
-            NSMutableArray *namelist = [NSMutableArray array];
-            for (int i=0; i<topiclist.count && i < 10; i++) {
-                NSDictionary *topicDict = topiclist[i];
-                [namelist addObject:topicDict[@"name"]];
-            }
-            wself.hotTopiclist = [namelist copy];
-        }else {
-            wself.hotTopiclist = [NSArray array];
-        }
+    [[Coding_NetAPIManager sharedManager] request_DefautsHotTopicNamelistWithBlock:^(NSArray *nameList, NSError *error) {
+        wself.hotTopiclist = nameList.count > 10? [nameList subarrayWithRange:NSMakeRange(0, 10)]: nameList;
         [wself.listView reloadData];
     }];
 }
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.h b/Coding_iOS/Util/Manager/Coding_NetAPIManager.h
@@ -254,7 +254,7 @@ typedef NS_ENUM(NSInteger, PurposeType) {
 #pragma mark - Topic
 - (void)request_TopicAdlistWithBlock:(void (^)(id data, NSError *error))block;
 - (void)request_HotTopiclistWithBlock:(void (^)(id data, NSError *error))block;
-
+- (void)request_DefautsHotTopicNamelistWithBlock:(void (^)(id data, NSError *error))block;
 - (void)request_Tweet_WithSearchString:(NSString *)strSearch andPage:(NSInteger)page andBlock:(void (^)(id data, NSError *error))block;
 
 - (void)requestWithSearchString:(NSString *)strSearch typeStr:(NSString*)type andPage:(NSInteger)page andBlock:(void (^)(id data, NSError *error))block;
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -2560,6 +2560,29 @@ - (void)request_HotTopiclistWithBlock:(void (^)(id data, NSError *error))block {
         }];
 }
 
+- (void)request_DefautsHotTopicNamelistWithBlock:(void (^)(id data, NSError *error))block {
+    NSString *defaultsPath = @"api/tweet_topic/defaults";
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:defaultsPath withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
+        if (data) {
+            NSMutableArray *resultList = [[data[@"data"] valueForKey:@"name"] mutableCopy];
+            NSString *hotPath = @"/api/tweet_topic/hot";
+            [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:hotPath withParams:nil withMethodType:Get andBlock:^(id dataHot, NSError *errorHot) {
+                if (dataHot) {
+                    [MobClick event:kUmeng_Event_Request_Get label:@"&#35805;&#39064;_&#28909;&#38376;&#35805;&#39064;_&#27036;&#21333;"];
+                    NSMutableArray *hotList = [[dataHot[@"data"] valueForKey:@"name"] mutableCopy];
+                    [hotList removeObjectsInArray:resultList];//&#21076;&#38500;&#37325;&#22797;&#20803;&#32032;
+                    [resultList addObjectsFromArray:hotList];//&#23558; hot &#36861;&#21152;&#21040; defaults &#26411;&#23614;
+                    block(resultList, nil);
+                }else{
+                    block(nil, errorHot);
+                }
+            }];
+        }else{
+            block(nil, error);
+        }
+    }];
+}
+
 - (void)request_Tweet_WithSearchString:(NSString *)strSearch andPage:(NSInteger)page andBlock:(void (^)(id data, NSError *error))block {
 
     NSString *path = [NSString stringWithFormat:@"/api/search/quick?q=%@&page=%d", strSearch, (int)page];
