iOS Team / LiveVideoCloud · Commits

Commit 1c6383c06e1d1a1a6b886006c9e20edfabb66cf1

Authored by 朱林
2 parents 65f6fb0e 6de1c7ea

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

Conflicts:
	LiveVideoCloud.xcodeproj/project.pbxproj
Inline Side-by-side
Showing 14 changed files with 309 additions and 64 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
  View file @1c6383c
... ... @@ -201,6 +201,7 @@
201 201 D217A24B1E7B76C7003B44CB /* PresentViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A2491E7B76C7003B44CB /* PresentViewCell.m */; };
202 202 D217A24E1E7B77C7003B44CB /* ComboCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A24D1E7B77C7003B44CB /* ComboCell.m */; };
203 203 D219E86B1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D219E86A1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m */; };
  204 + D219E86E1F01002400650F38 /* LVCVodPlayerListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D219E86D1F01002400650F38 /* LVCVodPlayerListView.m */; };
204 205 D224B1971E826ED800CC61D0 /* ChatBarrageAnimAction.m in Sources */ = {isa = PBXBuildFile; fileRef = D224B1961E826ED800CC61D0 /* ChatBarrageAnimAction.m */; };
205 206 D22830F11E778C0F00627701 /* LiveBaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830F01E778C0F00627701 /* LiveBaseView.m */; };
206 207 D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FB1E77C2D900627701 /* BottomToolView.m */; };
... ... @@ -270,6 +271,9 @@
270 271 D2B7B2571E8261EF00ED084E /* ChatBarrOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */; };
271 272 D2CBC13B1ECC157A00E00279 /* LVCVerifyLiveAuthService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2CBC13A1ECC157A00E00279 /* LVCVerifyLiveAuthService.m */; };
272 273 D2D7D18D1E8A581000217771 /* timg.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D2D7D18C1E8A581000217771 /* timg.jpeg */; };
  274 + D2EBC8571F01FF9200F198FB /* LVCCommentModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */; };
  275 + D2EBC85A1F02011400F198FB /* LVCVodPlayerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8591F02011400F198FB /* LVCVodPlayerTableViewCell.m */; };
  276 + D2EBC85D1F02031400F198FB /* LVCUGCLiveListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC85C1F02031400F198FB /* LVCUGCLiveListController.m */; };
273 277 D2F0486A1EE54E860011E39C /* LVCLiveActivityInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2F048691EE54E860011E39C /* LVCLiveActivityInfoService.m */; };
274 278 /* End PBXBuildFile section */
275 279  
... ... @@ -713,6 +717,8 @@
713 717 D217A24D1E7B77C7003B44CB /* ComboCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ComboCell.m; path = Present/ComboCell.m; sourceTree = "<group>"; };
714 718 D219E8691EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCBigHorizontalCollectionViewCell.h; sourceTree = "<group>"; };
715 719 D219E86A1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCBigHorizontalCollectionViewCell.m; sourceTree = "<group>"; };
  720 + D219E86C1F01002400650F38 /* LVCVodPlayerListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerListView.h; sourceTree = "<group>"; };
  721 + D219E86D1F01002400650F38 /* LVCVodPlayerListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerListView.m; sourceTree = "<group>"; };
716 722 D224B1951E826ED800CC61D0 /* ChatBarrageAnimAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrageAnimAction.h; sourceTree = "<group>"; };
717 723 D224B1961E826ED800CC61D0 /* ChatBarrageAnimAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageAnimAction.m; sourceTree = "<group>"; };
718 724 D22830EF1E778C0F00627701 /* LiveBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveBaseView.h; sourceTree = "<group>"; };
... ... @@ -839,6 +845,12 @@
839 845 D2CBC1391ECC157A00E00279 /* LVCVerifyLiveAuthService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LVCVerifyLiveAuthService.h; path = ../LVCVerifyLiveAuthService.h; sourceTree = "<group>"; };
840 846 D2CBC13A1ECC157A00E00279 /* LVCVerifyLiveAuthService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LVCVerifyLiveAuthService.m; path = ../LVCVerifyLiveAuthService.m; sourceTree = "<group>"; };
841 847 D2D7D18C1E8A581000217771 /* timg.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = timg.jpeg; sourceTree = "<group>"; };
  848 + D2EBC8551F01FF9200F198FB /* LVCCommentModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCCommentModel.h; sourceTree = "<group>"; };
  849 + D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCCommentModel.m; sourceTree = "<group>"; };
  850 + D2EBC8581F02011400F198FB /* LVCVodPlayerTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerTableViewCell.h; sourceTree = "<group>"; };
  851 + D2EBC8591F02011400F198FB /* LVCVodPlayerTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerTableViewCell.m; sourceTree = "<group>"; };
  852 + D2EBC85B1F02031400F198FB /* LVCUGCLiveListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListController.h; sourceTree = "<group>"; };
  853 + D2EBC85C1F02031400F198FB /* LVCUGCLiveListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListController.m; sourceTree = "<group>"; };
842 854 D2F048681EE54E860011E39C /* LVCLiveActivityInfoService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveActivityInfoService.h; sourceTree = "<group>"; };
843 855 D2F048691EE54E860011E39C /* LVCLiveActivityInfoService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveActivityInfoService.m; sourceTree = "<group>"; };
844 856 /* End PBXFileReference section */
... ... @@ -1219,6 +1231,8 @@
1219 1231 D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */,
1220 1232 D2A089E91E8A09CB0071412C /* LVCUGCLivePlayerModel.h */,
1221 1233 D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */,
  1234 + D2EBC8551F01FF9200F198FB /* LVCCommentModel.h */,
  1235 + D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */,
1222 1236 );
1223 1237 path = Model;
1224 1238 sourceTree = "<group>";
... ... @@ -2159,6 +2173,12 @@
2159 2173 children = (
2160 2174 D2888DB21E6EC154003A77C8 /* HomeViewController.h */,
2161 2175 D2888DB31E6EC154003A77C8 /* HomeViewController.m */,
  2176 + 810B64E11E779AFE00133E15 /* LVCLivePlayerController.h */,
  2177 + 810B64E21E779AFE00133E15 /* LVCLivePlayerController.m */,
  2178 + 810B65081E77B39D00133E15 /* LVCFullScreenPlayerController.h */,
  2179 + 810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */,
  2180 + D2EBC85B1F02031400F198FB /* LVCUGCLiveListController.h */,
  2181 + D2EBC85C1F02031400F198FB /* LVCUGCLiveListController.m */,
2162 2182 D25BF87E1E7BD266007FB138 /* LVCUGCLivePlayerController.h */,
2163 2183 D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */,
2164 2184 81A483151E88BED00097A80A /* LVCTVLiveViewController.h */,
... ... @@ -2176,6 +2196,10 @@
2176 2196 children = (
2177 2197 D28F5FFD1E8BC7EF00914142 /* LVCUGCLiveListView.h */,
2178 2198 D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */,
  2199 + D219E86C1F01002400650F38 /* LVCVodPlayerListView.h */,
  2200 + D219E86D1F01002400650F38 /* LVCVodPlayerListView.m */,
  2201 + D2EBC8581F02011400F198FB /* LVCVodPlayerTableViewCell.h */,
  2202 + D2EBC8591F02011400F198FB /* LVCVodPlayerTableViewCell.m */,
2179 2203 D2A089E61E89FA720071412C /* LVCUGCLivePlayerCell.h */,
2180 2204 D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */,
2181 2205 D25BF8811E7F775F007FB138 /* LVCUGCPlayerLoadingView.h */,
... ... @@ -2376,6 +2400,7 @@
2376 2400 4B45CE981EB86A760079AFB7 /* UILabel+createLabel.m in Sources */,
2377 2401 D2029C9C1E6EADE10027CD92 /* MJPropertyType.m in Sources */,
2378 2402 D22831091E77D8D500627701 /* GiftModel.m in Sources */,
  2403 + D2EBC85A1F02011400F198FB /* LVCVodPlayerTableViewCell.m in Sources */,
2379 2404 D23BBDBE1EF8ED4A002FE0B8 /* LVCChannelDetailModel.m in Sources */,
2380 2405 D2029CCD1E6EADE10027CD92 /* SearchModel.m in Sources */,
2381 2406 4BD8560F1EBACEF80082061D /* CNLiveWebView.m in Sources */,
... ... @@ -2433,6 +2458,7 @@
2433 2458 D2029CC51E6EADE10027CD92 /* UIView+WebCacheOperation.m in Sources */,
2434 2459 D2029CAB1E6EADE10027CD92 /* MJRefreshBackNormalFooter.m in Sources */,
2435 2460 4B45CEA61EB86B9F0079AFB7 /* NSNumber+ScaleHeight.m in Sources */,
  2461 + D2EBC85D1F02031400F198FB /* LVCUGCLiveListController.m in Sources */,
2436 2462 810B65031E779B1F00133E15 /* MASViewConstraint.m in Sources */,
2437 2463 D2029BCE1E6EADD70027CD92 /* ZXNavigationController.m in Sources */,
2438 2464 D23BBDC71EF8FBD1002FE0B8 /* LVCSectionHeaderCollectionReusableView.m in Sources */,
... ... @@ -2446,6 +2472,7 @@
2446 2472 4BD856011EBACD530082061D /* AFURLResponseSerialization.m in Sources */,
2447 2473 D2575C4A1E7685DE00E3A8FC /* UIView+Bubbling.m in Sources */,
2448 2474 8178D4301F02044300AA78A4 /* LVCChannelsModel.m in Sources */,
  2475 + D2EBC8571F01FF9200F198FB /* LVCCommentModel.m in Sources */,
2449 2476 D23BBDB81EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.m in Sources */,
2450 2477 D2029CA61E6EADE10027CD92 /* MJRefreshHeader.m in Sources */,
2451 2478 D2029CC41E6EADE10027CD92 /* UIImageView+WebCache.m in Sources */,
... ... @@ -2530,6 +2557,7 @@
2530 2557 D2029D031E6EAE2E0027CD92 /* UIImage+ZXExtension.m in Sources */,
2531 2558 4BD855FC1EBACD530082061D /* AFHTTPSessionManager.m in Sources */,
2532 2559 4B45CE841EB86A590079AFB7 /* ModifyCommonView.m in Sources */,
  2560 + D219E86E1F01002400650F38 /* LVCVodPlayerListView.m in Sources */,
2533 2561 4BD856081EBACD530082061D /* UIProgressView+AFNetworking.m in Sources */,
2534 2562 D24571581E8393EB00AA85D6 /* UIImageView+ZXExtension.m in Sources */,
2535 2563 D2029D0A1E6EAE2E0027CD92 /* ZXServerUrl.m in Sources */,
... ...
LiveVideoCloud.xcodeproj/xcuserdata/cnlive.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  View file @1c6383c
... ... @@ -2,54 +2,4 @@
2 2 <Bucket
3 3 type = "1"
4 4 version = "2.0">
5   - <Breakpoints>
6   - <BreakpointProxy
7   - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
8   - <BreakpointContent
9   - shouldBeEnabled = "No"
10   - ignoreCount = "0"
11   - continueAfterRunningActions = "No"
12   - filePath = "LiveVideoCloud/Classes/Sections/HomePageSections/LVCChannelPagingView.m"
13   - timestampString = "520154004.406962"
14   - startingColumnNumber = "9223372036854775807"
15   - endingColumnNumber = "9223372036854775807"
16   - startingLineNumber = "86"
17   - endingLineNumber = "86"
18   - landmarkName = "-requestAppindex"
19   - landmarkType = "7">
20   - </BreakpointContent>
21   - </BreakpointProxy>
22   - <BreakpointProxy
23   - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
24   - <BreakpointContent
25   - shouldBeEnabled = "Yes"
26   - ignoreCount = "0"
27   - continueAfterRunningActions = "No"
28   - filePath = "LiveVideoCloud/Classes/Sections/HomePageSections/JBBannerView.m"
29   - timestampString = "520155014.350986"
30   - startingColumnNumber = "9223372036854775807"
31   - endingColumnNumber = "9223372036854775807"
32   - startingLineNumber = "52"
33   - endingLineNumber = "52"
34   - landmarkName = "-setBannerArray:"
35   - landmarkType = "7">
36   - </BreakpointContent>
37   - </BreakpointProxy>
38   - <BreakpointProxy
39   - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
40   - <BreakpointContent
41   - shouldBeEnabled = "Yes"
42   - ignoreCount = "0"
43   - continueAfterRunningActions = "No"
44   - filePath = "LiveVideoCloud/Classes/Sections/HomePageSections/LVCChannelPagingView.m"
45   - timestampString = "520155233.787947"
46   - startingColumnNumber = "9223372036854775807"
47   - endingColumnNumber = "9223372036854775807"
48   - startingLineNumber = "109"
49   - endingLineNumber = "109"
50   - landmarkName = "-requestAppindex"
51   - landmarkType = "7">
52   - </BreakpointContent>
53   - </BreakpointProxy>
54   - </Breakpoints>
55 5 </Bucket>
... ...
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
  View file @1c6383c
... ... @@ -15,6 +15,7 @@
15 15 #import "LoginViewController.h"
16 16 #import "LVCHomePageViewController.h"
17 17 #import "LVCMineViewController.h"//
  18 +#import "LVCUGCLiveListController.h"
18 19  
19 20 @interface ZXTabBarController ()<LVCTabBarDelegate>
20 21  
... ... @@ -53,7 +54,7 @@
53 54 {
54 55 [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"];
55 56 [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"live_default" selectedImage:@"live_focused"];
56   - [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[UIViewController alloc]init]] title:@"" image:@"news_default" selectedImage:@"news_focused"];
  57 + [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCUGCLiveListController alloc]init]] title:@"" image:@"news_default" selectedImage:@"news_focused"];
57 58 [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMineViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"];
58 59 }
59 60  
... ...
LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m
  View file @1c6383c
... ... @@ -13,6 +13,7 @@
13 13 #import "LVCTVLiveViewController.h"
14 14 #import "LVCTelevisionView.h"
15 15 #import "LVCUGCLiveListView.h"
  16 +#import "LVCVodPlayerListView.h"
16 17  
17 18 @interface HomeViewController ()<V8HorizontalPickerViewDataSource, V8HorizontalPickerViewDelegate,MHPagingScrollViewDelegate,UIScrollViewDelegate>
18 19 {
... ... @@ -32,7 +33,7 @@
32 33 [super viewDidLoad];
33 34 self.view.backgroundColor = [UIColor whiteColor];
34 35  
35   - _titleArr = @[@"直播",@"频道"];
  36 + _titleArr = @[@"电视台"];
36 37 CGFloat width = 0;
37 38 for (NSString *title in _titleArr) {
38 39 CGSize size = [title sizeWithAttributes:@{NSFontAttributeName:self.titleView.elementFont}];
... ... @@ -110,24 +111,35 @@
110 111  
111 112 - (UIView *)pagingScrollView:(MHPagingScrollView *)pagingScrollView pageForIndex:(NSUInteger)index
112 113 {
113   - if ([_titleArr[index] isEqualToString:@"频道"]) {
  114 + if ([_titleArr[index] isEqualToString:@"电视台"]) {
114 115  
115 116 LVCTelevisionView *tvView = (LVCTelevisionView *)[pagingScrollView pageViewByIndex:index];
116 117 if (!tvView) {
117 118 tvView = [[LVCTelevisionView alloc] init];
118 119 }
119 120 return tvView;
120   - }else if ([_titleArr[index] isEqualToString:@"直播"]) {
121   -
122   - LVCUGCLiveListView *liveListView = (LVCUGCLiveListView *)[pagingScrollView pageViewByIndex:index];
123   - if (!liveListView) {
124   - liveListView = [[LVCUGCLiveListView alloc] initWithFrame:CGRectMake(0, 64, SCREEN_WIDTH, SCREEN_HEIGHT - 114)];
125   - } else {
126   - [liveListView isNeedToRefresh];
127   - }
128   - liveListView.scrollToTop = YES;
129   - return liveListView;
130 121 }
  122 +// else if ([_titleArr[index] isEqualToString:@"直播"]) {
  123 +//
  124 +// LVCUGCLiveListView *liveListView = (LVCUGCLiveListView *)[pagingScrollView pageViewByIndex:index];
  125 +// if (!liveListView) {
  126 +// liveListView = [[LVCUGCLiveListView alloc] initWithFrame:CGRectMake(0, 64, SCREEN_WIDTH, SCREEN_HEIGHT - 114)];
  127 +// } else {
  128 +// [liveListView isNeedToRefresh];
  129 +// }
  130 +// liveListView.scrollToTop = YES;
  131 +// return liveListView;
  132 +// }else if ([_titleArr[index] isEqualToString:@"点播"]) {
  133 +//
  134 +// LVCVodPlayerListView *vodListView = (LVCVodPlayerListView *)[pagingScrollView pageViewByIndex:index];
  135 +// if (!vodListView) {
  136 +// vodListView = [[LVCVodPlayerListView alloc] initWithFrame:CGRectMake(0, 64, SCREEN_WIDTH, SCREEN_HEIGHT - 114)];
  137 +// } else {
  138 +//// [vodListView isNeedToRefresh];
  139 +// }
  140 +//// vodListView.scrollToTop = YES;
  141 +// return vodListView;
  142 +// }
131 143 return nil;
132 144 }
133 145  
... ...
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListController.h 0 → 100644
  View file @1c6383c
  1 +//
  2 +// LVCUGCLiveListController.h
  3 +// LiveVideoCloud
  4 +//
  5 +// Created by cnliveJunBo on 17/6/27.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import <UIKit/UIKit.h>
  10 +
  11 +@interface LVCUGCLiveListController : UIViewController
  12 +
  13 +@end
... ...
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListController.m 0 → 100644
  View file @1c6383c
  1 +//
  2 +// LVCUGCLiveListController.m
  3 +// LiveVideoCloud
  4 +//
  5 +// Created by cnliveJunBo on 17/6/27.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import "LVCUGCLiveListController.h"
  10 +#import "LVCUGCLiveListView.h"
  11 +
  12 +@interface LVCUGCLiveListController ()
  13 +
  14 +@end
  15 +
  16 +@implementation LVCUGCLiveListController
  17 +
  18 +- (void)viewDidLoad {
  19 + [super viewDidLoad];
  20 +
  21 + self.navigationItem.title = @"UGC直播";
  22 + self.view.backgroundColor = [UIColor whiteColor];
  23 +
  24 + LVCUGCLiveListView *liveListView = [[LVCUGCLiveListView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT - 50)];
  25 + liveListView.scrollToTop = YES;
  26 + [self.view addSubview:liveListView];
  27 +}
  28 +
  29 +- (void)didReceiveMemoryWarning {
  30 + [super didReceiveMemoryWarning];
  31 + // Dispose of any resources that can be recreated.
  32 +}
  33 +
  34 +@end
... ...
LiveVideoCloud/Classes/Sections/homeSections/Model/LVCCommentModel.h 0 → 100644
  View file @1c6383c
  1 +//
  2 +// LVCCommentModel.h
  3 +// LiveVideoCloud
  4 +//
  5 +// Created by cnliveJunBo on 17/6/27.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import "BaseModel.h"
  10 +
  11 +@interface LVCCommentModel : BaseModel
  12 +
  13 +@property (nonatomic, strong)NSString *content;
  14 +@property (nonatomic, strong)NSString *uid;
  15 +@property (nonatomic, strong)NSString *facepath;
  16 +@property (nonatomic, strong)NSString *nick;
  17 +
  18 +@end
... ...
LiveVideoCloud/Classes/Sections/homeSections/Model/LVCCommentModel.m 0 → 100644
  View file @1c6383c
  1 +//
  2 +// LVCCommentModel.m
  3 +// LiveVideoCloud
  4 +//
  5 +// Created by cnliveJunBo on 17/6/27.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import "LVCCommentModel.h"
  10 +
  11 +@implementation LVCCommentModel
  12 +
  13 +@end
... ...
LiveVideoCloud/Classes/Sections/homeSections/View/LVCVodPlayerListView.h 0 → 100644
  View file @1c6383c
  1 +//
  2 +// LVCVodPlayerListView.h
  3 +// LiveVideoCloud
  4 +//
  5 +// Created by cnliveJunBo on 17/6/26.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import <UIKit/UIKit.h>
  10 +
  11 +@interface LVCVodPlayerListView : UIView
  12 +
  13 +@end
... ...
LiveVideoCloud/Classes/Sections/homeSections/View/LVCVodPlayerListView.m 0 → 100644
  View file @1c6383c
  1 +//
  2 +// LVCVodPlayerListView.m
  3 +// LiveVideoCloud
  4 +//
  5 +// Created by cnliveJunBo on 17/6/26.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import "LVCVodPlayerListView.h"
  10 +#import "LVCVodPlayerTableViewCell.h"
  11 +
  12 +static NSString *vodCellId = @"vodCellId";
  13 +
  14 +@interface LVCVodPlayerListView()<UITableViewDelegate, UITableViewDataSource> {
  15 +
  16 + AFHTTPRequestOperation *_operation;
  17 + NSMutableArray *_programArrayM;
  18 +}
  19 +
  20 +@property (nonatomic, strong)UITableView *tableView;
  21 +
  22 +@end
  23 +
  24 +@implementation LVCVodPlayerListView
  25 +
  26 +- (instancetype)initWithFrame:(CGRect)frame
  27 +{
  28 + self = [super initWithFrame:frame];
  29 + if (self) {
  30 + self.backgroundColor = [UIColor whiteColor];
  31 + _programArrayM = [[NSMutableArray alloc] init];
  32 + [self requestVodPlayerList];
  33 + }
  34 + return self;
  35 +}
  36 +
  37 +- (void)requestVodPlayerList {
  38 +
  39 + NSString *uid;
  40 + if ([UserTools isLogin]) {
  41 + uid = [UserInformationModel manager].uid;
  42 + } else {
  43 + uid = [NSString stringWithFormat:@"%u", arc4random()%3];
  44 + }
  45 + NSString *tm = [NSString stringWithFormat:@"%u_%@", arc4random()%10, uid];
  46 +
  47 + NSDictionary *parameter = @{@"cid": @"82_news/",
  48 + @"page": [NSString stringWithFormat:@"%d", 1],
  49 + @"pagesize": @"15",
  50 + @"tm": tm};
  51 +
  52 + [[AFHTTPRequestOperationManager manager] GET:Newslist parameters:[self addParameters:parameter] success:^(AFHTTPRequestOperation *operation, id responseObject) {
  53 +
  54 + responseObject = [responseObject validatedDictionary];
  55 +
  56 + if (responseObject[@"programs"] && [responseObject[@"programs"] isKindOfClass:[NSArray class]]) {
  57 +
  58 + for (NSDictionary *dic in responseObject[@"programs"]) {
  59 + ProgramModel *programModel = [ProgramModel modelWithDic:dic];
  60 + [_programArrayM addObject:programModel];
  61 + if (dic[@"comments"] && [dic[@"comments"] isKindOfClass:[NSArray class]] && [dic[@"comments"] count] > 0) {
  62 + NSMutableArray *comments = [[NSMutableArray alloc] init];
  63 + for (NSDictionary *commentDic in dic[@"comments"]) {
  64 + LVCCommentModel *commentModel = [LVCCommentModel modelWithDic:commentDic];
  65 + [comments addObject:commentModel];
  66 + }
  67 + [_programArrayM addObject:comments];
  68 + }
  69 + }
  70 + }
  71 + [self.tableView reloadData];
  72 +
  73 + } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
  74 +
  75 + NSLog(@"点播列表请求失败!");
  76 + }];
  77 +}
  78 +
  79 +#pragma mark - UITableViewDelegate !!!!!!!!!!!!!!!!!!!!!!!!
  80 +
  81 +#pragma mark - UITableViewDataSource !!!!!!!!!!!!!!!!!!!!!!!!
  82 +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
  83 + return _programArrayM.count;
  84 +}
  85 +
  86 +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
  87 +
  88 + return nil;
  89 +}
  90 +
  91 +#pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!
  92 +- (UITableView *)tableView {
  93 +
  94 + if (!_tableView) {
  95 + _tableView = [[UITableView alloc] initWithFrame:self.bounds style:UITableViewStylePlain];
  96 + _tableView.dataSource = self;
  97 + _tableView.delegate = self;
  98 + _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
  99 +
  100 + UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, -KScreenHeight, KScreenWidth, KScreenHeight)];
  101 + view.backgroundColor = [UIColor backgroundColor];
  102 + [_tableView addSubview:view];
  103 +
  104 + [_tableView registerClass:[LVCVodPlayerTableViewCell class] forCellReuseIdentifier:vodCellId];
  105 + }
  106 + return _tableView;
  107 +}
  108 +
  109 +#pragma mark ------------------------------ 分割线 ----------------------------------------------
  110 +- (NSDictionary *)addParameters:(NSDictionary *)dict {
  111 +
  112 + if (![dict isKindOfClass:[NSDictionary class]]) {
  113 + return dict;
  114 + }
  115 + if (!dict) {
  116 + return @{@"appid": JBAppId, @"plat": @"i", @"version": JBAppVersion};
  117 + } else {
  118 + NSMutableDictionary *dic = [[NSMutableDictionary alloc] initWithDictionary:dict];
  119 + [dic addEntriesFromDictionary:@{@"appid": JBAppId, @"plat": @"i", @"version": JBAppVersion}];
  120 + return [[NSDictionary alloc] initWithDictionary:dic];
  121 + }
  122 +}
  123 +
  124 +@end
... ...
LiveVideoCloud/Classes/Sections/homeSections/View/LVCVodPlayerTableViewCell.h 0 → 100644
  View file @1c6383c
  1 +//
  2 +// LVCVodPlayerTableViewCell.h
  3 +// LiveVideoCloud
  4 +//
  5 +// Created by cnliveJunBo on 17/6/27.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import <UIKit/UIKit.h>
  10 +
  11 +@interface LVCVodPlayerTableViewCell : UITableViewCell
  12 +
  13 +@end
... ...
LiveVideoCloud/Classes/Sections/homeSections/View/LVCVodPlayerTableViewCell.m 0 → 100644
  View file @1c6383c
  1 +//
  2 +// LVCVodPlayerTableViewCell.m
  3 +// LiveVideoCloud
  4 +//
  5 +// Created by cnliveJunBo on 17/6/27.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import "LVCVodPlayerTableViewCell.h"
  10 +
  11 +@implementation LVCVodPlayerTableViewCell
  12 +
  13 +- (void)awakeFromNib {
  14 + [super awakeFromNib];
  15 + // Initialization code
  16 +}
  17 +
  18 +- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
  19 + [super setSelected:selected animated:animated];
  20 +
  21 + // Configure the view for the selected state
  22 +}
  23 +
  24 +@end
... ...
LiveVideoCloud/PrefixHeader.pch
  View file @1c6383c
... ... @@ -35,6 +35,7 @@
35 35 #import "LVCBannerAndMarqueeModel.h"
36 36 #include "LVCChannelDetailModel.h"
37 37 #import "LVCBqWqXgModel.h"
  38 +#import "LVCCommentModel.h"
38 39  
39 40 #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
40 41  
... ...
LiveVideoCloud/UtilKits/Common.h
  View file @1c6383c
... ... @@ -191,7 +191,8 @@ static NSString *const livingFocus = @&quot;http://app.jczb.cnlive.com/
191 191 static NSString *const createRoom = @"https://api.cnlive.com/open/api2/interacitve_chat/createRoom";
192 192  
193 193 //新闻信息
194   -static NSString *const Newslist = @"http://app.jczb.cnlive.com/api/newslist";
  194 +//static NSString *const Newslist = @"http://app.jczb.cnlive.com/api/newslist";
  195 +static NSString *const Newslist = @"http://intertv.cnlive.com/zgw_sp/api/newslist";
195 196  
196 197 //明星底页信息
197 198 static NSString *const StarAtTheBottomOfPage = @"http://app.jczb.cnlive.com/api/star?";
... ...