iOS Team / LiveVideoCloud · Commits

Commit 294abd650c56724ad5b5d9c611fe9b09cfcfa5ea

Authored by 王军波
1 parent c4ff6f0a

结构

Inline Side-by-side
Showing 5 changed files with 53 additions and 204 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
  View file @294abd6
... ... @@ -247,7 +247,6 @@
247 247 D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */; };
248 248 D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */; };
249 249 D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; };
250   - D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB31E6EC154003A77C8 /* HomeViewController.m */; };
251 250 D2994BA81E8F490400E8D2CC /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */; };
252 251 D2994BA91E8F490400E8D2CC /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
253 252 D2994BAA1E8F490700E8D2CC /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */; };
... ... @@ -275,6 +274,7 @@
275 274 D2EBC8831F02109C00F198FB /* LVCUGCBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC87E1F02109C00F198FB /* LVCUGCBackgroundView.m */; };
276 275 D2EBC8841F02109C00F198FB /* LVCUGCLivePlayerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8801F02109C00F198FB /* LVCUGCLivePlayerCell.m */; };
277 276 D2EBC8851F02109C00F198FB /* LVCUGCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8821F02109C00F198FB /* LVCUGCPlayerLoadingView.m */; };
  277 + D2EBC8881F0225D900F198FB /* LVCVodPlayerListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */; };
278 278 /* End PBXBuildFile section */
279 279  
280 280 /* Begin PBXContainerItemProxy section */
... ... @@ -804,8 +804,6 @@
804 804 D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveViewController.m; sourceTree = "<group>"; };
805 805 D2888DAF1E6EC05F003A77C8 /* TempViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TempViewController.h; sourceTree = "<group>"; };
806 806 D2888DB01E6EC05F003A77C8 /* TempViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TempViewController.m; sourceTree = "<group>"; };
807   - D2888DB21E6EC154003A77C8 /* HomeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeViewController.h; sourceTree = "<group>"; };
808   - D2888DB31E6EC154003A77C8 /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; };
809 807 D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
810 808 D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
811 809 D29D88461E88C53300543A03 /* LVCUGCLivePrepareView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePrepareView.h; sourceTree = "<group>"; };
... ... @@ -853,6 +851,8 @@
853 851 D2EBC8801F02109C00F198FB /* LVCUGCLivePlayerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerCell.m; sourceTree = "<group>"; };
854 852 D2EBC8811F02109C00F198FB /* LVCUGCPlayerLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCPlayerLoadingView.h; sourceTree = "<group>"; };
855 853 D2EBC8821F02109C00F198FB /* LVCUGCPlayerLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCPlayerLoadingView.m; sourceTree = "<group>"; };
  854 + D2EBC8861F0225D900F198FB /* LVCVodPlayerListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerListController.h; sourceTree = "<group>"; };
  855 + D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerListController.m; sourceTree = "<group>"; };
856 856 /* End PBXFileReference section */
857 857  
858 858 /* Begin PBXFrameworksBuildPhase section */
... ... @@ -2168,8 +2168,8 @@
2168 2168 D2888DA81E6EC014003A77C8 /* Controller */ = {
2169 2169 isa = PBXGroup;
2170 2170 children = (
2171   - D2888DB21E6EC154003A77C8 /* HomeViewController.h */,
2172   - D2888DB31E6EC154003A77C8 /* HomeViewController.m */,
  2171 + D2EBC8861F0225D900F198FB /* LVCVodPlayerListController.h */,
  2172 + D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */,
2173 2173 );
2174 2174 path = Controller;
2175 2175 sourceTree = "<group>";
... ... @@ -2506,6 +2506,7 @@
2506 2506 D236967E1E7F9E4100E4BF71 /* GiftPayButton.m in Sources */,
2507 2507 4BD8560A1EBACD530082061D /* UIWebView+AFNetworking.m in Sources */,
2508 2508 D219E86B1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m in Sources */,
  2509 + D2EBC8881F0225D900F198FB /* LVCVodPlayerListController.m in Sources */,
2509 2510 4B45CE831EB86A590079AFB7 /* LVCMineModel.m in Sources */,
2510 2511 4B45CE791EB86A590079AFB7 /* MineAboutUsController.m in Sources */,
2511 2512 81A483081E88B6140097A80A /* UIView+ViewController.m in Sources */,
... ... @@ -2638,7 +2639,6 @@
2638 2639 D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */,
2639 2640 4B45CE771EB86A590079AFB7 /* IDViewController.m in Sources */,
2640 2641 4BD855FF1EBACD530082061D /* AFURLConnectionOperation.m in Sources */,
2641   - D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */,
2642 2642 D2B7B2541E824B2D00ED084E /* ChatBarrageView.m in Sources */,
2643 2643 D25530061E7911A800DF38A5 /* GiftAnimationAction.m in Sources */,
2644 2644 4B45CE881EB86A590079AFB7 /* LVCMineShowCell.m in Sources */,
... ...
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
  View file @294abd6
... ... @@ -8,14 +8,12 @@
8 8  
9 9 #import "ZXTabBarController.h"
10 10 #import "ZXNavigationController.h"
11   -#import "HomeViewController.h"
12 11 #import "LVCLiveViewController.h"
13 12 #import "LVCMineViewController.h"
14 13 #import "LVCTabBar.h"
15 14 #import "LoginViewController.h"
16   -#import "LVCHomePageViewController.h"
17   -#import "LVCMineViewController.h"//
18 15 #import "LVCUGCLiveListController.h"
  16 +#import "LVCVodPlayerListController.h"
19 17  
20 18 @interface ZXTabBarController ()<LVCTabBarDelegate>
21 19  
... ... @@ -52,8 +50,8 @@
52 50  
53 51 - (void)createUI
54 52 {
55   - [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"];
56   - [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"live_default" selectedImage:@"live_focused"];
  53 + [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCVodPlayerListController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"];
  54 + [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[UIViewController alloc]init]] title:@"" image:@"live_default" selectedImage:@"live_focused"];
57 55 [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCUGCLiveListController alloc]init]] title:@"" image:@"news_default" selectedImage:@"news_focused"];
58 56 [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMineViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"];
59 57 }
... ...
LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m deleted 100644 → 0
  View file @c4ff6f0
1   -//
2   -// HomeViewController.m
3   -// ZXBaseProject
4   -//
5   -// Created by 张旭 on 2017/1/10.
6   -// Copyright © 2017年 cnlive. All rights reserved.
7   -//
8   -
9   -#import "HomeViewController.h"
10   -#import "LVCLivePlayerController.h"
11   -#import "LVCLivePlayerController.h"
12   -#import "LVCUGCLivePlayerController.h"
13   -#import "LVCTVLiveViewController.h"
14   -#import "LVCTelevisionView.h"
15   -#import "LVCUGCLiveListView.h"
16   -#import "LVCVodPlayerListView.h"
17   -
18   -@interface HomeViewController ()<V8HorizontalPickerViewDataSource, V8HorizontalPickerViewDelegate,MHPagingScrollViewDelegate,UIScrollViewDelegate>
19   -{
20   - NSArray *_titleArr;
21   - CGFloat _titleSpace;
22   -
23   -}
24   -
25   -@property (nonatomic, strong)V8HorizontalPickerView *titleView;
26   -@property (nonatomic, strong)MHPagingScrollView *pageView;
27   -
28   -@end
29   -
30   -@implementation HomeViewController
31   -
32   -- (void)viewDidLoad {
33   - [super viewDidLoad];
34   - self.view.backgroundColor = [UIColor whiteColor];
35   -
36   - _titleArr = @[@"电视台"];
37   - CGFloat width = 0;
38   - for (NSString *title in _titleArr) {
39   - CGSize size = [title sizeWithAttributes:@{NSFontAttributeName:self.titleView.elementFont}];
40   - width += size.width+5;
41   - }
42   - if (width < self.titleView.width) {
43   - _titleSpace = (self.titleView.width-width)/_titleArr.count;
44   - } else {
45   - _titleSpace = 0;
46   - }
47   -
48   - self.navigationItem.titleView = self.titleView;
49   -
50   - [_pageView reloadPages];
51   - [_titleView reloadData];
52   - [self.view addSubview:self.pageView];
53   -
54   -}
55   -
56   -#pragma mark - V8HorizontalPickerViewDataSource
57   -
58   -- (NSInteger)numberOfElementsInHorizontalPickerView:(V8HorizontalPickerView *)picker
59   -{
60   - return _titleArr.count;
61   -}
62   -
63   -#pragma mark - V8HorizontalPickerViewDelegate
64   -
65   -- (NSString *)horizontalPickerView:(V8HorizontalPickerView *)picker titleForElementAtIndex:(NSInteger)index
66   -{
67   - return _titleArr[index];
68   -}
69   -
70   -- (NSInteger)horizontalPickerView:(V8HorizontalPickerView *)picker widthForElementAtIndex:(NSInteger)index
71   -{
72   -
73   - if (_titleSpace != 0) {
74   -
75   - CGSize size = [_titleArr[index] sizeWithAttributes:@{NSFontAttributeName:self.titleView.elementFont}];
76   - return size.width +_titleSpace;
77   - } else {
78   -
79   - CGSize size = [_titleArr[index] sizeWithAttributes:@{NSFontAttributeName:self.titleView.elementFont}];
80   - return size.width + 15;
81   - }
82   -}
83   -
84   -- (void)horizontalPickerView:(V8HorizontalPickerView *)picker didSelectElementAtIndex:(NSInteger)index
85   -{
86   - if (self.pageView.indexOfSelectedPage != index) {
87   - [self.pageView selectPageAtIndex:index animated:YES];
88   - }
89   -}
90   -
91   -#pragma mark - UIScrollViewDelegate
92   -
93   -- (void)scrollViewDidScroll:(UIScrollView *)scrollView
94   -{
95   -
96   - if (self.titleView.currentSelectedIndex != self.pageView.indexOfSelectedPage) {
97   -
98   - [self.titleView scrollToElement:self.pageView.indexOfSelectedPage animated:YES];
99   -
100   - }
101   - [self.pageView scrollViewDidScroll];
102   -
103   -}
104   -
105   -#pragma mark - MHPagingScrollViewDelegate
106   -
107   -- (NSUInteger)numberOfPagesInPagingScrollView:(MHPagingScrollView *)pagingScrollView
108   -{
109   - return _titleArr.count;
110   -}
111   -
112   -- (UIView *)pagingScrollView:(MHPagingScrollView *)pagingScrollView pageForIndex:(NSUInteger)index
113   -{
114   - if ([_titleArr[index] isEqualToString:@"电视台"]) {
115   -
116   - LVCTelevisionView *tvView = (LVCTelevisionView *)[pagingScrollView pageViewByIndex:index];
117   - if (!tvView) {
118   - tvView = [[LVCTelevisionView alloc] init];
119   - }
120   - return tvView;
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   -// }
143   - return nil;
144   -}
145   -
146   -- (V8HorizontalPickerView *)titleView
147   -{
148   - if (!_titleView) {
149   -
150   - _titleView = [[V8HorizontalPickerView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH-120, 44) home:YES];
151   - _titleView.textColor = [UIColor colorWithHexString:@"#7e7e7d"];
152   - _titleView.selectedTextColor = [UIColor blackColorZX];
153   - _titleView.delegate = self;
154   - _titleView.dataSource = self;
155   - _titleView.elementFont = [UIFont boldSystemFontOfSize:18];
156   - _titleView.scrollView.scrollsToTop = NO;
157   -
158   - }
159   - return _titleView;
160   -}
161   -
162   -- (MHPagingScrollView *)pageView
163   -{
164   - if (!_pageView) {
165   - _pageView = [[MHPagingScrollView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-49)];
166   - _pageView.pagingDelegate = self;
167   - _pageView.delegate = self;
168   - _pageView.scrollsToTop = NO;
169   - }
170   - return _pageView;
171   -}
172   -
173   -- (void)didReceiveMemoryWarning {
174   - [super didReceiveMemoryWarning];
175   - // Dispose of any resources that can be recreated.
176   -}
177   -
178   -/*
179   -#pragma mark - Navigation
180   -
181   -// In a storyboard-based application, you will often want to do a little preparation before navigation
182   -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
183   - // Get the new view controller using [segue destinationViewController].
184   - // Pass the selected object to the new view controller.
185   -}
186   -*/
187   -
188   -@end
LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.h renamed to LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerListController.h
  View file @294abd6
1 1 //
2   -// HomeViewController.h
3   -// ZXBaseProject
  2 +// LVCVodPlayerListController.h
  3 +// LiveVideoCloud
4 4 //
5   -// Created by 张旭 on 2017/1/10.
  5 +// Created by cnliveJunBo on 17/6/27.
6 6 // Copyright © 2017年 cnlive. All rights reserved.
7 7 //
8 8  
9   -#import "BaseViewController.h"
  9 +#import <UIKit/UIKit.h>
10 10  
11   -@interface HomeViewController : BaseViewController
  11 +@interface LVCVodPlayerListController : UIViewController
12 12  
13 13 @end
... ...
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerListController.m 0 → 100644
  View file @294abd6
  1 +//
  2 +// LVCVodPlayerListController.m
  3 +// LiveVideoCloud
  4 +//
  5 +// Created by cnliveJunBo on 17/6/27.
  6 +// Copyright © 2017年 cnlive. All rights reserved.
  7 +//
  8 +
  9 +#import "LVCVodPlayerListController.h"
  10 +
  11 +@interface LVCVodPlayerListController ()
  12 +
  13 +@end
  14 +
  15 +@implementation LVCVodPlayerListController
  16 +
  17 +- (void)viewDidLoad {
  18 + [super viewDidLoad];
  19 +
  20 + self.navigationItem.title = @"点播";
  21 + self.view.backgroundColor = [UIColor whiteColor];
  22 +}
  23 +
  24 +- (void)didReceiveMemoryWarning {
  25 + [super didReceiveMemoryWarning];
  26 + // Dispose of any resources that can be recreated.
  27 +}
  28 +
  29 +/*
  30 +#pragma mark - Navigation
  31 +
  32 +// In a storyboard-based application, you will often want to do a little preparation before navigation
  33 +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
  34 + // Get the new view controller using [segue destinationViewController].
  35 + // Pass the selected object to the new view controller.
  36 +}
  37 +*/
  38 +
  39 +@end
... ...