改的

王军波
1 parent 94437476
Showing 6 changed files with 36 additions and 17 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/Classes/Sections/PGCSections/View/LVCTelevisionCell.h
LiveVideoCloud/Classes/Sections/PGCSections/View/LVCTelevisionCell.m
LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLiveListView.h → LiveVideoCloud/Classes/Sections/UGCSections/View/LVCUGCLiveListView.h
LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLiveListView.m → LiveVideoCloud/Classes/Sections/UGCSections/View/LVCUGCLiveListView.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerListController.m
@@ -259,7 +259,6 @@
 		D2EBC8711F02108000F198FB /* LiveListService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8661F02108000F198FB /* LiveListService.m */; };
 		D2EBC8721F02108000F198FB /* LVCLiveActivityInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */; };
 		D2EBC8741F02108000F198FB /* LVCUGCLiveListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC86C1F02108000F198FB /* LVCUGCLiveListController.m */; };
-		D2EBC8751F02108000F198FB /* LVCUGCLiveListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC86E1F02108000F198FB /* LVCUGCLiveListView.m */; };
 		D2EBC8761F02108000F198FB /* LVCUGCLivePlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8701F02108000F198FB /* LVCUGCLivePlayerController.m */; };
 		D2EBC87B1F02108F00F198FB /* LVCUGCLiveListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8781F02108F00F198FB /* LVCUGCLiveListModel.m */; };
 		D2EBC87C1F02108F00F198FB /* LVCUGCLivePlayerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC87A1F02108F00F198FB /* LVCUGCLivePlayerModel.m */; };
@@ -267,6 +266,7 @@
 		D2EBC8841F02109C00F198FB /* LVCUGCLivePlayerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8801F02109C00F198FB /* LVCUGCLivePlayerCell.m */; };
 		D2EBC8851F02109C00F198FB /* LVCUGCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8821F02109C00F198FB /* LVCUGCPlayerLoadingView.m */; };
 		D2EBC8881F0225D900F198FB /* LVCVodPlayerListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */; };
+		D2EBC88B1F02361600F198FB /* LVCUGCLiveListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC88A1F02361600F198FB /* LVCUGCLiveListView.m */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -812,8 +812,6 @@
 		D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveActivityInfoService.m; sourceTree = "<group>"; };
 		D2EBC86B1F02108000F198FB /* LVCUGCLiveListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListController.h; sourceTree = "<group>"; };
 		D2EBC86C1F02108000F198FB /* LVCUGCLiveListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListController.m; sourceTree = "<group>"; };
-		D2EBC86D1F02108000F198FB /* LVCUGCLiveListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListView.h; sourceTree = "<group>"; };
-		D2EBC86E1F02108000F198FB /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListView.m; sourceTree = "<group>"; };
 		D2EBC86F1F02108000F198FB /* LVCUGCLivePlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerController.h; sourceTree = "<group>"; };
 		D2EBC8701F02108000F198FB /* LVCUGCLivePlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerController.m; sourceTree = "<group>"; };
 		D2EBC8771F02108F00F198FB /* LVCUGCLiveListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListModel.h; sourceTree = "<group>"; };
@@ -828,6 +826,8 @@
 		D2EBC8821F02109C00F198FB /* LVCUGCPlayerLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCPlayerLoadingView.m; sourceTree = "<group>"; };
 		D2EBC8861F0225D900F198FB /* LVCVodPlayerListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerListController.h; sourceTree = "<group>"; };
 		D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerListController.m; sourceTree = "<group>"; };
+		D2EBC8891F02361600F198FB /* LVCUGCLiveListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListView.h; sourceTree = "<group>"; };
+		D2EBC88A1F02361600F198FB /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListView.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -2173,16 +2173,14 @@
 		D2EBC85F1F020F3C00F198FB /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				D2EBC8651F02108000F198FB /* LiveListService.h */,
-				D2EBC8661F02108000F198FB /* LiveListService.m */,
-				D2EBC8671F02108000F198FB /* LVCLiveActivityInfoService.h */,
-				D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */,
 				D2EBC86B1F02108000F198FB /* LVCUGCLiveListController.h */,
 				D2EBC86C1F02108000F198FB /* LVCUGCLiveListController.m */,
-				D2EBC86D1F02108000F198FB /* LVCUGCLiveListView.h */,
-				D2EBC86E1F02108000F198FB /* LVCUGCLiveListView.m */,
 				D2EBC86F1F02108000F198FB /* LVCUGCLivePlayerController.h */,
 				D2EBC8701F02108000F198FB /* LVCUGCLivePlayerController.m */,
+				D2EBC8651F02108000F198FB /* LiveListService.h */,
+				D2EBC8661F02108000F198FB /* LiveListService.m */,
+				D2EBC8671F02108000F198FB /* LVCLiveActivityInfoService.h */,
+				D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -2201,6 +2199,8 @@
 		D2EBC8611F020F3C00F198FB /* View */ = {
 			isa = PBXGroup;
 			children = (
+				D2EBC8891F02361600F198FB /* LVCUGCLiveListView.h */,
+				D2EBC88A1F02361600F198FB /* LVCUGCLiveListView.m */,
 				D2EBC87D1F02109C00F198FB /* LVCUGCBackgroundView.h */,
 				D2EBC87E1F02109C00F198FB /* LVCUGCBackgroundView.m */,
 				D2EBC87F1F02109C00F198FB /* LVCUGCLivePlayerCell.h */,
@@ -2451,6 +2451,7 @@
 				D2575C4A1E7685DE00E3A8FC /* UIView+Bubbling.m in Sources */,
 				D2EBC8571F01FF9200F198FB /* LVCCommentModel.m in Sources */,
 				D23BBDB81EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.m in Sources */,
+				D2EBC88B1F02361600F198FB /* LVCUGCLiveListView.m in Sources */,
 				D2029CA61E6EADE10027CD92 /* MJRefreshHeader.m in Sources */,
 				D2029CC41E6EADE10027CD92 /* UIImageView+WebCache.m in Sources */,
 				4B45CE801EB86A590079AFB7 /* idAndPwdView.m in Sources */,
@@ -2571,7 +2572,6 @@
 				D24CFC201EFA092300AA6ADB /* JBBannerView.m in Sources */,
 				D2029CBD1E6EADE10027CD92 /* SDWebImageManager.m in Sources */,
 				D2029CB41E6EADE10027CD92 /* UIView+MJExtension.m in Sources */,
-				D2EBC8751F02108000F198FB /* LVCUGCLiveListView.m in Sources */,
 				81FB5B3C1E7A6FFC00F98E1D /* SevenSwitch.m in Sources */,
 				D2EBC8761F02108000F198FB /* LVCUGCLivePlayerController.m in Sources */,
 				D2029CA91E6EADE10027CD92 /* MJRefreshAutoStateFooter.m in Sources */,
@@ -12,5 +12,6 @@
 @interface LVCTelevisionCell : UITableViewCell
 @property (nonatomic, strong) LVCTelevisionModel *model;
+@property (nonatomic, strong) ProgramModel *programModel;
 @end
@@ -35,6 +35,12 @@
 }
+- (void)setProgramModel:(ProgramModel *)programModel {
+    
+    [_imgView sd_setImageWithURL:[NSURL URLWithString:programModel.img] placeholderImage:[UIImage imageNamed:@"load_03"]];
+    _titleLab.text = programModel.title;
+}
+
 #pragma mark -
 #pragma mark - getter
 - (UIImageView *)imgView
@@ -7,6 +7,7 @@
 //
 #import "LVCVodPlayerListController.h"
+#import "LVCTelevisionCell.h"
 static NSString *vodCellId = @"vodCellId";
@@ -28,6 +29,8 @@ static NSString *vodCellId = @&quot;vodCellId&quot;;
     self.navigationItem.title = @"点播";
     self.view.backgroundColor = [UIColor whiteColor];
     _programArrayM = [[NSMutableArray alloc] init];
+    [self requestVodPlayerList];
+    [self.view addSubview:self.tableView];
 }
 - (void)requestVodPlayerList {
@@ -73,6 +76,16 @@ static NSString *vodCellId = @&quot;vodCellId&quot;;
 }
 #pragma mark - UITableViewDelegate !!!!!!!!!!!!!!!!!!!!!!!!
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    [tableView deselectRowAtIndexPath:indexPath animated:NO];
+    
+    
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return SCREEN_WIDTH*9/16+40;
+}
 #pragma mark - UITableViewDataSource !!!!!!!!!!!!!!!!!!!!!!!!
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
@@ -81,23 +94,22 @@ static NSString *vodCellId = @&quot;vodCellId&quot;;
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    return nil;
+    LVCTelevisionCell *cell = [tableView dequeueReusableCellWithIdentifier:vodCellId forIndexPath:indexPath];
+    
+    cell.programModel = _programArrayM[indexPath.row];
+    return cell;
 }
 #pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (UITableView *)tableView {
     if (!_tableView) {
-        _tableView = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStylePlain];
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height - 50) 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:[UITableViewCell class] forCellReuseIdentifier:vodCellId];
+        [_tableView registerClass:[LVCTelevisionCell class] forCellReuseIdentifier:vodCellId];
     }
     return _tableView;
 }