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

Conflicts: LiveVideoCloud.xcodeproj/project.pbxproj

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
Conflicts: LiveVideoCloud.xcodeproj/project.pbxproj
朱林
2 parents 65f6fb0e 6de1c7ea
Showing 14 changed files with 309 additions and 64 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud.xcodeproj/xcuserdata/cnlive.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListController.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListController.m
LiveVideoCloud/Classes/Sections/homeSections/Model/LVCCommentModel.h
LiveVideoCloud/Classes/Sections/homeSections/Model/LVCCommentModel.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCVodPlayerListView.h
LiveVideoCloud/Classes/Sections/homeSections/View/LVCVodPlayerListView.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCVodPlayerTableViewCell.h
LiveVideoCloud/Classes/Sections/homeSections/View/LVCVodPlayerTableViewCell.m
LiveVideoCloud/PrefixHeader.pch
LiveVideoCloud/UtilKits/Common.h
@@ -201,6 +201,7 @@
 		D217A24B1E7B76C7003B44CB /* PresentViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A2491E7B76C7003B44CB /* PresentViewCell.m */; };
 		D217A24E1E7B77C7003B44CB /* ComboCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A24D1E7B77C7003B44CB /* ComboCell.m */; };
 		D219E86B1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D219E86A1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m */; };
+		D219E86E1F01002400650F38 /* LVCVodPlayerListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D219E86D1F01002400650F38 /* LVCVodPlayerListView.m */; };
 		D224B1971E826ED800CC61D0 /* ChatBarrageAnimAction.m in Sources */ = {isa = PBXBuildFile; fileRef = D224B1961E826ED800CC61D0 /* ChatBarrageAnimAction.m */; };
 		D22830F11E778C0F00627701 /* LiveBaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830F01E778C0F00627701 /* LiveBaseView.m */; };
 		D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FB1E77C2D900627701 /* BottomToolView.m */; };
@@ -270,6 +271,9 @@
 		D2B7B2571E8261EF00ED084E /* ChatBarrOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */; };
 		D2CBC13B1ECC157A00E00279 /* LVCVerifyLiveAuthService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2CBC13A1ECC157A00E00279 /* LVCVerifyLiveAuthService.m */; };
 		D2D7D18D1E8A581000217771 /* timg.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D2D7D18C1E8A581000217771 /* timg.jpeg */; };
+		D2EBC8571F01FF9200F198FB /* LVCCommentModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */; };
+		D2EBC85A1F02011400F198FB /* LVCVodPlayerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8591F02011400F198FB /* LVCVodPlayerTableViewCell.m */; };
+		D2EBC85D1F02031400F198FB /* LVCUGCLiveListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC85C1F02031400F198FB /* LVCUGCLiveListController.m */; };
 		D2F0486A1EE54E860011E39C /* LVCLiveActivityInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2F048691EE54E860011E39C /* LVCLiveActivityInfoService.m */; };
 /* End PBXBuildFile section */
@@ -713,6 +717,8 @@
 		D217A24D1E7B77C7003B44CB /* ComboCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ComboCell.m; path = Present/ComboCell.m; sourceTree = "<group>"; };
 		D219E8691EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCBigHorizontalCollectionViewCell.h; sourceTree = "<group>"; };
 		D219E86A1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCBigHorizontalCollectionViewCell.m; sourceTree = "<group>"; };
+		D219E86C1F01002400650F38 /* LVCVodPlayerListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerListView.h; sourceTree = "<group>"; };
+		D219E86D1F01002400650F38 /* LVCVodPlayerListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerListView.m; sourceTree = "<group>"; };
 		D224B1951E826ED800CC61D0 /* ChatBarrageAnimAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrageAnimAction.h; sourceTree = "<group>"; };
 		D224B1961E826ED800CC61D0 /* ChatBarrageAnimAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageAnimAction.m; sourceTree = "<group>"; };
 		D22830EF1E778C0F00627701 /* LiveBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveBaseView.h; sourceTree = "<group>"; };
@@ -839,6 +845,12 @@
 		D2CBC1391ECC157A00E00279 /* LVCVerifyLiveAuthService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LVCVerifyLiveAuthService.h; path = ../LVCVerifyLiveAuthService.h; sourceTree = "<group>"; };
 		D2CBC13A1ECC157A00E00279 /* LVCVerifyLiveAuthService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LVCVerifyLiveAuthService.m; path = ../LVCVerifyLiveAuthService.m; sourceTree = "<group>"; };
 		D2D7D18C1E8A581000217771 /* timg.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = timg.jpeg; sourceTree = "<group>"; };
+		D2EBC8551F01FF9200F198FB /* LVCCommentModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCCommentModel.h; sourceTree = "<group>"; };
+		D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCCommentModel.m; sourceTree = "<group>"; };
+		D2EBC8581F02011400F198FB /* LVCVodPlayerTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerTableViewCell.h; sourceTree = "<group>"; };
+		D2EBC8591F02011400F198FB /* LVCVodPlayerTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerTableViewCell.m; sourceTree = "<group>"; };
+		D2EBC85B1F02031400F198FB /* LVCUGCLiveListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListController.h; sourceTree = "<group>"; };
+		D2EBC85C1F02031400F198FB /* LVCUGCLiveListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListController.m; sourceTree = "<group>"; };
 		D2F048681EE54E860011E39C /* LVCLiveActivityInfoService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveActivityInfoService.h; sourceTree = "<group>"; };
 		D2F048691EE54E860011E39C /* LVCLiveActivityInfoService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveActivityInfoService.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -1219,6 +1231,8 @@
 				D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */,
 				D2A089E91E8A09CB0071412C /* LVCUGCLivePlayerModel.h */,
 				D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */,
+				D2EBC8551F01FF9200F198FB /* LVCCommentModel.h */,
+				D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -2159,6 +2173,12 @@
 			children = (
 				D2888DB21E6EC154003A77C8 /* HomeViewController.h */,
 				D2888DB31E6EC154003A77C8 /* HomeViewController.m */,
+				810B64E11E779AFE00133E15 /* LVCLivePlayerController.h */,
+				810B64E21E779AFE00133E15 /* LVCLivePlayerController.m */,
+				810B65081E77B39D00133E15 /* LVCFullScreenPlayerController.h */,
+				810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */,
+				D2EBC85B1F02031400F198FB /* LVCUGCLiveListController.h */,
+				D2EBC85C1F02031400F198FB /* LVCUGCLiveListController.m */,
 				D25BF87E1E7BD266007FB138 /* LVCUGCLivePlayerController.h */,
 				D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */,
 				81A483151E88BED00097A80A /* LVCTVLiveViewController.h */,
@@ -2176,6 +2196,10 @@
 			children = (
 				D28F5FFD1E8BC7EF00914142 /* LVCUGCLiveListView.h */,
 				D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */,
+				D219E86C1F01002400650F38 /* LVCVodPlayerListView.h */,
+				D219E86D1F01002400650F38 /* LVCVodPlayerListView.m */,
+				D2EBC8581F02011400F198FB /* LVCVodPlayerTableViewCell.h */,
+				D2EBC8591F02011400F198FB /* LVCVodPlayerTableViewCell.m */,
 				D2A089E61E89FA720071412C /* LVCUGCLivePlayerCell.h */,
 				D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */,
 				D25BF8811E7F775F007FB138 /* LVCUGCPlayerLoadingView.h */,
@@ -2376,6 +2400,7 @@
 				4B45CE981EB86A760079AFB7 /* UILabel+createLabel.m in Sources */,
 				D2029C9C1E6EADE10027CD92 /* MJPropertyType.m in Sources */,
 				D22831091E77D8D500627701 /* GiftModel.m in Sources */,
+				D2EBC85A1F02011400F198FB /* LVCVodPlayerTableViewCell.m in Sources */,
 				D23BBDBE1EF8ED4A002FE0B8 /* LVCChannelDetailModel.m in Sources */,
 				D2029CCD1E6EADE10027CD92 /* SearchModel.m in Sources */,
 				4BD8560F1EBACEF80082061D /* CNLiveWebView.m in Sources */,
@@ -2433,6 +2458,7 @@
 				D2029CC51E6EADE10027CD92 /* UIView+WebCacheOperation.m in Sources */,
 				D2029CAB1E6EADE10027CD92 /* MJRefreshBackNormalFooter.m in Sources */,
 				4B45CEA61EB86B9F0079AFB7 /* NSNumber+ScaleHeight.m in Sources */,
+				D2EBC85D1F02031400F198FB /* LVCUGCLiveListController.m in Sources */,
 				810B65031E779B1F00133E15 /* MASViewConstraint.m in Sources */,
 				D2029BCE1E6EADD70027CD92 /* ZXNavigationController.m in Sources */,
 				D23BBDC71EF8FBD1002FE0B8 /* LVCSectionHeaderCollectionReusableView.m in Sources */,
@@ -2446,6 +2472,7 @@
 				4BD856011EBACD530082061D /* AFURLResponseSerialization.m in Sources */,
 				D2575C4A1E7685DE00E3A8FC /* UIView+Bubbling.m in Sources */,
 				8178D4301F02044300AA78A4 /* LVCChannelsModel.m in Sources */,
+				D2EBC8571F01FF9200F198FB /* LVCCommentModel.m in Sources */,
 				D23BBDB81EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.m in Sources */,
 				D2029CA61E6EADE10027CD92 /* MJRefreshHeader.m in Sources */,
 				D2029CC41E6EADE10027CD92 /* UIImageView+WebCache.m in Sources */,
@@ -2530,6 +2557,7 @@
 				D2029D031E6EAE2E0027CD92 /* UIImage+ZXExtension.m in Sources */,
 				4BD855FC1EBACD530082061D /* AFHTTPSessionManager.m in Sources */,
 				4B45CE841EB86A590079AFB7 /* ModifyCommonView.m in Sources */,
+				D219E86E1F01002400650F38 /* LVCVodPlayerListView.m in Sources */,
 				4BD856081EBACD530082061D /* UIProgressView+AFNetworking.m in Sources */,
 				D24571581E8393EB00AA85D6 /* UIImageView+ZXExtension.m in Sources */,
 				D2029D0A1E6EAE2E0027CD92 /* ZXServerUrl.m in Sources */,
@@ -2,54 +2,4 @@
 <Bucket
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "LiveVideoCloud/Classes/Sections/HomePageSections/LVCChannelPagingView.m"
-            timestampString = "520154004.406962"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "86"
-            endingLineNumber = "86"
-            landmarkName = "-requestAppindex"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "LiveVideoCloud/Classes/Sections/HomePageSections/JBBannerView.m"
-            timestampString = "520155014.350986"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "52"
-            endingLineNumber = "52"
-            landmarkName = "-setBannerArray:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "LiveVideoCloud/Classes/Sections/HomePageSections/LVCChannelPagingView.m"
-            timestampString = "520155233.787947"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "109"
-            endingLineNumber = "109"
-            landmarkName = "-requestAppindex"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>
@@ -15,6 +15,7 @@
 #import "LoginViewController.h"
 #import "LVCHomePageViewController.h"
 #import "LVCMineViewController.h"//
+#import "LVCUGCLiveListController.h"
 @interface ZXTabBarController ()<LVCTabBarDelegate>
@@ -53,7 +54,7 @@
 {
     [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"];
     [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"live_default" selectedImage:@"live_focused"];
-    [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[UIViewController alloc]init]] title:@"" image:@"news_default" selectedImage:@"news_focused"];
+    [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCUGCLiveListController alloc]init]] title:@"" image:@"news_default" selectedImage:@"news_focused"];
     [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMineViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"];
 }
@@ -13,6 +13,7 @@
 #import "LVCTVLiveViewController.h"
 #import "LVCTelevisionView.h"
 #import "LVCUGCLiveListView.h"
+#import "LVCVodPlayerListView.h"
 @interface HomeViewController ()<V8HorizontalPickerViewDataSource, V8HorizontalPickerViewDelegate,MHPagingScrollViewDelegate,UIScrollViewDelegate>
 {
@@ -32,7 +33,7 @@
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor whiteColor];
-    _titleArr = @[@"直播",@"频道"];
+    _titleArr = @[@"电视台"];
     CGFloat width = 0;
     for (NSString *title in _titleArr) {
         CGSize size = [title sizeWithAttributes:@{NSFontAttributeName:self.titleView.elementFont}];
@@ -110,24 +111,35 @@
 - (UIView *)pagingScrollView:(MHPagingScrollView *)pagingScrollView pageForIndex:(NSUInteger)index
 {
-    if ([_titleArr[index] isEqualToString:@"频道"]) {
+    if ([_titleArr[index] isEqualToString:@"电视台"]) {
         LVCTelevisionView *tvView = (LVCTelevisionView *)[pagingScrollView pageViewByIndex:index];
         if (!tvView) {
             tvView = [[LVCTelevisionView alloc] init];
         }
         return tvView;
-    }else if ([_titleArr[index] isEqualToString:@"直播"]) {
-        
-        LVCUGCLiveListView *liveListView = (LVCUGCLiveListView *)[pagingScrollView pageViewByIndex:index];
-        if (!liveListView) {
-            liveListView = [[LVCUGCLiveListView alloc] initWithFrame:CGRectMake(0, 64, SCREEN_WIDTH, SCREEN_HEIGHT - 114)];
-        } else {
-            [liveListView isNeedToRefresh];
-        }
-        liveListView.scrollToTop = YES;
-        return liveListView;
     }
+//    else if ([_titleArr[index] isEqualToString:@"直播"]) {
+//        
+//        LVCUGCLiveListView *liveListView = (LVCUGCLiveListView *)[pagingScrollView pageViewByIndex:index];
+//        if (!liveListView) {
+//            liveListView = [[LVCUGCLiveListView alloc] initWithFrame:CGRectMake(0, 64, SCREEN_WIDTH, SCREEN_HEIGHT - 114)];
+//        } else {
+//            [liveListView isNeedToRefresh];
+//        }
+//        liveListView.scrollToTop = YES;
+//        return liveListView;
+//    }else if ([_titleArr[index] isEqualToString:@"点播"]) {
+//        
+//        LVCVodPlayerListView *vodListView = (LVCVodPlayerListView *)[pagingScrollView pageViewByIndex:index];
+//        if (!vodListView) {
+//            vodListView = [[LVCVodPlayerListView alloc] initWithFrame:CGRectMake(0, 64, SCREEN_WIDTH, SCREEN_HEIGHT - 114)];
+//        } else {
+////            [vodListView isNeedToRefresh];
+//        }
+////        vodListView.scrollToTop = YES;
+//        return vodListView;
+//    }
     return nil;
 }
+//
+//  LVCUGCLiveListController.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCUGCLiveListController : UIViewController
+
+@end
+//
+//  LVCUGCLiveListController.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCUGCLiveListController.h"
+#import "LVCUGCLiveListView.h"
+
+@interface LVCUGCLiveListController ()
+
+@end
+
+@implementation LVCUGCLiveListController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    self.navigationItem.title = @"UGC直播";
+    self.view.backgroundColor = [UIColor whiteColor];
+    
+    LVCUGCLiveListView *liveListView = [[LVCUGCLiveListView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT - 50)];
+    liveListView.scrollToTop = YES;
+    [self.view addSubview:liveListView];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+@end
+//
+//  LVCCommentModel.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseModel.h"
+
+@interface LVCCommentModel : BaseModel
+
+@property (nonatomic, strong)NSString *content;
+@property (nonatomic, strong)NSString *uid;
+@property (nonatomic, strong)NSString *facepath;
+@property (nonatomic, strong)NSString *nick;
+
+@end
+//
+//  LVCCommentModel.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCCommentModel.h"
+
+@implementation LVCCommentModel
+
+@end
+//
+//  LVCVodPlayerListView.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/26.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCVodPlayerListView : UIView
+
+@end
+//
+//  LVCVodPlayerListView.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/26.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCVodPlayerListView.h"
+#import "LVCVodPlayerTableViewCell.h"
+
+static NSString *vodCellId = @"vodCellId";
+
+@interface LVCVodPlayerListView()<UITableViewDelegate, UITableViewDataSource> {
+    
+    AFHTTPRequestOperation *_operation;
+    NSMutableArray *_programArrayM;
+}
+
+@property (nonatomic, strong)UITableView *tableView;
+
+@end
+
+@implementation LVCVodPlayerListView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = [UIColor whiteColor];
+        _programArrayM = [[NSMutableArray alloc] init];
+        [self requestVodPlayerList];
+    }
+    return self;
+}
+
+- (void)requestVodPlayerList {
+    
+    NSString *uid;
+    if ([UserTools isLogin]) {
+        uid = [UserInformationModel manager].uid;
+    } else {
+        uid = [NSString stringWithFormat:@"%u", arc4random()%3];
+    }
+    NSString *tm = [NSString stringWithFormat:@"%u_%@", arc4random()%10, uid];
+    
+    NSDictionary *parameter = @{@"cid": @"82_news/",
+                                @"page": [NSString stringWithFormat:@"%d", 1],
+                                @"pagesize": @"15",
+                                @"tm": tm};
+    
+    [[AFHTTPRequestOperationManager manager] GET:Newslist parameters:[self addParameters:parameter] success:^(AFHTTPRequestOperation *operation, id responseObject) {
+        
+        responseObject = [responseObject validatedDictionary];
+        
+        if (responseObject[@"programs"] && [responseObject[@"programs"] isKindOfClass:[NSArray class]]) {
+            
+            for (NSDictionary *dic in responseObject[@"programs"]) {
+                ProgramModel *programModel = [ProgramModel modelWithDic:dic];
+                [_programArrayM addObject:programModel];
+                if (dic[@"comments"] && [dic[@"comments"] isKindOfClass:[NSArray class]] && [dic[@"comments"] count] > 0) {
+                    NSMutableArray *comments = [[NSMutableArray alloc] init];
+                    for (NSDictionary *commentDic in dic[@"comments"]) {
+                        LVCCommentModel *commentModel = [LVCCommentModel modelWithDic:commentDic];
+                        [comments addObject:commentModel];
+                    }
+                    [_programArrayM addObject:comments];
+                }
+            }
+        }
+        [self.tableView reloadData];
+        
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+        
+        NSLog(@"点播列表请求失败!");
+    }];
+}
+
+#pragma mark - UITableViewDelegate !!!!!!!!!!!!!!!!!!!!!!!!
+
+#pragma mark - UITableViewDataSource !!!!!!!!!!!!!!!!!!!!!!!!
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return _programArrayM.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    return nil;
+}
+
+#pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (UITableView *)tableView {
+    
+    if (!_tableView) {
+        _tableView = [[UITableView alloc] initWithFrame:self.bounds style:UITableViewStylePlain];
+        _tableView.dataSource = self;
+        _tableView.delegate = self;
+        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        
+        UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, -KScreenHeight, KScreenWidth, KScreenHeight)];
+        view.backgroundColor = [UIColor backgroundColor];
+        [_tableView addSubview:view];
+    
+        [_tableView registerClass:[LVCVodPlayerTableViewCell class] forCellReuseIdentifier:vodCellId];
+    }
+    return _tableView;
+}
+
+#pragma mark ------------------------------ 分割线 ----------------------------------------------
+- (NSDictionary *)addParameters:(NSDictionary *)dict {
+    
+    if (![dict isKindOfClass:[NSDictionary class]]) {
+        return dict;
+    }
+    if (!dict) {
+        return @{@"appid": JBAppId, @"plat": @"i", @"version": JBAppVersion};
+    } else {
+        NSMutableDictionary *dic = [[NSMutableDictionary alloc] initWithDictionary:dict];
+        [dic addEntriesFromDictionary:@{@"appid": JBAppId, @"plat": @"i", @"version": JBAppVersion}];
+        return [[NSDictionary alloc] initWithDictionary:dic];
+    }
+}
+
+@end
+//
+//  LVCVodPlayerTableViewCell.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCVodPlayerTableViewCell : UITableViewCell
+
+@end
+//
+//  LVCVodPlayerTableViewCell.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCVodPlayerTableViewCell.h"
+
+@implementation LVCVodPlayerTableViewCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+@end
@@ -35,6 +35,7 @@
     #import "LVCBannerAndMarqueeModel.h"
 #include "LVCChannelDetailModel.h"
 #import "LVCBqWqXgModel.h"
+#import "LVCCommentModel.h"
 #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
@@ -191,7 +191,8 @@ static NSString *const livingFocus               = @&quot;http://app.jczb.cnlive.com/
 static NSString *const createRoom                = @"https://api.cnlive.com/open/api2/interacitve_chat/createRoom";
 //新闻信息
-static NSString *const Newslist                  = @"http://app.jczb.cnlive.com/api/newslist";
+//static NSString *const Newslist                  = @"http://app.jczb.cnlive.com/api/newslist";
+static NSString *const Newslist                  = @"http://intertv.cnlive.com/zgw_sp/api/newslist";
 //明星底页信息
 static NSString *const StarAtTheBottomOfPage     = @"http://app.jczb.cnlive.com/api/star?";