刷新

王军波
1 parent 1538f1cb
Showing 4 changed files with 20 additions and 23 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListView.m
@@ -210,6 +210,8 @@
 		D2D236B41E88F8E600B7C517 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; };
 		D2D236B51E88F8E600B7C517 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */; };
 		D2D7D18D1E8A581000217771 /* timg.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D2D7D18C1E8A581000217771 /* timg.jpeg */; };
+		D2F69E8C1E8E5DBF00BA0CE6 /* 纯白.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D2F69E8B1E8E5DBF00BA0CE6 /* 纯白.jpeg */; };
+		D2F69E8E1E8E635500BA0CE6 /* 透明.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D2F69E8D1E8E635500BA0CE6 /* 透明.jpeg */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -655,6 +657,8 @@
 		D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
 		D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
 		D2D7D18C1E8A581000217771 /* timg.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = timg.jpeg; sourceTree = "<group>"; };
+		D2F69E8B1E8E5DBF00BA0CE6 /* 纯白.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "纯白.jpeg"; sourceTree = "<group>"; };
+		D2F69E8D1E8E635500BA0CE6 /* 透明.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "透明.jpeg"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -1608,6 +1612,8 @@
 		D25BF88C1E7F7F77007FB138 /* Images */ = {
 			isa = PBXGroup;
 			children = (
+				D2F69E8D1E8E635500BA0CE6 /* 透明.jpeg */,
+				D2F69E8B1E8E5DBF00BA0CE6 /* 纯白.jpeg */,
 				D2D7D18C1E8A581000217771 /* timg.jpeg */,
 				D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */,
 				D25BF8A41E80EC76007FB138 /* 头像.jpg */,
@@ -1888,6 +1894,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D2F69E8E1E8E635500BA0CE6 /* 透明.jpeg in Resources */,
 				D2029C971E6EADE10027CD92 /* Info.plist in Resources */,
 				D2575C7F1E76A4F300E3A8FC /* NHPlaneViews.xib in Resources */,
 				D2575C7B1E76A4F300E3A8FC /* NHCarViews.xib in Resources */,
@@ -1899,6 +1906,7 @@
 				D2029B911E6EAAA50027CD92 /* animation.xcassets in Resources */,
 				D2D7D18D1E8A581000217771 /* timg.jpeg in Resources */,
 				D2029CB01E6EADE10027CD92 /* MJRefresh.bundle in Resources */,
+				D2F69E8C1E8E5DBF00BA0CE6 /* 纯白.jpeg in Resources */,
 				D2575C7C1E76A4F300E3A8FC /* NHFighterView.nib in Resources */,
 				D25BF87D1E7B8C78007FB138 /* KSYGPUResource.bundle in Resources */,
 			);
@@ -173,7 +173,6 @@
             liveListView = [[LVCUGCLiveListView alloc] initWithFrame:CGRectMake(0, 64, SCREEN_WIDTH, SCREEN_HEIGHT - 114)];
         } else {
             [liveListView isNeedToRefresh];
-            [liveListView stopAutoRefresh];
         }
         liveListView.scrollToTop = YES;
         return liveListView;
@@ -13,6 +13,5 @@
 @property (nonatomic, assign)BOOL scrollToTop;
 - (void)isNeedToRefresh;
-- (void)stopAutoRefresh;
 @end
@@ -19,13 +19,13 @@ static NSString *cellId = @&quot;cellId&quot;;
     NSMutableArray *_arrayM;
     long long _timestamp;
-    NSTimer *_autoRefreshTimer;
-    CGFloat _refreshTime;
 }
 @property (nonatomic, strong) UICollectionView *collectionView;
-
+@property (nonatomic, strong)UIButton *reloadBtn;
+@property (nonatomic, strong)UIImageView *reloadImg;
+@property (nonatomic, strong)UILabel *reloadLab;
 @end
@@ -41,6 +41,7 @@ static NSString *cellId = @&quot;cellId&quot;;
         [self addSubview:self.collectionView];
+        _timestamp = [[self timestamp] longLongValue];
         [self.collectionView.header beginRefreshing];
     }
     return self;
@@ -51,20 +52,18 @@ static NSString *cellId = @&quot;cellId&quot;;
     [LiveLIstService getLiveListWithHandler:^(id data, NSError *error) {
         if (error) {
-            NSLog(@"error:%@",error);
+            NSLog(@"失败===>error:%@",error);
+            
+            _timestamp = [[self timestamp] longLongValue];
             return ;
         }
-        NSLog(@"data%@",data);
+        NSLog(@"成功===>data%@",data);
         LVCUGCLiveListModel *model = [LVCUGCLiveListModel modelWithDic:data];
         _arrayM = model.activityList.mutableCopy;
         _timestamp = [[self timestamp] longLongValue];
-        if (_refreshTime != 0) {
-            [_autoRefreshTimer invalidate];
-            _autoRefreshTimer = nil;
-            _autoRefreshTimer = [NSTimer scheduledTimerWithTimeInterval:_refreshTime target:self selector:@selector(autoRefresh) userInfo:nil repeats:YES];
-        }
+        
         [self.collectionView.header endRefreshing];
         [self.collectionView reloadData];
     }];
@@ -97,6 +96,9 @@ static NSString *cellId = @&quot;cellId&quot;;
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
     LVCUGCLivePlayerController *player = [[LVCUGCLivePlayerController alloc] init];
+    player.index = indexPath.row;
+    player.playArray = _arrayM;
+    player.model = _arrayM[indexPath.row];
     [self.viewController.navigationController pushViewController:player animated:YES];
 }
@@ -143,23 +145,12 @@ static NSString *cellId = @&quot;cellId&quot;;
 - (void)isNeedToRefresh {
-    if (_refreshTime != 0) {
-        [_autoRefreshTimer invalidate];
-        _autoRefreshTimer = nil;
-        _autoRefreshTimer = [NSTimer scheduledTimerWithTimeInterval:_refreshTime target:self selector:@selector(autoRefresh) userInfo:nil repeats:YES];
-    }
     long long timestamp = [[self timestamp] longLongValue];
     if (timestamp-_timestamp > 180000) {
         [self.collectionView.header beginRefreshing];
     }
 }
-- (void)stopAutoRefresh {
-    
-    [_autoRefreshTimer invalidate];
-    _autoRefreshTimer = nil;
-}
-
 - (void)setScrollToTop:(BOOL)scrollToTop {
     _scrollToTop = scrollToTop;