Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud

王军波
2 parents ebbe49c1 a8c70646
Showing 14 changed files with 119 additions and 41 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/CNLivePlayerSDK
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Headers/CNLiveGPUStreamerKit.h
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Headers/CNLiveMoviePlayerController.h
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Headers/CNLiveTypeDef.h
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Headers/CNLiveWebcastManager.h
LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Info.plist
LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatView.h
LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatView.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCLivePlayerController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLivePlayerController.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCPlayer.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCTelevisionView.m
@@ -66,8 +66,6 @@
 		4BD856121EBAD2640082061D /* ProgramModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD856111EBAD2640082061D /* ProgramModel.m */; };
 		4BD856151EBAD31A0082061D /* NSString+UrlEncode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD856141EBAD31A0082061D /* NSString+UrlEncode.m */; };
 		4BD856181EBAD35C0082061D /* NSDictionary+Safety.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD856171EBAD35C0082061D /* NSDictionary+Safety.m */; };
-		4BD856191EBAD4E30082061D /* CNLiveUserSystemSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BD855D21EBAC8B20082061D /* CNLiveUserSystemSDK.framework */; };
-		4BD8561A1EBAD4E30082061D /* CNLiveUserSystemSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BD855D21EBAC8B20082061D /* CNLiveUserSystemSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4BD8561D1EBAD6490082061D /* ZXConst.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD8561C1EBAD6490082061D /* ZXConst.m */; };
 		810B64E01E779AE900133E15 /* LVCPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B64DF1E779AE900133E15 /* LVCPlayer.m */; };
 		810B64E31E779AFE00133E15 /* LVCLivePlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B64E21E779AFE00133E15 /* LVCLivePlayerController.m */; };
@@ -89,9 +87,8 @@
 		8128E2881E8A6A3600B40E75 /* CNBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8128E2851E8A6A3600B40E75 /* CNBarrageManager.m */; };
 		8128E2891E8A6A3600B40E75 /* CNBarrageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8128E2871E8A6A3600B40E75 /* CNBarrageView.m */; };
 		8130911E1E84C0F0005F0BFF /* LVCMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 8130911D1E84C0F0005F0BFF /* LVCMessage.m */; };
-		8157A0181EE1451800ADD6B9 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8157A0171EE1451800ADD6B9 /* CNLivePlayerSDK.framework */; };
-		8157A0191EE1452800ADD6B9 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8157A0171EE1451800ADD6B9 /* CNLivePlayerSDK.framework */; };
-		8157A01A1EE1452800ADD6B9 /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8157A0171EE1451800ADD6B9 /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		8178D4171F01FA2900AA78A4 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8178D4161F01FA2900AA78A4 /* CNLivePlayerSDK.framework */; };
+		8178D4191F01FA3600AA78A4 /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8178D4161F01FA2900AA78A4 /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		81A1B9A91E8277410079FF5F /* LVCInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A1B9A81E8277410079FF5F /* LVCInputView.m */; };
 		81A482F81E88AFA20097A80A /* LVCFirstHeaderReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A482F71E88AFA20097A80A /* LVCFirstHeaderReusableView.m */; };
 		81A483021E88B0130097A80A /* LVCChatRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A483001E88B0130097A80A /* LVCChatRoomModel.m */; };
@@ -257,8 +254,6 @@
 		D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; };
 		D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB31E6EC154003A77C8 /* HomeViewController.m */; };
 		D28F5FFF1E8BC7EF00914142 /* LVCUGCLiveListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */; };
-		D2994BA61E8F48DE00E8D2CC /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */; };
-		D2994BA71E8F48DE00E8D2CC /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */; };
 		D2994BA81E8F490400E8D2CC /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */; };
 		D2994BA91E8F490400E8D2CC /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D2994BAA1E8F490700E8D2CC /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */; };
@@ -303,8 +298,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				4BD8561A1EBAD4E30082061D /* CNLiveUserSystemSDK.framework in Embed Frameworks */,
-				8157A01A1EE1452800ADD6B9 /* CNLivePlayerSDK.framework in Embed Frameworks */,
+				8178D4191F01FA3600AA78A4 /* CNLivePlayerSDK.framework in Embed Frameworks */,
 				D2994BA91E8F490400E8D2CC /* CNLiveChatManager.framework in Embed Frameworks */,
 				D2994BAB1E8F490700E8D2CC /* CNLiveMsgTools.framework in Embed Frameworks */,
 			);
@@ -482,7 +476,7 @@
 		8128E2871E8A6A3600B40E75 /* CNBarrageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNBarrageView.m; sourceTree = "<group>"; };
 		8130911C1E84C0F0005F0BFF /* LVCMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCMessage.h; sourceTree = "<group>"; };
 		8130911D1E84C0F0005F0BFF /* LVCMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMessage.m; sourceTree = "<group>"; };
-		8157A0171EE1451800ADD6B9 /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
+		8178D4161F01FA2900AA78A4 /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
 		81A1B9A71E8277410079FF5F /* LVCInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCInputView.h; sourceTree = "<group>"; };
 		81A1B9A81E8277410079FF5F /* LVCInputView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCInputView.m; sourceTree = "<group>"; };
 		81A482F61E88AFA20097A80A /* LVCFirstHeaderReusableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCFirstHeaderReusableView.h; sourceTree = "<group>"; };
@@ -859,14 +853,10 @@
 			files = (
 				4BD855D31EBAC8B20082061D /* CNLiveUserSystemSDK.framework in Frameworks */,
 				D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */,
-				D2994BA71E8F48DE00E8D2CC /* CNLiveMsgTools.framework in Frameworks */,
-				8157A0181EE1451800ADD6B9 /* CNLivePlayerSDK.framework in Frameworks */,
+				8178D4171F01FA2900AA78A4 /* CNLivePlayerSDK.framework in Frameworks */,
 				D2575C7D1E76A4F300E3A8FC /* NHGiftAnimtionSDK.a in Frameworks */,
 				D2994BAA1E8F490700E8D2CC /* CNLiveMsgTools.framework in Frameworks */,
-				4BD856191EBAD4E30082061D /* CNLiveUserSystemSDK.framework in Frameworks */,
-				D2994BA61E8F48DE00E8D2CC /* CNLiveChatManager.framework in Frameworks */,
 				D2994BA81E8F490400E8D2CC /* CNLiveChatManager.framework in Frameworks */,
-				8157A0191EE1452800ADD6B9 /* CNLivePlayerSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1153,7 +1143,7 @@
 		812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
 			isa = PBXGroup;
 			children = (
-				8157A0171EE1451800ADD6B9 /* CNLivePlayerSDK.framework */,
+				8178D4161F01FA2900AA78A4 /* CNLivePlayerSDK.framework */,
 				D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */,
 				D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */,
 				D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */,
@@ -109,6 +109,17 @@
 - (void)startStreamWithUrl:(NSString *)url activityId:(NSString *)activityId success:(void (^)(void))successBlock  failure:(void (^)(NSDictionary *errorDic))failureBlock;
+/**
+ @abstract      暂停推流
+ @warning       恢复推流时根据情况调用 startStream： 或 startStreamWithUrl：方法
+ */
+- (void)pauseStreaming;
+
+/**
+ *  主播端未停止推流，但是服务端认为该视频不合法，断开推流，接收到该通知主播端应结束推流（视讯云平台有效）
+ */
+FOUNDATION_EXPORT NSString *const CNLiveServiceConnectBreakNotification NS_AVAILABLE_IOS(7_0);
+
 #pragma mark - 普通推流
 /**
@@ -25,11 +25,12 @@
                          authSuccess:(void(^)(void))authSuccessBlock
                           authFailed:(void(^)(NSDictionary *errorInfo))authFailedBlock;
-/* 初始化直播播放器  初始化成功后才能对播放器进行设置（如：自动播放、是否开启硬件解码等）和调用准备播放视频方法（prepareToPlay）
+/* 初始化直播播放器(* 以channelId播放)  初始化成功后才能对播放器进行设置（如：自动播放、是否开启硬件解码等）和调用准备播放视频方法（prepareToPlay）
  *
  * 当前版本只支持单实例的CNLiveMoviePlayerController对象，多实例将导致播放异常
  *
  * channelId         直播视频Id
+ * agree             是否允许获取主播状态 YES：获取 NO：不获取
  * authSuccess       初始化成功block
  * authFailed        初始化失败block 回调一个errorInfo的字典
  *
@@ -38,6 +39,29 @@
  * - (void)retryToGetAnchorStatusResult:(void(^)(BOOL result))result；方法重新获取
  */
 - (instancetype)initLivePlayWithChannelId:(NSString *)channelId
+                             anchorStatus:(BOOL)agree
+                              authSuccess:(void(^)(void))authSuccessBlock
+                               authFailed:(void(^)(NSDictionary *errorInfo))authFailedBlock
+                    getAnchorStatusResult:(void(^)(BOOL result))result;
+
+
+/* 初始化直播播放器(* 以channelId播放)  初始化成功后才能对播放器进行设置（如：自动播放、是否开启硬件解码等）和调用准备播放视频方法（prepareToPlay）
+ *
+ * 当前版本只支持单实例的CNLiveMoviePlayerController对象，多实例将导致播放异常
+ *
+ * channelId         直播视频Id (注* 若agree为YES时，必传，用于获取主播状态； 若agree为NO，可不传)
+ * activityId        活动Id
+ * agree             是否允许获取主播状态 YES：获取 NO：不获取
+ * authSuccess       初始化成功block
+ * authFailed        初始化失败block 回调一个errorInfo的字典
+ *
+ * result            获取主播状态 YES：获取状态成功
+ *                               NO：获取失败，不影响视频播放，但是获取不到主播离开、回来、直播结束等通知。可通过
+ * - (void)retryToGetAnchorStatusResult:(void(^)(BOOL result))result；方法重新获取
+ */
+- (instancetype)initLivePlayWithChannelId:(NSString *)channelId
+                               activityId:(NSString *)activityId
+                             anchorStatus:(BOOL)agree
                               authSuccess:(void(^)(void))authSuccessBlock
                                authFailed:(void(^)(NSDictionary *errorInfo))authFailedBlock
                     getAnchorStatusResult:(void(^)(BOOL result))result;
@@ -268,6 +292,12 @@ MP_EXTERN NSString * const MPMoviePlayerFirstVideoFrameRenderedNotification;
 MP_EXTERN NSString * const MPMoviePlayerFirstAudioFrameRenderedNotification;
+//Posted when the network status change
+MP_EXTERN NSString * const MPMoviePlayerNetworkStatusChangeNotification;
+MP_EXTERN NSString * const MPMoviePlayerCurrNetworkStatusUserInfoKey; // NSNumber (KSYNetworkStatus)
+MP_EXTERN NSString * const MPMoviePlayerLastNetworkStatusUserInfoKey; // NSNumber (KSYNetworkStatus)
+
+
 /* bufferTimeMax指定直播流播放时的最大缓冲时长，单位为秒
  *
  * 当buffer为负数时，关闭直播追赶
@@ -237,4 +237,13 @@ typedef NS_ENUM(NSUInteger, CNLiveAnchorStatus) {
     CNLiveAnchorStatusEnd,
 };
+/**
+ *  播放时网络状态
+ */
+typedef NS_ENUM(NSInteger, CNLiveNetworkStatus) {
+    CNLiveNotReachable = 0,
+    CNLiveReachableViaWiFi = 2,
+    CNLiveReachableViaWWAN = 1
+};
+
 #endif /* CNLiveTypeDef_h */
@@ -18,6 +18,8 @@
 @interface CNLiveWebcastManager : NSObject
++ (CNLiveWebcastManager *)manager;
+
 /**
  *  应用ID（只读）
  */
@@ -28,10 +30,13 @@
  */
 @property (nonatomic, readonly) NSString *appKey;
-+ (CNLiveWebcastManager *)manager;
+/**
+ *  是否是测试环境
+ */
+@property (nonatomic, readonly) BOOL isTestEnvironment;
 /**
- @abstract      初始化直播云SDK
+ @abstract      初始化直播云SDK(该方法默认正式环境)
  @param         appId              在open.cnlive.com网站申请得到的appId
  @param         appKey             在open.cnlive.com网站申请得到的appKey
  @warning       必传参数
@@ -39,6 +44,15 @@
 - (void)initWithAppId:(NSString *)appId appKey:(NSString *)appKey;
 /**
+ @abstract      初始化直播云SDK
+ @param         appId              在open.cnlive.com网站申请得到的appId
+ @param         appKey             在open.cnlive.com网站申请得到的appKey
+ @param         isTestEnvironment  YES:测试环境  NO:正式环境
+ @warning       必传参数
+ */
+- (void)initWithAppId:(NSString *)appId appKey:(NSString *)appKey isTestEnvironment:(BOOL)isTestEnvironment;
+
+/**
  @abstract      获取版本号
  */
 + (NSString *)getVersion;
@@ -24,4 +24,6 @@
 - (void)sendMsgWithMessage:(NSString *)message;
+- (void)quitChatroom;
+
 @end
@@ -88,7 +88,7 @@
 }
 //退出聊天室
-- (void)quit
+- (void)quitChatroom
 {
     if (!_roomId) return;   //如果聊天室不存在，不作处理
@@ -31,8 +31,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-
-    self.navigationItem.title = @"直播";
+    self.view.backgroundColor = [UIColor whiteColor];
     _titleArr = @[@"直播",@"电视台",@"点播"];
     CGFloat width = 0;
@@ -48,10 +47,9 @@
     self.navigationItem.titleView = self.titleView;
-    [self.view addSubview:self.pageView];
     [_pageView reloadPages];
     [_titleView reloadData];
-    [self.titleView scrollToElement:0 animated:NO];
+    [self.view addSubview:self.pageView];
 }
@@ -167,7 +165,6 @@
         _pageView.pagingDelegate = self;
         _pageView.delegate = self;
         _pageView.scrollsToTop = NO;
-        _pageView.bounces = NO;
     }
     return _pageView;
 }
@@ -30,9 +30,6 @@
 @property (nonatomic, strong) LVCInputView *inputView;
 @property (nonatomic, strong) LVCChatView *chatView;
-@property (nonatomic, strong) NSTimer *timer;
-@property (nonatomic, assign) NSTimeInterval countTime;
-
 @property (nonatomic, strong) CNBarrageManager *barrageManager;     //弹幕管理者
 @property (nonatomic ,strong) UIView *barrageBaseView;              //弹幕总View
 @property (nonatomic, strong) UITapGestureRecognizer *tap;
@@ -263,8 +260,7 @@
         [_player stopPlaying];
         //退出聊天室
-        [[CNLiveChatManager sharedCNLiveChatManager] quitChatRoom:_roomId success:NULL error:NULL];
-        
+        [_chatView quitChatroom];
         [self removeViews];
         self.navigationController.navigationBar.hidden = NO;
@@ -317,10 +313,16 @@
     [_player removeFromSuperview];
     [_chatView removeFromSuperview];
     [_inputView removeFromSuperview];
+    
     _player = nil;
+    _player.delegate = nil;
+    
+    _chatView.delegate = nil;
     _chatView = nil;
+    
+    _inputView.delegate = nil;
     _inputView = nil;
-    _player.delegate = nil;
+    
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
@@ -436,6 +438,11 @@
     // Dispose of any resources that can be recreated.
 }
+- (void)dealloc
+{
+    NSLog(@"LVCLivePlayerController dealloc");
+}
+
 /*
 #pragma mark - Navigation
@@ -137,8 +137,7 @@
     if ([model.activityStatus isEqualToString:@"1"]) {
-        _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:model.channelId
-                                                                     authSuccess:^{
+        _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:model.channelId anchorStatus:YES authSuccess:^{
                                                                          _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
                                                                          _player.view.frame = self.view.bounds;
@@ -274,8 +273,7 @@
                             [self addLiveBaseView];
-                            _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:_playArray[_index].channelId
-                                                                                         authSuccess:^{
+                            _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:_playArray[_index].channelId anchorStatus:YES authSuccess:^{
                                                                                              _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
                                                                                              _player.view.frame = self.view.bounds;
@@ -379,8 +377,7 @@
                         } else if ([_playArray[_index].activityStatus isEqualToString:@"1"]) {
                             [self addLiveBaseView];
-                            _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:_playArray[_index].channelId
-                                                                                         authSuccess:^{
+                            _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:_playArray[_index].channelId anchorStatus:YES authSuccess:^{
                                                                                              _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
                                                                                              _player.view.frame = self.view.bounds;
@@ -30,6 +30,11 @@
 @implementation LVCPlayer
+- (void)dealloc
+{
+    NSLog(@"LVCPlayer dealloc");
+}
+
 - (instancetype)initWithFrame:(CGRect)frame playerModel:(LVCChannelDetailsModel *)model
 {
     self = [super initWithFrame:frame];
@@ -62,7 +67,7 @@
     /*
      */
     NSString *channelId = [NSString stringWithFormat:@"82_%@",model.mediaId];
-    _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:channelId authSuccess:^{
+    _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:channelId anchorStatus:NO authSuccess:^{
         [self addObservers];
         _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
         _player.shouldAutoplay = YES;
@@ -512,6 +517,21 @@
     }
 }
+- (void)exitPlayer {
+    if (_player.isPlaying) {
+        [_player stop];
+    }
+    
+    [_player destroyPlayer];
+    _player = nil;
+    [self removeMovieNotificationObservers];
+    
+    if (_timer) {
+        [_timer invalidate];
+        _timer = nil;
+    }
+}
+
 #pragma mark -
 #pragma mark - getter
@@ -22,8 +22,8 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
 @property (nonatomic, strong) UICollectionView *collectionView;
 @property (nonatomic, strong) NSArray  *bannerModelArray;           //banner数据源
-@property (nonatomic, strong) NSArray  *marqueeModelArray;          //
-@property (nonatomic, strong) NSArray  *channelsModelArray;         //
+@property (nonatomic, strong) NSArray  *marqueeModelArray;
+@property (nonatomic, strong) NSArray  *channelsModelArray;
 @end
@@ -35,6 +35,7 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
     if (self) {
         self.backgroundColor = [UIColor whiteColor];
+        
         [self addSubview:self.collectionView];
         [self loadData];
@@ -188,7 +189,7 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
         [_collectionView registerClass:[LVCLiveListCollectionViewCell class] forCellWithReuseIdentifier:cellId];
         [_collectionView registerClass:[LVCFirstHeaderReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:firstHeaderId];
         [_collectionView registerClass:[LVCOtherHeaderReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:otherHeaderId];
-        
+        _collectionView.scrollsToTop = NO;
         _collectionView.dataSource = self;
         _collectionView.delegate = self;
     }