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

Conflicts: LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
Conflicts: LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
朱林
2 parents 45591957 7e4f59a6
Showing 39 changed files with 780 additions and 355 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/LiveVideoCloud/Classes/SDK/AFNetworking/AFURLResponseSerialization.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/BottomToolView/BottomToolView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatViews/chatListCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftAnimOperation.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftAnimationAction.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHCarViews.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHFighterView+animDelegagte.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHFighterView+animDelegagte.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PrivateView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/TopToolView/TopToolView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLivePlayerController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveLIstService.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveLIstService.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Model/LVCUGCLiveListModel.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Model/LVCUGCLiveListModel.m
@@ -192,6 +192,8 @@
 		D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D29E81EC1E88DC5B008C9906 /* PriChatCell.m */; };
 		D2A089E81E89FA720071412C /* LVCUGCLivePlayerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */; };
 		D2A089EB1E8A09CB0071412C /* LVCUGCLivePlayerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */; };
+		D2A089EE1E8A336A0071412C /* LiveLIstService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089ED1E8A336A0071412C /* LiveLIstService.m */; };
+		D2A089F11E8A41120071412C /* LVCUGCLiveListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */; };
 		D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A803071E80BD6F009D6F1C /* TopToolView.m */; };
 		D2B2ED7A1E88F90C00F7538A /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; };
 		D2B2ED7B1E88F90C00F7538A /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -204,6 +206,7 @@
 		D2CC7B871E891AA50034B8BF /* LVCUGCLiveListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2CC7B861E891AA50034B8BF /* LVCUGCLiveListController.m */; };
 		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 */; };
 /* End PBXBuildFile section */
  
 /* Begin PBXContainerItemProxy section */
@@ -623,6 +626,10 @@
 		D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerCell.m; sourceTree = "<group>"; };
 		D2A089E91E8A09CB0071412C /* LVCUGCLivePlayerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerModel.h; sourceTree = "<group>"; };
 		D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerModel.m; sourceTree = "<group>"; };
+		D2A089EC1E8A336A0071412C /* LiveLIstService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveLIstService.h; sourceTree = "<group>"; };
+		D2A089ED1E8A336A0071412C /* LiveLIstService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveLIstService.m; sourceTree = "<group>"; };
+		D2A089EF1E8A41120071412C /* LVCUGCLiveListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListModel.h; sourceTree = "<group>"; };
+		D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListModel.m; sourceTree = "<group>"; };
 		D2A803061E80BD6F009D6F1C /* TopToolView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopToolView.h; sourceTree = "<group>"; };
 		D2A803071E80BD6F009D6F1C /* TopToolView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopToolView.m; sourceTree = "<group>"; };
 		D2B2ED7E1E88FC5200F7538A /* LVCUGCLiveEndView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveEndView.h; sourceTree = "<group>"; };
@@ -637,6 +644,7 @@
 		D2CC7B861E891AA50034B8BF /* LVCUGCLiveListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListController.m; sourceTree = "<group>"; };
 		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>"; };
 /* End PBXFileReference section */
  
 /* Begin PBXFrameworksBuildPhase section */
@@ -754,6 +762,8 @@
 				81A4831F1E88F4BF0097A80A /* LVCProgramModel.m */,
 				81A482FF1E88B0130097A80A /* LVCChatRoomModel.h */,
 				81A483001E88B0130097A80A /* LVCChatRoomModel.m */,
+				D2A089EF1E8A41120071412C /* LVCUGCLiveListModel.h */,
+				D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */,
 				D2A089E91E8A09CB0071412C /* LVCUGCLivePlayerModel.h */,
 				D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */,
 			);
@@ -1567,6 +1577,7 @@
 		D25BF88C1E7F7F77007FB138 /* Images */ = {
 			isa = PBXGroup;
 			children = (
+				D2D7D18C1E8A581000217771 /* timg.jpeg */,
 				D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */,
 				D25BF8A41E80EC76007FB138 /* 头像.jpg */,
 			);
@@ -1650,6 +1661,8 @@
 				81A483161E88BED00097A80A /* LVCTVLiveViewController.m */,
 				81A483181E88E19C0097A80A /* LVCMoreProgramViewController.h */,
 				81A483191E88E19C0097A80A /* LVCMoreProgramViewController.m */,
+				D2A089EC1E8A336A0071412C /* LiveLIstService.h */,
+				D2A089ED1E8A336A0071412C /* LiveLIstService.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -1851,6 +1864,7 @@
 				D2575C801E76A4F300E3A8FC /* resource.bundle in Resources */,
 				D2029B941E6EAAA50027CD92 /* LaunchScreen.storyboard in Resources */,
 				D2029B911E6EAAA50027CD92 /* animation.xcassets in Resources */,
+				D2D7D18D1E8A581000217771 /* timg.jpeg in Resources */,
 				D2029CB01E6EADE10027CD92 /* MJRefresh.bundle in Resources */,
 				D2575C7C1E76A4F300E3A8FC /* NHFighterView.nib in Resources */,
 				D25BF87D1E7B8C78007FB138 /* KSYGPUResource.bundle in Resources */,
@@ -1903,6 +1917,7 @@
 				8130911E1E84C0F0005F0BFF /* LVCMessage.m in Sources */,
 				D23696841E7FC6A900E4BF71 /* chatListCell.m in Sources */,
 				D2029CAF1E6EADE10027CD92 /* MJRefreshStateHeader.m in Sources */,
+				D2A089EE1E8A336A0071412C /* LiveLIstService.m in Sources */,
 				D2029C941E6EADE10027CD92 /* UIRefreshControl+AFNetworking.m in Sources */,
 				D2029C911E6EADE10027CD92 /* UIButton+AFNetworking.m in Sources */,
 				D2029C931E6EADE10027CD92 /* UIProgressView+AFNetworking.m in Sources */,
@@ -1976,6 +1991,7 @@
 				D2029C991E6EADE10027CD92 /* MJFoundation.m in Sources */,
 				D2575C461E76857100E3A8FC /* LVCAnimationManager.m in Sources */,
 				D2029C8A1E6EADE10027CD92 /* AFURLRequestSerialization.m in Sources */,
+				D2A089F11E8A41120071412C /* LVCUGCLiveListModel.m in Sources */,
 				D2029D041E6EAE2E0027CD92 /* UILabel+ContentSize.m in Sources */,
 				D25530031E79115100DF38A5 /* AnimQueueManager.m in Sources */,
 				D2029C871E6EADE10027CD92 /* AFHTTPSessionManager.m in Sources */,
@@ -9,6 +9,9 @@
 #import "AppDelegate.h"
 #import "ZXTabBarController.h"
  
+#define KAppId @"60_irn9edco29"
+#define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
+
 @interface AppDelegate ()
  
 @end
@@ -223,7 +223,7 @@ static id AFJSONObjectByRemovingKeysWithNullValues(id JSONObject, NSJSONReadingO
         return nil;
     }
  
-    self.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/json", @"text/javascript", nil];
+    self.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/json", @"text/javascript", @"text/html", @"text/plain", nil];
  
     return self;
 }
@@ -13,6 +13,7 @@
 @property (nonatomic ,strong) UIButton * _Nullable             chatBtn;
 @property (nonatomic ,strong) UIButton * _Nullable             privateChatBtn;
 @property (nonatomic ,strong) UIButton * _Nullable             giftBtn;
+@property (nonatomic ,strong) UIImageView * _Nullable             bgView;
  
 @end
  
@@ -21,6 +22,7 @@
 - (instancetype)initWithFrame:(CGRect)frame
 {
     if (self = [super initWithFrame:frame]) {
+        [self addSubview:self.bgView];
         [self addSubview:self.chatBtn];
         [self addSubview:self.privateChatBtn];
         [self addSubview:self.giftBtn];
@@ -50,6 +52,16 @@
     }
 }
  
+- (UIImageView *)bgView
+{
+    if (!_bgView)
+    {
+        _bgView = [[UIImageView alloc] initWithFrame:self.bounds];
+        _bgView.image = [UIImage imageNamed:@"背景400x60"];
+    }
+    return _bgView;
+}
+
 #pragma mark - getter
 - (UIButton *)chatBtn
 {
@@ -71,8 +83,9 @@
     {
         UIButton *privateChatBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         privateChatBtn.frame = CGRectMake(self.width*0.5 - 50, (self.height - 45)*0.5, 45, 45);
-        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"privateChat.png"] forState:UIControlStateNormal];
-        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"privateChat.png"] forState:UIControlStateHighlighted];
+        //[UIColor colorWithRed:0.61 green:0.61 blue:0.61 alpha:1.00]
+        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"22"] forState:UIControlStateNormal];
+        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"22"] forState:UIControlStateHighlighted];
         [privateChatBtn addTarget:self action:@selector(privateChatAction) forControlEvents:UIControlEventTouchUpInside];
         _privateChatBtn = privateChatBtn;
     }
@@ -47,7 +47,7 @@
     NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:self.contentLabel.text];
     // 设置文字颜色
     [str addAttribute:NSForegroundColorAttributeName value:ZXRandomColor range:NSMakeRange(0, name.length)];
-    [str addAttribute:NSForegroundColorAttributeName value:[UIColor cyanColor] range:NSMakeRange(name.length, content.length)];
+    [str addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:NSMakeRange(name.length, content.length)];
     // 将配置好的NSMutableAttributedString传给attributedText属性
     self.contentLabel.attributedText = str;
  
@@ -34,10 +34,11 @@
  
     GiftAnimOperation *giftAnimOperation = [[GiftAnimOperation alloc]initWithGiftModel:model animContentView:animContentView];
  
-    if (model.giftStyle == GiftStyleFighter) {
-        [[NSNotificationCenter defaultCenter] addObserver:giftAnimOperation selector:@selector(fighterAnimationDidStart) name:NSNotificationAnimationDidStart object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:giftAnimOperation selector:@selector(fighterAnimationDidStop) name:NSNotificationAnimationDidStop object:nil];
-    }
+//    if (model.giftStyle == GiftStyleFighter) {
+//        NSLog(@"add notification op: %@,self %@",giftAnimOperation,self);
+//        [[NSNotificationCenter defaultCenter] addObserver:giftAnimOperation selector:@selector(fighterAnimationDidStart) name:NSNotificationAnimationDidStart object:nil];
+//        [[NSNotificationCenter defaultCenter] addObserver:giftAnimOperation selector:@selector(fighterAnimationDidStop) name:NSNotificationAnimationDidStop object:nil];
+//    }
     return giftAnimOperation;
 }
  
@@ -61,6 +62,8 @@
  开始方法(KVO控制队列任务状态)
  */
 - (void)start{
+    NSLog(@"animation start op:%@",self);
+    
     //这里动画队列任务不存在Cancelled状态所以不需要判断，直接开始执行
     [self willChangeValueForKey:@"isExecuting"];
     _executing = YES;
@@ -100,6 +103,7 @@
  
         [self.giftCarView startPorschAnimationWithCompletion:^{
  
+            NSLog(@"animation porsch stop");
             [self willChangeValueForKey:@"isFinished"];
  
             _finished = YES;
@@ -117,22 +121,35 @@
  
         [self.giftFighterView addAnimationsMoveToPoint:CGPointMake(SCREEN_WIDTH, 60) endPoint:CGPointMake( -500, 600)];
         [self.animContentView addSubview:self.giftFighterView];
-    });
-}
+        
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(12 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self willChangeValueForKey:@"isFinished"];
+            
+            _finished = YES;
+            
+            [self didChangeValueForKey:@"isFinished"];
  
-- (void)fighterAnimationDidStart
-{
-    
+        });
+    });
 }
  
-- (void)fighterAnimationDidStop
-{
-    [self willChangeValueForKey:@"isFinished"];
-    
-    _finished = YES;
-    
-    [self didChangeValueForKey:@"isFinished"];
-}
+//- (void)fighterAnimationDidStart
+//{
+//    NSLog(@"fight start op:%@",self);
+//}
+//
+//- (void)fighterAnimationDidStop
+//{
+//    NSLog(@"fight stop op:%@",self);
+//    [self willChangeValueForKey:@"isFinished"];
+//    
+//    _finished = YES;
+//    
+//    [self didChangeValueForKey:@"isFinished"];
+//    
+////    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSNotificationAnimationDidStart object:nil];
+////    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSNotificationAnimationDidStop object:nil];
+////}
  
 - (void)planeAnimation
 {
@@ -145,6 +162,7 @@
  
         [self.giftPlaneView startPlaneAnimationWithCompletion:^{
  
+            NSLog(@"animation plane stop");
             [self willChangeValueForKey:@"isFinished"];
  
             _finished = YES;
@@ -15,6 +15,7 @@
  */
 - (void)startPorschAnimationWithCompletion:(giftAnimationCompletion)Completion
 {
+    NSLog(@"animation PorschStart");
     _giftAnimationCompletion = Completion;
 }
  
@@ -23,6 +24,7 @@
  */
 - (void)startPlaneAnimationWithCompletion:(giftAnimationCompletion)Completion
 {
+    NSLog(@"animation PlaneStart");
     _giftAnimationCompletion = Completion;
 }
  
@@ -33,6 +35,7 @@
  @param flag 是否完成标记
  */
 - (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag{
+    NSLog(@"animationDidStop");
     _giftAnimationCompletion();
 }
  
@@ -101,12 +101,12 @@
     animationGroup.animations = @[position,scaleAnimation];
  
     if (self.animations.count == 0) {
-        NSLog(@"第一次动画%ld",self.animations.count);
+//        NSLog(@"第一次动画%ld",self.animations.count);
         [self.animations addObject:animationGroup];
         [self.layer addAnimation:animationGroup forKey:@"carView"];
     }else{
         [self.animations addObject:animationGroup];
-        NSLog(@"添加动画");
+//        NSLog(@"添加动画");
     }
 }
  
@@ -139,7 +139,7 @@
     [self removeFromSuperview];
  
     _giftAnimationCompletion();
-    NSLog(@"删除动画");
+//    NSLog(@"删除动画");
 //    [self.animations removeObjectAtIndex:0];
  
     if (self.animations.count > 0) {
@@ -8,6 +8,9 @@
  
 #import "NHFighterView.h"
  
+//typedef void(^fighterAnimationCompletion)();
+
 @interface NHFighterView (animDelegagte)
  
+//@property (nonatomic) fighterAnimationCompletion          completion;
 @end
@@ -9,16 +9,23 @@
 #import "NHFighterView+animDelegagte.h"
 #import "GiftAnimationAction.h"
  
+
+
 @implementation NHFighterView (animDelegagte)
  
-- (void)animationDidStart:(CAAnimation *)anim
-{
-    [[NSNotificationCenter defaultCenter] postNotificationName:NSNotificationAnimationDidStart object:nil];
-}
+//@dynamic completion;
  
-- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
-{
-    [[NSNotificationCenter defaultCenter] postNotificationName:NSNotificationAnimationDidStop object:nil];
-}
+//- (void)animationDidStart:(CAAnimation *)anim
+//{
+////    [[NSNotificationCenter defaultCenter] postNotificationName:NSNotificationAnimationDidStart object:nil];
+//    NSLog(@"fighter start:%@",self);
+//}
+//
+//- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
+//{
+//    NSLog(@"fighter stop:%@",self);
+//    self.completion();
+////    [[NSNotificationCenter defaultCenter] postNotificationName:NSNotificationAnimationDidStop object:nil];
+//}
  
 @end
@@ -83,8 +83,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         [[LVCAnimationManager shareManager] bubblingWithCenterPoint:CGPointMake(SCREEN_WIDTH - 50, SCREEN_HEIGHT - 50) toView:self.animationBaseView speed:1];
  
         [self.animationBaseView addSubview:self.chatTableView];
-        self.chatTableView.backgroundColor = [UIColor whiteColor];
-        self.chatTableView.alpha = 0.7;
  
         [self.animationBaseView addSubview:self.topToolsView];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
@@ -154,8 +152,8 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         [bgView addSubview:sendBtn];
  
         _commentText = [[UITextField alloc] initWithFrame:CGRectMake(_barrageSwitch.right + 20, 5, _commentsView.width - _barrageSwitch.right - 20 - 100, _commentsView.height - 10)];
-        _commentText.layer.borderColor   = [UIColor blueColor].CGColor;
-        _commentText.layer.borderWidth   = 1.0;
+//        _commentText.layer.borderColor   = [UIColor blueColor].CGColor;
+//        _commentText.layer.borderWidth   = 1.0;
         _commentText.layer.cornerRadius  = 2.0;
         _commentText.layer.masksToBounds = YES;
         _commentText.inputAccessoryView  = _commentsView;
@@ -644,9 +642,9 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     if (!_barrageSwitch)
     {
         _barrageSwitch = [[UISwitch alloc] initWithFrame:CGRectMake(10, 10, 40, 30)];
-        _barrageSwitch.tintColor = [UIColor orangeColor];
-        _barrageSwitch.onTintColor = [UIColor orangeColor];
-        _barrageSwitch.thumbTintColor = [UIColor lightGrayColor];
+        _barrageSwitch.tintColor = [UIColor greenColor];
+        _barrageSwitch.onTintColor = [UIColor greenColor];
+        _barrageSwitch.thumbTintColor = [UIColor whiteColor];
         _barrageSwitch.centerY = _commentsView.height * 0.5;
         [_barrageSwitch addTarget:self action:@selector(barrageSiwthChange:) forControlEvents:UIControlEventValueChanged];
     }
@@ -659,8 +657,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     {
         _bottomToolView = [[BottomToolView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - BottomToolHeight, SCREEN_WIDTH, BottomToolHeight)];
         _bottomToolView.delegate = self;
-        _bottomToolView.backgroundColor = [UIColor lightGrayColor];
-        _bottomToolView.alpha = 0.7;
     }
     return _bottomToolView;
 }
@@ -685,6 +681,14 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         tableView.showsHorizontalScrollIndicator = NO;
         tableView.bounces = NO;
         tableView.backgroundColor = [UIColor clearColor];
+        
+//        UIView *view = [[UIView alloc] initWithFrame:tableView.bounds];
+//        [tableView addSubview:view];
+//        
+//        UIImageView *bgView = [[UIImageView alloc] initWithFrame:view.bounds];
+//        bgView.image = [UIImage imageNamed:@"背景400x300"];
+//        [view addSubview:bgView];
+//        tableView.backgroundView = view;
         _chatTableView = tableView;
     }
     return _chatTableView;
@@ -184,6 +184,7 @@ static NSString *message_content = @&quot;message_content&quot;;
     {
         _nameLbl = [[UILabel alloc] initWithFrame:CGRectMake(100, 5, self.width - 100, 30)];
         _nameLbl.centerX = self.width * 0.5;
+        _nameLbl.centerY = self.closeBtn.centerY;
         _nameLbl.text = @"哈哈哈主播的名字";
         [_nameLbl setTextColor:[UIColor cyanColor]];
         _nameLbl.numberOfLines = 1;
@@ -220,7 +221,7 @@ static NSString *message_content = @&quot;message_content&quot;;
         _tableView.showsHorizontalScrollIndicator = NO;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _tableView.bounces = NO;
-        _tableView.backgroundColor = [UIColor clearColor];
+        _tableView.backgroundColor = [UIColor colorWithRed:0.96 green:0.98 blue:0.98 alpha:1.00];
     }
     return _tableView;
 }
@@ -75,7 +75,7 @@
     if (!_bgView)
     {
         _bgView = [[UIImageView alloc] initWithFrame:self.bounds];
-        _bgView.backgroundColor = ZXRandomColor;
+        _bgView.image = [UIImage imageNamed:@"背景200x50"];
         _bgView.layer.masksToBounds = YES;
         _bgView.layer.cornerRadius = _bgView.height * 0.5;
  
@@ -56,7 +56,7 @@
     [self.view addSubview:self.openFilterButton];
     [self.view addSubview:self.openFlashButton];
     [self.view addSubview:self.filterView];
-    
+
     // 初始化推流
     NSString *activityId = [NSString stringWithFormat:@"%d%d%d%d%d",arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9];
  
@@ -133,8 +133,8 @@
         [self.view insertSubview:self.liveBaseView atIndex:1];
  
     } failure:^(NSDictionary *errorDic) {
-        NSString *str=[[NSMutableString alloc] initWithData:errorDic[@"errorMessage"] encoding:NSUTF8StringEncoding];
-        NSLog(@"%@",str);
+        //NSString *str=[[NSMutableString alloc] initWithData:errorDic[@"errorMessage"] encoding:NSUTF8StringEncoding];
+        NSLog(@"%@",errorDic);
         [self toast:errorDic[@"errorMessage"]];
     }];
 }
@@ -7,9 +7,16 @@
 //
  
 #import "LVCUGCLiveListController.h"
-#import "CommonCrypto/CommonDigest.h"
+#import "LiveLIstService.h"
+#import "LVCUGCLiveListModel.h"
+#import "LVCUGCLivePlayerCell.h"
+#import "LVCUGCLivePlayerModel.h"
  
-@interface LVCUGCLiveListController ()
+static NSString *cellId = @"cellId";
+
+@interface LVCUGCLiveListController ()<UICollectionViewDelegate, UICollectionViewDataSource>
+
+@property (nonatomic, strong) UICollectionView *collectionView;
  
 @end
  
@@ -24,69 +31,75 @@
  
 - (void)loadData {
  
-    NSInteger time = [[NSDate date] timeIntervalSince1970];
-    NSString *timeString = [NSString stringWithFormat:@"%ld", (long)time];
-    NSMutableDictionary *parameter=[@{@"platform_id": [NSBundle mainBundle].bundleIdentifier,
-                              @"timestamp": timeString,
-                              @"appId": AppId} mutableCopy];
-    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [self sortParameters:parameter], AppKey];
-    NSString *signString = [[self sha1:string] uppercaseString];
-    [parameter setObject:signString forKey:@"sign"];
-    
-    [[AFHTTPSessionManager manager] GET:@"http://api.cnlive.com/open/api2/live_epg/sp/activityList4App" parameters:parameter progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+    [LiveLIstService getLiveListWithHandler:^(id data, NSError *error) {
  
-        NSLog(@"%@",responseObject);
+        if (error) {
+            NSLog(@"error:%@",error);
+            return ;
+        }
+        NSLog(@"data%@",data);
  
-    } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
+        LVCUGCLiveListModel *model = [LVCUGCLiveListModel modelWithDic:data];
  
-        NSLog(@"%@",error);
+        NSLog(@"%@",model.activityList);
     }];
-        
+
 }
  
-//sha1加密
-- (NSString*)sha1:(NSString *)string
-{
-    NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
+#pragma mark - UICollectionViewDelegate, UICollectionViewDataSource  !!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
  
-    uint8_t digest[CC_SHA1_DIGEST_LENGTH];
+    return 1;
+}
+
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
  
-    CC_SHA1(data.bytes, data.length, digest);
+    return 6;
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
  
-    NSMutableString* output = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
+    LVCUGCLivePlayerCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:cellId forIndexPath:indexPath];
  
-    for(int i = 0; i < CC_SHA1_DIGEST_LENGTH; i++)
-        [output appendFormat:@"%02x", digest[i]];
+    NSLog(@"cell ------> %@",cell);
  
-    while ([[output substringToIndex:1] isEqualToString:@"0"]) {
-        output = [[NSMutableString alloc] initWithString:[output substringFromIndex:1]];
-    }
+    LVCUGCLivePlayerModel *model = [[LVCUGCLivePlayerModel alloc] init];
+    cell.model = model;
  
-    return output;
+    return cell;
 }
-//参数排序
-- (NSString *)sortParameters:(NSDictionary*)parameters
-{
-    //对所有传入参数按照字段名的 ASCII 码从小到大排序
-    NSArray *keyArr=[parameters allKeys];
-    NSArray *arr = [keyArr sortedArrayUsingSelector:@selector(compare:)];
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
  
-    NSMutableString *string1 = [[NSMutableString alloc]init];
-    for (int i=0; i<arr.count; i++) {
-        
-        NSString *parametersString = parameters[[arr objectAtIndex:i]];
-        if (parametersString.length > 0) {
-            [string1 appendString:[NSString stringWithFormat:@"%@=%@&",[arr objectAtIndex:i],parameters[[arr objectAtIndex:i]]]];
-        }
-    }
  
-    if (string1.length > 0) {
-        [string1 deleteCharactersInRange:NSMakeRange(string1.length-1, 1)];
-    }
+}
+
+- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView {
  
-    return string1;
+    NSLog(@"停止");
 }
  
+#pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (UICollectionView *)collectionView {
+    
+    if (!_collectionView) {
+        UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
+        layout.minimumLineSpacing = 0;
+        layout.minimumInteritemSpacing = 0;
+        layout.itemSize = self.view.bounds.size;
+        _collectionView = [[UICollectionView alloc] initWithFrame:self.view.bounds collectionViewLayout:layout];
+        _collectionView.pagingEnabled = YES;
+        _collectionView.contentOffset = CGPointMake(0, 30);
+        _collectionView.showsHorizontalScrollIndicator = NO;
+        _collectionView.scrollEnabled = NO;
+        _collectionView.dataSource = self;
+        _collectionView.delegate = self;
+        [_collectionView registerClass:[LVCUGCLivePlayerCell class] forCellWithReuseIdentifier:cellId];
+    }
+    return _collectionView;
+}
+
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -10,13 +10,25 @@
 #import <CNLivePlayerSDK/CNLiveWebcastManager.h>
 #import "LVCUGCPlayerLoadingView.h"
 #import "LVCUGCBackgroundView.h"
-#import "LVCUGCLivePlayerCell.h"
  
-static NSString *cellId = @"cellId";
  
-@interface LVCUGCLivePlayerController ()<UICollectionViewDelegate, UICollectionViewDataSource>
+@interface LVCUGCLivePlayerController () {
+    
+    float _oneY;
+    float _SecondY;
+    float _ThirdY;
+    UIView *_tempView;
+    UIPanGestureRecognizer *_pan;
+    LVCUGCPlayerLoadingView *_firstLoadView;
+    LVCUGCPlayerLoadingView *_secondLoadView;
+    LVCUGCPlayerLoadingView *_thirdLoadView;
+}
+
+@property (nonatomic, strong) UIView *viewOne;
+@property (nonatomic, strong) UIView *viewSecond;
+@property (nonatomic, strong) UIView *viewThird;
  
-@property (nonatomic, strong) UICollectionView *collectionView;
+@property (nonatomic, strong) CNLiveMoviePlayerController *player; // 播放器
  
 @property (nonatomic, strong) LVCUGCBackgroundView *bgView; // 背景视图
  
@@ -43,58 +55,331 @@ static NSString *cellId = @&quot;cellId&quot;;
  
     self.view.backgroundColor = [UIColor whiteColor];
  
-    [self.view addSubview:self.bgView];
-    [self.view addSubview:self.collectionView];
+    [self.view addSubview:self.viewOne];
+    [self.view addSubview:self.viewSecond];
+    [self.view addSubview:self.viewThird];
  
-}
-
-#pragma mark - UICollectionViewDelegate, UICollectionViewDataSource  !!!!!!!!!!!!!!!!!!!!!!!!!!!
-- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
+    _pan = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(panGesture:)];
+    
+    [self installMovieNotificationObservers];
  
-    return 1;
+    _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:@"iOStest"
+                                                                 authSuccess:^{
+                                                                     
+                                                                     _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
+                                                                     _player.view.frame = self.view.bounds;
+                                                                     _player.shouldAutoplay = YES;
+                                                                     [_player prepareToPlay];
+                                                                     [_viewSecond addSubview:_player.view];
+                                                                     [_viewSecond sendSubviewToBack:_player.view];
+                                                                     [_player.view addGestureRecognizer:_pan];
+                                                                     
+                                                                 } authFailed:^(NSDictionary *errorInfo) {
+                                                                     NSLog(@"初始化直播播放器失败：%@", errorInfo);
+                                                                     
+                                                                 } getAnchorStatusResult:^(BOOL result) {
+                                                                     
+                                                                     NSLog(@"-------------获取主播状态%d", result ? YES : NO);
+                                                                     
+                                                                 }];
+    
+    //[self.view addSubview:self.bgView];
 }
  
-- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+#pragma mark - UIPanGestureRecognizer !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (void)panGesture:(UIPanGestureRecognizer *)recognizer {
+    
+    CGPoint t = [recognizer translationInView:_viewSecond];
+    NSLog(@"移动距离>>>>>>>>>>>>>>%f",t.y);
+    
+    _viewOne.frame = CGRectMake(0, _oneY + t.y, SCREEN_WIDTH, SCREEN_HEIGHT);
+    _viewSecond.frame = CGRectMake(0, _SecondY + t.y, SCREEN_WIDTH, SCREEN_HEIGHT);
+    _viewThird.frame = CGRectMake(0, _ThirdY + t.y, SCREEN_WIDTH, SCREEN_HEIGHT);
  
-    return 4;
+    switch (recognizer.state) {
+        case UIGestureRecognizerStateBegan:
+        case UIGestureRecognizerStateChanged:
+        {
+            
+        }
+            break;
+        case UIGestureRecognizerStateEnded:
+        case UIGestureRecognizerStateFailed:
+        case UIGestureRecognizerStateCancelled:
+        {
+            if (t.y > 100) {
+                [UIView animateWithDuration:0.2 animations:^{
+                    
+                    _viewOne.frame = CGRectMake(0, _oneY + SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
+                    _viewSecond.frame = CGRectMake(0, _SecondY + SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
+                    _viewThird.frame = CGRectMake(0, _ThirdY + SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
+                    
+                } completion:^(BOOL finished) {
+                    
+                    [_player.view removeFromSuperview];
+                    [_player stop];
+                    _player = nil;
+                    // 停止后的视图,拿到自己的加载图来显示
+                    [_viewSecond addSubview:_secondLoadView];
+                    
+                    _viewThird.frame = CGRectMake(0, -SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
+                    _tempView = _viewOne;
+                    _viewOne = _viewThird;
+                    _viewThird = _viewSecond;
+                    _viewSecond = _tempView;
+                    //往下滑  播放上一个
+                    _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:@"iOStest"
+                                                                                 authSuccess:^{
+                                                                                     
+                                                                                     _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
+                                                                                     _player.view.frame = self.view.bounds;
+                                                                                     _player.shouldAutoplay = YES;
+                                                                                     [_player prepareToPlay];
+                                                                                     [_viewSecond addSubview:_player.view];
+                                                                                     [_viewSecond sendSubviewToBack:_player.view];
+                                                                                     [_player.view addGestureRecognizer:_pan];
+                                                                                     
+                                                                                 } authFailed:^(NSDictionary *errorInfo) {
+                                                                                     NSLog(@"初始化直播播放器失败：%@", errorInfo);
+                                                                                     
+                                                                                 } getAnchorStatusResult:^(BOOL result) {
+                                                                                     
+                                                                                     NSLog(@"-------------获取主播状态%d", result ? YES : NO);
+                                                                                     
+                                                                                 }];
+                    
+                    _oneY = _viewOne.frame.origin.y;
+                    _SecondY = _viewSecond.frame.origin.y;
+                    _ThirdY = _viewThird.frame.origin.y;
+                }];
+            } else if (t.y < -100) {
+                
+                [UIView animateWithDuration:0.2 animations:^{
+                    
+                    _viewOne.frame = CGRectMake(0, _oneY - SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
+                    _viewSecond.frame = CGRectMake(0, _SecondY - SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
+                    _viewThird.frame = CGRectMake(0, _ThirdY - SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
+                    
+                } completion:^(BOOL finished) {
+                    
+                    [_player.view removeFromSuperview];
+                    [_player stop];
+                    _player = nil;
+                    // 停止后的视图,拿到自己的加载图来显示
+                    [_viewSecond addSubview:_secondLoadView];
+                    
+                    [_viewSecond removeGestureRecognizer:_pan];
+                    _viewOne.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
+                    _tempView = _viewOne;
+                    _viewOne = _viewSecond;
+                    _viewSecond = _viewThird;
+                    _viewThird = _tempView;
+                    [_viewSecond addGestureRecognizer:_pan];
+                    //往上滑  播放下一个
+                    _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:@"iOStest"
+                                                                                 authSuccess:^{
+                                                                                     
+                                                                                     _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
+                                                                                     _player.view.frame = self.view.bounds;
+                                                                                     _player.shouldAutoplay = YES;
+                                                                                     [_player prepareToPlay];
+                                                                                     [_viewSecond addSubview:_player.view];
+                                                                                     [_viewSecond sendSubviewToBack:_player.view];
+                                                                                     [_player.view addGestureRecognizer:_pan];
+                                                                                     
+                                                                                 } authFailed:^(NSDictionary *errorInfo) {
+                                                                                     NSLog(@"初始化直播播放器失败：%@", errorInfo);
+                                                                                     
+                                                                                 } getAnchorStatusResult:^(BOOL result) {
+                                                                                     
+                                                                                     NSLog(@"-------------获取主播状态%d", result ? YES : NO);
+                                                                                     
+                                                                                 }];
+                    
+                    _oneY = _viewOne.frame.origin.y;
+                    _SecondY = _viewSecond.frame.origin.y;
+                    _ThirdY = _viewThird.frame.origin.y;
+                }];
+                
+            } else {
+                
+                [UIView animateWithDuration:0.2 animations:^{
+                    
+                    _viewOne.frame = CGRectMake(0, _oneY, SCREEN_WIDTH, SCREEN_HEIGHT);
+                    _viewSecond.frame = CGRectMake(0, _SecondY, SCREEN_WIDTH, SCREEN_HEIGHT);
+                    _viewThird.frame = CGRectMake(0, _ThirdY, SCREEN_WIDTH, SCREEN_HEIGHT);
+                    
+                } completion:^(BOOL finished) {
+                    _oneY = _viewOne.frame.origin.y;
+                    _SecondY = _viewSecond.frame.origin.y;
+                    _ThirdY = _viewThird.frame.origin.y;
+                }];
+            }
+        }
+            break;
+        default:
+            break;
+    }
 }
  
-- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+#pragma mark - 添加通知监听 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+-(void)installMovieNotificationObservers   //添加视频播放通知
+{
+    //视频加载状态改变
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(loadStateDidChange:)
+                                                 name:MPMoviePlayerLoadStateDidChangeNotification
+                                               object:nil];
+    
+    //视频播放错误及结束原因
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(moviePlayBackDidFinish:)
+                                                 name:MPMoviePlayerPlaybackDidFinishNotification
+                                               object:nil];
  
-    LVCUGCLivePlayerCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:cellId forIndexPath:indexPath];
+    //视频缓冲至可播放状态
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(mediaIsPreparedToPlayDidChange:)
+                                                 name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
+                                               object:nil];
+    
+    //视频播放状态改变
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(moviePlayBackStateDidChange:)
+                                                 name:MPMoviePlayerPlaybackStateDidChangeNotification
+                                               object:nil];
+    
+    
+    //获取主播状态通知（点播和普通播放不需要注册该通知）
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(anchorStatusChanged:)
+                                                 name:CNLiveAnchorStatusChangedNotification
+                                               object:nil];
  
-    return cell;
 }
  
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
-    
-    NSLog(@"一直");
+#pragma mark - 通知 Action  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (void)loadStateDidChange:(NSNotification *)notification  //视频加载状态改变
+{
+    if (_player) {
+        MPMovieLoadState loadState = _player.loadState;
+        if ((loadState & MPMovieLoadStatePlaythroughOK) != 0) {
+            
+            NSLog(@"loadStateDidChange: MPMovieLoadStatePlaythroughOK: %d\n", (int)loadState);
+            
+        } else if ((loadState & MPMovieLoadStateStalled) != 0) {
+            NSLog(@"loadStateDidChange: MPMovieLoadStateStalled: %d\n", (int)loadState);
+            
+        } else {
+            NSLog(@"loadStateDidChange: ???: %d\n", (int)loadState);
+        }
+    }
 }
  
-- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView {
-    
-    NSLog(@"停止");
+
+- (void)moviePlayBackDidFinish:(NSNotification *)notification   //视频播放错误及结束原因
+{
+    if (_player) {
+        int reason = [[[notification userInfo] valueForKey:MPMoviePlayerPlaybackDidFinishReasonUserInfoKey] intValue];
+        if (MPMovieFinishReasonPlaybackError == reason) {
+            
+            
+        } else {
+            
+        }
+        
+        switch (reason)
+        {
+            case MPMovieFinishReasonPlaybackEnded:
+                NSLog(@"playbackStateDidChange: MPMovieFinishReasonPlaybackEnded: %d\n", reason);
+                break;
+                
+            case MPMovieFinishReasonUserExited:
+                NSLog(@"playbackStateDidChange: MPMovieFinishReasonUserExited: %d\n", reason);
+                break;
+                
+            case MPMovieFinishReasonPlaybackError:
+                NSLog(@"playbackStateDidChange: MPMovieFinishReasonPlaybackError: %d\n", reason);
+                break;
+                
+            default:
+                NSLog(@"playbackPlayBackDidFinish: ???: %d\n", reason);
+                break;
+        }
+    }
 }
  
  
-#pragma mark - getMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-- (UICollectionView *)collectionView {
-    
-    if (!_collectionView) {
-        UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        layout.minimumLineSpacing = 0;
-        layout.minimumInteritemSpacing = 0;
-        layout.itemSize = self.view.bounds.size;
-        _collectionView = [[UICollectionView alloc] initWithFrame:self.view.bounds collectionViewLayout:layout];
-        _collectionView.pagingEnabled = YES;
-        _collectionView.showsHorizontalScrollIndicator = NO;
-        _collectionView.dataSource = self;
-        _collectionView.delegate = self;
-        [_collectionView registerClass:[LVCUGCLivePlayerCell class] forCellWithReuseIdentifier:cellId];
+- (void)mediaIsPreparedToPlayDidChange:(NSNotification *)notification   //视频缓冲至可播放状态
+{
+    if (_player) {
+        NSLog(@"isPreparedToPlay");
+        
+        if (_viewSecond.subviews.count>0) {
+            for (UIView *subViews in _viewSecond.subviews) {
+                if ([subViews isKindOfClass:[LVCUGCPlayerLoadingView class]]) {
+                    [subViews removeFromSuperview];
+                }
+            }  
+        }
+    }
+}
+
+
+- (void)moviePlayBackStateDidChange:(NSNotification *)notification   //视频播放状态改变
+{
+    if (_player) {
+        
+        switch (_player.playbackState) {
+            case MPMoviePlaybackStateStopped: {
+                
+                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateStopped");
+                break;
+            }
+            case MPMoviePlaybackStatePlaying: {
+                
+                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStatePlaying");
+                break;
+            }
+            case MPMoviePlaybackStatePaused:
+                
+                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStatePaused");
+                break;
+            case MPMoviePlaybackStateInterrupted:
+                
+                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateInterrupted");
+                break;
+            case MPMoviePlaybackStateSeekingForward:
+                
+                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateSeekingForward");
+                break;
+            case MPMoviePlaybackStateSeekingBackward:
+                
+                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateSeekingBackward");
+                break;
+            default:
+                
+                NSLog(@"moviePlayBackStateDidChange : %ld", (long)_player.playbackState);
+                break;
+        }
+    }
+}
+
+
+- (void)anchorStatusChanged:(NSNotification *)notification   //  获取主播状态通知
+{
+    if (_player.anchorStatus == 2) {  // 已结束
+        
     }
-    return _collectionView;
+    //    _bgView.anchorStatus = _player.anchorStatus;
 }
  
+
+- (void)anchorStatusConnectFailed    //重新连接获取主播状态
+{
+    
+}
+
+#pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (LVCUGCBackgroundView *)bgView {
  
     if (!_bgView) {
@@ -104,6 +389,60 @@ static NSString *cellId = @&quot;cellId&quot;;
     return _bgView;
 }
  
+- (UIView *)viewOne {
+    if (!_viewOne) {
+        _viewOne = [[UIView alloc] initWithFrame:CGRectMake(0, -SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT)];
+        _viewOne.backgroundColor = [UIColor orangeColor];
+        _firstLoadView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds];
+        [_viewOne addSubview:_firstLoadView];
+        _oneY = -SCREEN_HEIGHT;
+    }
+    return _viewOne;
+}
+
+- (UIView *)viewSecond {
+    if (!_viewSecond) {
+        _viewSecond = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)];
+        _viewSecond.backgroundColor = [UIColor redColor];
+        _secondLoadView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds];
+        [_viewSecond addSubview:_secondLoadView];
+        _SecondY = 0;
+    }
+    return _viewSecond;
+}
+
+- (UIView *)viewThird {
+    if (!_viewThird) {
+        _viewThird = [[UIView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT)];
+        _viewThird.backgroundColor = [UIColor blueColor];
+        _thirdLoadView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.view.bounds];
+        [_viewThird addSubview:_thirdLoadView];
+        _ThirdY = SCREEN_HEIGHT;
+    }
+    return _viewThird;
+}
+
+#pragma mark - 移除通知   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (void)removeMovieNotificationObservers
+{
+    [[NSNotificationCenter defaultCenter]removeObserver:self
+                                                   name:MPMoviePlayerLoadStateDidChangeNotification
+                                                 object:nil];
+    [[NSNotificationCenter defaultCenter]removeObserver:self
+                                                   name:MPMoviePlayerPlaybackDidFinishNotification
+                                                 object:nil];
+    [[NSNotificationCenter defaultCenter]removeObserver:self
+                                                   name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
+                                                 object:nil];
+    [[NSNotificationCenter defaultCenter]removeObserver:self
+                                                   name:MPMoviePlayerPlaybackStateDidChangeNotification
+                                                 object:nil];
+    
+    [[NSNotificationCenter defaultCenter]removeObserver:self
+                                                   name:CNLiveAnchorStatusChangedNotification
+                                                 object:nil];
+}
+
 #pragma mark - 内存警告 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
+//
+//  LiveLIstService.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "HttpService.h"
+
+@interface LiveLIstService : HttpService
++ (NSURLSessionDataTask *)getLiveListWithHandler:(completionHandler)handler;
+
+@end
+//
+//  LiveLIstService.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LiveLIstService.h"
+#import "CommonCrypto/CommonDigest.h"
+
+@implementation LiveLIstService
+
++ (NSURLSessionDataTask *)getLiveListWithHandler:(completionHandler)handler
+{
+    NSInteger time = [[NSDate date] timeIntervalSince1970];
+    NSString *timeString = [NSString stringWithFormat:@"%ld", (long)time];
+    NSMutableDictionary *parameter=[@{@"platform_id": [NSBundle mainBundle].bundleIdentifier,
+                                      @"timestamp": timeString,
+                                      @"appId": @"60_irn9edco29"} mutableCopy];
+    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [self sortParameters:parameter], @"69fe70bda67e059286ad509d9f5377f815955645b52f94"];
+    NSString *signString = [[self sha1:string] uppercaseString];
+    [parameter setObject:signString forKey:@"sign"];
+    
+    NSMutableDictionary *params = parameter.mutableCopy;
+    completionHandler compleionHandler = ^(id data,NSError *error) {
+        handler(data,error);
+    };
+    return [[HttpService service] sendRequestWithHttpMethod:E_HTTP_REQUEST_METHOD_GET URLPath:[ZXServerUrl getLiveListURL] parameters:params completionHandler:compleionHandler];
+}
+
+//sha1加密
++ (NSString*)sha1:(NSString *)string
+{
+    NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
+    
+    uint8_t digest[CC_SHA1_DIGEST_LENGTH];
+    
+    CC_SHA1(data.bytes, data.length, digest);
+    
+    NSMutableString* output = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
+    
+    for(int i = 0; i < CC_SHA1_DIGEST_LENGTH; i++)
+        [output appendFormat:@"%02x", digest[i]];
+    
+    while ([[output substringToIndex:1] isEqualToString:@"0"]) {
+        output = [[NSMutableString alloc] initWithString:[output substringFromIndex:1]];
+    }
+    
+    return output;
+}
+//参数排序
++ (NSString *)sortParameters:(NSDictionary*)parameters
+{
+    //对所有传入参数按照字段名的 ASCII 码从小到大排序
+    NSArray *keyArr=[parameters allKeys];
+    NSArray *arr = [keyArr sortedArrayUsingSelector:@selector(compare:)];
+    
+    NSMutableString *string1 = [[NSMutableString alloc]init];
+    for (int i=0; i<arr.count; i++) {
+        
+        NSString *parametersString = parameters[[arr objectAtIndex:i]];
+        if (parametersString.length > 0) {
+            [string1 appendString:[NSString stringWithFormat:@"%@=%@&",[arr objectAtIndex:i],parameters[[arr objectAtIndex:i]]]];
+        }
+    }
+    
+    if (string1.length > 0) {
+        [string1 deleteCharactersInRange:NSMakeRange(string1.length-1, 1)];
+    }
+    
+    return string1;
+}
+
+
+@end
+//
+//  LVCUGCLiveListModel.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseModel.h"
+
+@class LVCUGCLivePlayerModel;
+@interface LVCUGCLiveListModel : BaseModel
+
+@property (nonatomic ,copy) NSString * _Nullable            totalCount;
+@property (nonatomic ,copy) NSString * _Nullable            nextCursor;
+@property (nonatomic ,copy) NSArray <LVCUGCLivePlayerModel *> * _Nullable            activityList;
+@property (nonatomic ,copy) NSString * _Nullable            preCursor;
+
+@end
+//
+//  LVCUGCLiveListModel.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCUGCLiveListModel.h"
+
+@implementation LVCUGCLiveListModel
+
+- (void)loadModel
+{
+    [super loadModel];
+    
+    [LVCUGCLiveListModel mj_setupObjectClassInArray:^NSDictionary *{
+        return @{@"activityList":@"LVCUGCLivePlayerModel"};
+        //        return @{@"list":[SearchRecomListModel class]};二选一
+    }];
+}
+
+@end
@@ -7,7 +7,21 @@
 //
  
 #import <Foundation/Foundation.h>
+#import "BaseModel.h"
  
-@interface LVCUGCLivePlayerModel : NSObject
+@interface LVCUGCLivePlayerModel : BaseModel
+
+@property (nonatomic ,copy) NSString * _Nullable            startTime;
+@property (nonatomic ,copy) NSString * _Nullable            isHorizontalScreen;
+@property (nonatomic ,copy) NSString * _Nullable            activityId;
+@property (nonatomic ,copy) NSString * _Nullable            createTime;
+@property (nonatomic ,copy) NSString * _Nullable            coverImgUrl;
+@property (nonatomic ,copy) NSString * _Nullable            channelId;
+@property (nonatomic ,copy) NSString * _Nullable            activityStatus;
+@property (nonatomic ,copy) NSString * _Nullable            rates;
+@property (nonatomic ,copy) NSString * _Nullable            activityCategory;
+@property (nonatomic ,copy) NSString * _Nullable            endTime;
+@property (nonatomic ,copy) NSString * _Nullable            extensions;
+@property (nonatomic ,copy) NSString * _Nullable            activityName;
  
 @end
@@ -10,4 +10,10 @@
  
 @implementation LVCUGCLivePlayerModel
  
+- (void)loadModel
+{
+    [super loadModel];
+
+}
+
 @end
@@ -8,11 +8,10 @@
  
 #import <UIKit/UIKit.h>
 #import "LVCUGCPlayerLoadingView.h"
+#import "LVCUGCLivePlayerModel.h"
  
 @interface LVCUGCLivePlayerCell : UICollectionViewCell
  
-@property (nonatomic, strong) LVCUGCPlayerLoadingView *loadingView;
-
-@property (nonatomic, strong) CNLiveMoviePlayerController *player; // 播放器
+@property (nonatomic, strong) LVCUGCLivePlayerModel *model;
  
 @end
@@ -15,222 +15,17 @@
     self = [super initWithFrame:frame];
     if (self) {
         self.contentView.backgroundColor = [UIColor whiteColor];
-
-        [self installMovieNotificationObservers];
-        [self addSubview:self.loadingView];
+        
     }
     return self;
 }
  
-#pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-- (LVCUGCPlayerLoadingView *)loadingView {
-    
-    if (!_loadingView) {
-        _loadingView = [[LVCUGCPlayerLoadingView alloc] initWithFrame:self.contentView.bounds bgImageURLStr:@""];
-    }
-    return _loadingView;
-}
-
-- (CNLiveMoviePlayerController *)player {
-    
-    if (!_player) {
-        _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:@"iOStest"
-                                                                     authSuccess:^{
-                                                                         
-                                                                         _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
-                                                                         _player.view.frame = self.contentView.bounds;
-                                                                         _player.shouldAutoplay = YES;
-                                                                         [_player prepareToPlay];
-                                                                         [self.contentView addSubview:_player.view];
-                                                                         [self.contentView sendSubviewToBack:_player.view];
-                                                                         
-                                                                     } authFailed:^(NSDictionary *errorInfo) {
-                                                                         NSLog(@"初始化直播播放器失败：%@", errorInfo);
-                                                                         
-                                                                         
-                                                                     } getAnchorStatusResult:^(BOOL result) {
-                                                                         
-                                                                         NSLog(@"-------------获取主播状态%d", result ? YES : NO);
-                                                                         
-                                                                     }];
-    }
-    return _player;
-}
-
-#pragma mark - 添加通知监听 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--(void)installMovieNotificationObservers   //添加视频播放通知
-{
-    //视频加载状态改变
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(loadStateDidChange:)
-                                                 name:MPMoviePlayerLoadStateDidChangeNotification
-                                               object:nil];
-    
-    //视频播放错误及结束原因
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(moviePlayBackDidFinish:)
-                                                 name:MPMoviePlayerPlaybackDidFinishNotification
-                                               object:nil];
+#pragma mark - SetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (void)setModel:(LVCUGCLivePlayerModel *)model {
  
-    //视频缓冲至可播放状态
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(mediaIsPreparedToPlayDidChange:)
-                                                 name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
-                                               object:nil];
-    
-    //视频播放状态改变
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(moviePlayBackStateDidChange:)
-                                                 name:MPMoviePlayerPlaybackStateDidChangeNotification
-                                               object:nil];
-    
-    
-    //获取主播状态通知（点播和普通播放不需要注册该通知）
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(anchorStatusChanged:)
-                                                 name:CNLiveAnchorStatusChangedNotification
-                                               object:nil];
-    
-}
-
-#pragma mark - 通知 Action  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-//视频加载状态改变
-- (void)loadStateDidChange:(NSNotification *)notification
-{
-    if (_player) {
-        MPMovieLoadState loadState = _player.loadState;
-        if ((loadState & MPMovieLoadStatePlaythroughOK) != 0) {
-            
-            NSLog(@"loadStateDidChange: MPMovieLoadStatePlaythroughOK: %d\n", (int)loadState);
-            
-        } else if ((loadState & MPMovieLoadStateStalled) != 0) {
-            NSLog(@"loadStateDidChange: MPMovieLoadStateStalled: %d\n", (int)loadState);
-            
-        } else {
-            NSLog(@"loadStateDidChange: ???: %d\n", (int)loadState);
-        }
-    }
-}
-
-//视频播放错误及结束原因
-- (void)moviePlayBackDidFinish:(NSNotification *)notification
-{
-    if (_player) {
-        int reason = [[[notification userInfo] valueForKey:MPMoviePlayerPlaybackDidFinishReasonUserInfoKey] intValue];
-        if (MPMovieFinishReasonPlaybackError == reason) {
-            
-            
-        } else {
-            
-        }
-        
-        switch (reason)
-        {
-            case MPMovieFinishReasonPlaybackEnded:
-                NSLog(@"playbackStateDidChange: MPMovieFinishReasonPlaybackEnded: %d\n", reason);
-                break;
-                
-            case MPMovieFinishReasonUserExited:
-                NSLog(@"playbackStateDidChange: MPMovieFinishReasonUserExited: %d\n", reason);
-                break;
-                
-            case MPMovieFinishReasonPlaybackError:
-                NSLog(@"playbackStateDidChange: MPMovieFinishReasonPlaybackError: %d\n", reason);
-                break;
-                
-            default:
-                NSLog(@"playbackPlayBackDidFinish: ???: %d\n", reason);
-                break;
-        }
+    if (_model != model) {
+        _model = model;
     }
 }
  
-//视频缓冲至可播放状态
-- (void)mediaIsPreparedToPlayDidChange:(NSNotification *)notification
-{
-    if (_player) {
-        NSLog(@"isPreparedToPlay");
-        //        if (_loadingView) {
-        //            [_loadingView removeFromSuperview];
-        //        }
-    }
-}
-
-//视频播放状态改变
-- (void)moviePlayBackStateDidChange:(NSNotification *)notification
-{
-    if (_player) {
-        
-        switch (_player.playbackState) {
-            case MPMoviePlaybackStateStopped: {
-                
-                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateStopped");
-                break;
-            }
-            case MPMoviePlaybackStatePlaying: {
-                
-                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStatePlaying");
-                break;
-            }
-            case MPMoviePlaybackStatePaused:
-                
-                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStatePaused");
-                break;
-            case MPMoviePlaybackStateInterrupted:
-                
-                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateInterrupted");
-                break;
-            case MPMoviePlaybackStateSeekingForward:
-                
-                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateSeekingForward");
-                break;
-            case MPMoviePlaybackStateSeekingBackward:
-                
-                NSLog(@"moviePlayBackStateDidChange : MPMoviePlaybackStateSeekingBackward");
-                break;
-            default:
-                
-                NSLog(@"moviePlayBackStateDidChange : %ld", (long)_player.playbackState);
-                break;
-        }
-    }
-}
-
-
-
-//  获取主播状态通知
-- (void)anchorStatusChanged:(NSNotification *)notification
-{
-    if (_player.anchorStatus == 2) {  // 已结束
-        
-    }
-//    _bgView.anchorStatus = _player.anchorStatus;
-}
-
-//重新连接获取主播状态
-- (void)anchorStatusConnectFailed
-{
-    
-}
-
-#pragma mark - 移除通知   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-- (void)removeMovieNotificationObservers
-{
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMoviePlayerLoadStateDidChangeNotification
-                                                 object:nil];
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMoviePlayerPlaybackDidFinishNotification
-                                                 object:nil];
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
-                                                 object:nil];
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:MPMoviePlayerPlaybackStateDidChangeNotification
-                                                 object:nil];
-    
-    [[NSNotificationCenter defaultCenter]removeObserver:self
-                                                   name:CNLiveAnchorStatusChangedNotification
-                                                 object:nil];
-}
-
 @end
@@ -10,6 +10,6 @@
  
 @interface LVCUGCPlayerLoadingView : UIView
  
-- (instancetype)initWithFrame:(CGRect)frame bgImageURLStr:(NSString *)bgImageURLStr;
+@property (nonatomic, strong) UIImageView *bgImageView;
  
 @end
@@ -9,23 +9,17 @@
 #import "LVCUGCPlayerLoadingView.h"
 #import "UIImage+LVCVagueImage.h"
  
-@interface LVCUGCPlayerLoadingView() {
-    
-    NSString *_bgImageURLStr;
-}
-
-@property (nonatomic, strong) UIImageView *bgImageView;
+@interface LVCUGCPlayerLoadingView()
  
 @end
  
 @implementation LVCUGCPlayerLoadingView
  
-- (instancetype)initWithFrame:(CGRect)frame bgImageURLStr:(NSString *)bgImageURLStr
+- (instancetype)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
     if (self) {
         self.backgroundColor = [UIColor whiteColor];
-        _bgImageURLStr = bgImageURLStr;
         [self addSubview:self.bgImageView];
     }
     return self;
@@ -27,4 +27,6 @@
 /** 搜索页内容 */
 + (NSString *)getSearchContentURL;
  
+/** 直播列表 */
++ (NSString *)getLiveListURL;
 @end
@@ -9,7 +9,7 @@
 #import "ZXServerUrl.h"
  
 #ifdef DEBUG
-static NSString *serverBaseURL     = @"http://120.92.4.46:8080";//é€šç”¨æµ‹è¯•æœåŠ¡å™¨åŸŸå
+static NSString *serverBaseURL     = @"http://api.cnlive.com";//é€šç”¨æµ‹è¯•æœåŠ¡å™¨åŸŸå
 static NSString *serverChatBaseURL = @"http://120.92.4.46:8081";//èŠå¤©æµ‹è¯•æœåŠ¡å™¨åŸŸå
 #else
 static NSString *serverBaseURL     = @"https://perapi.svipmovie.com";//é€šç”¨æ£å¼æœåŠ¡å™¨åŸŸå
@@ -23,6 +23,8 @@ static NSString *serverChatBaseURL = @&quot;https://perapi.svipmovie1.com&quot;;//èŠå¤©æ
 /** æœç´¢é¡µå†…å®¹ */
 static NSString *g_SearchContentURL = @"/from/huntKeyWordApi/huntKeyWords.do";//@"api/findMessage";//å‘çŽ°æ¶ˆæ¯
  
+/** ç›´æ’åˆ—è¡¨ */
+static NSString *g_LiveListURL = @"/open/api2/live_epg/sp/activityList4App";
  
  
 @implementation ZXServerUrl
@@ -53,4 +55,10 @@ static NSString *g_SearchContentURL = @&quot;/from/huntKeyWordApi/huntKeyWords.do&quot;;//
     return [NSString stringWithFormat:@"%@%@", serverBaseURL, g_SearchContentURL];
 }
  
+/** ç›´æ’åˆ—è¡¨ */
++ (NSString *)getLiveListURL
+{
+    return [NSString stringWithFormat:@"%@%@", serverBaseURL, g_LiveListURL];
+}
+
 @end
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "22.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "privateChat.png",
+      "filename" : "背景400x60.png",
       "scale" : "1x"
     },
     {
@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "priToolBg.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "privateChat11.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "privateChat3.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file