英文首页缓存，国新之声下拉刷新逻辑修改

yanglingyu
1 parent ba0c3a16
Showing 2 changed files with 75 additions and 55 deletions
CNLiveScioLive/Pages/Home/CNHomeENViewController.m
CNLiveScioLive/Pages/Newsound/OldController/VoiceViewController.m
@@ -41,6 +41,10 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
     NSLog(@"%@",parameters);
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
+        NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"ENHome"];
+        if (data && self.pageNo == 1) {
+            [self dealDictionaryData:data];
+        }
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
         [self.tableView.mj_header endRefreshing];
         [self.tableView.mj_footer endRefreshing];
@@ -57,60 +61,16 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         NSDictionary *dic = [NSDictionary dictionaryWithDictionary:json];
         if ([dic[@"errorCode"] isEqualToString:@"0"]) {
-            if ([dic[@"programs"] isKindOfClass:[NSArray class]]) {
-                
-                NSArray *lists = dic[@"programs"];
-                if(self->_pageNo == 1&&lists.count > 0){
-                    [self.data removeAllObjects];
-                    
-                }
-                self->_pageNo++;
-                for (NSDictionary *dics in lists) {
-                    [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-                        return @{ @"ID" : @"id" ,@"Description" : @"description" };
-                    }];
-                    NSLog(@"%@",dics);
-                    [self.data addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
-                    
-                }
-            
+            NSData *data = [dic mj_JSONData];
+            if (self.pageNo==1) {
+                [[NSUserDefaults standardUserDefaults] setObject:data forKey:@"ENHome"];
             }
-            NSDictionary *ttName = dic[@"ttName"];
-            NSArray *programs = ttName[@"programs"];
-
-            if ([programs isKindOfClass:[NSArray class]]) {
-                [self.banner removeAllObjects];
-                for (NSDictionary *dics in programs) {
-                    [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
-                        return @{ @"ID" : @"id" ,@"Description" : @"description" };
-                    }];
-                    
-                    NSLog(@"%@",dics);
-                    [self.banner addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
-                }
-                
-                NSMutableArray *titles = [NSMutableArray array];
-                NSMutableArray *imagesURLStrings = [NSMutableArray array];
-                for(int i = 0; i < self.banner.count; i++){
-                    CNHomeModel *model = self.banner[i];
-                    [titles addObject:model.title];
-                    [imagesURLStrings addObject:model.img];
-
-                }
-                if (titles.count!=0) {
-                self.tableView.tableHeaderView = self.cycleScrollView;
-                self.cycleScrollView.titlesGroup = titles;
-                self.cycleScrollView.imageURLStringsGroup = imagesURLStrings;
-                }
-                
-            }else
-            {
-                if (self.pageNo == 2) {
-                    self.tableView.tableHeaderView = nil;
-                }
-            }
-            
+            [self dealDictionaryData:data];
         } else {
+            NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"ENHome"];
+            if (data && self.pageNo == 1) {
+                [self dealDictionaryData:data];
+            }
             [AlertViewTool showHUDViewText:dic[@"errorMessage"]];
         }
@@ -123,18 +83,78 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
             [self.tableView.mj_footer endRefreshing];
         }
-        [self.tableView reloadData];
+        
         self->_isRefreshing = NO;
     } failure:^(NSError *error) {
+        NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"ENHome"];
+        if (data && self.pageNo == 1) {
+            [self dealDictionaryData:data];
+        }
         [AlertViewTool hideHUDView];
         self->_isRefreshing = NO;
         [AlertViewTool showHUDViewText:CustomStr(@"ServerBusy")];
     }];
 }
+-(void)dealDictionaryData:(NSData *)data
+{
+    NSDictionary *dic = [data mj_JSONObject];
+    if ([dic[@"programs"] isKindOfClass:[NSArray class]]) {
+        
+        NSArray *lists = dic[@"programs"];
+        if(self->_pageNo == 1&&lists.count > 0){
+            [self.data removeAllObjects];
+            
+        }
+        self->_pageNo++;
+        for (NSDictionary *dics in lists) {
+            [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+                return @{ @"ID" : @"id" ,@"Description" : @"description" };
+            }];
+            NSLog(@"%@",dics);
+            [self.data addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
+            
+        }
+    
+    }
+    NSDictionary *ttName = dic[@"ttName"];
+    NSArray *programs = ttName[@"programs"];
+
+    if ([programs isKindOfClass:[NSArray class]]) {
+        [self.banner removeAllObjects];
+        for (NSDictionary *dics in programs) {
+            [CNHomeModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+                return @{ @"ID" : @"id" ,@"Description" : @"description" };
+            }];
+            
+            NSLog(@"%@",dics);
+            [self.banner addObject:[CNHomeModel mj_objectWithKeyValues:dics]];
+        }
+        
+        NSMutableArray *titles = [NSMutableArray array];
+        NSMutableArray *imagesURLStrings = [NSMutableArray array];
+        for(int i = 0; i < self.banner.count; i++){
+            CNHomeModel *model = self.banner[i];
+            [titles addObject:model.title];
+            [imagesURLStrings addObject:model.img];
+        }
+        if (titles.count!=0) {
+        self.tableView.tableHeaderView = self.cycleScrollView;
+        self.cycleScrollView.titlesGroup = titles;
+        self.cycleScrollView.imageURLStringsGroup = imagesURLStrings;
+        }
+        
+    }else
+    {
+        if (self.pageNo == 2) {
+            self.tableView.tableHeaderView = nil;
+        }
+    }
+    [self.tableView reloadData];
+}
 - (void)loadUpData{
     _pageNo = 1;
     if(!_isRefreshing){
@@ -681,7 +681,7 @@ static const NSInteger margin = 34;
         [self.view addSubview:self.tableView];
         //设置下拉刷新
-        MJRefreshGifHeader *header = [MJRefreshGifHeader headerWithRefreshingTarget:self refreshingAction:@selector(loadVoice)];
+        MJRefreshGifHeader *header = [MJRefreshGifHeader headerWithRefreshingTarget:self refreshingAction:@selector(loadVoiceData)];
         [header setImages:refreshingImages forState:MJRefreshStateRefreshing];
         header.lastUpdatedTimeLabel.hidden = YES;
         header.stateLabel.hidden = YES;
@@ -708,7 +708,7 @@ static const NSInteger margin = 34;
         [self.view addSubview:self.enTableView];
         //设置下拉刷新
-        MJRefreshGifHeader *engHeader = [MJRefreshGifHeader headerWithRefreshingTarget:self refreshingAction:@selector(loadVOS)];
+        MJRefreshGifHeader *engHeader = [MJRefreshGifHeader headerWithRefreshingTarget:self refreshingAction:@selector(loadVOSData)];
         [engHeader setImages:refreshingImages forState:MJRefreshStateRefreshing];
         engHeader.lastUpdatedTimeLabel.hidden = YES;
         engHeader.stateLabel.hidden = YES;