listVC替换为listView

王军波
1 parent a626ee2a
Showing 5 changed files with 78 additions and 36 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListController.h → LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListController.m → LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveLIstService.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCUGCLivePlayerCell.m
@@ -188,6 +188,7 @@
 		D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; };
 		D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB31E6EC154003A77C8 /* HomeViewController.m */; };
 		D2888DB71E6EC1B8003A77C8 /* LVCMyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB61E6EC1B8003A77C8 /* LVCMyViewController.m */; };
+		D28F5FFF1E8BC7EF00914142 /* LVCUGCLiveListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */; };
 		D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */; };
 		D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D29E81EC1E88DC5B008C9906 /* PriChatCell.m */; };
 		D2A089E81E89FA720071412C /* LVCUGCLivePlayerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */; };
@@ -203,7 +204,6 @@
 		D2B7B2511E8247D400ED084E /* ChatBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2501E8247D400ED084E /* ChatBarrageManager.m */; };
 		D2B7B2541E824B2D00ED084E /* ChatBarrageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */; };
 		D2B7B2571E8261EF00ED084E /* ChatBarrOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */; };
-		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 */; };
@@ -618,6 +618,8 @@
 		D2888DB31E6EC154003A77C8 /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; };
 		D2888DB51E6EC1B8003A77C8 /* LVCMyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCMyViewController.h; sourceTree = "<group>"; };
 		D2888DB61E6EC1B8003A77C8 /* LVCMyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMyViewController.m; sourceTree = "<group>"; };
+		D28F5FFD1E8BC7EF00914142 /* LVCUGCLiveListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListView.h; sourceTree = "<group>"; };
+		D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListView.m; sourceTree = "<group>"; };
 		D29D88461E88C53300543A03 /* LVCUGCLivePrepareView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePrepareView.h; sourceTree = "<group>"; };
 		D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePrepareView.m; sourceTree = "<group>"; };
 		D29E81EB1E88DC5B008C9906 /* PriChatCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriChatCell.h; sourceTree = "<group>"; };
@@ -640,8 +642,6 @@
 		D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageView.m; sourceTree = "<group>"; };
 		D2B7B2551E8261EF00ED084E /* ChatBarrOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrOperation.h; sourceTree = "<group>"; };
 		D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrOperation.m; sourceTree = "<group>"; };
-		D2CC7B851E891AA50034B8BF /* LVCUGCLiveListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListController.h; sourceTree = "<group>"; };
-		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>"; };
@@ -1653,8 +1653,8 @@
 				810B64E21E779AFE00133E15 /* LVCLivePlayerController.m */,
 				810B65081E77B39D00133E15 /* LVCFullScreenPlayerController.h */,
 				810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */,
-				D2CC7B851E891AA50034B8BF /* LVCUGCLiveListController.h */,
-				D2CC7B861E891AA50034B8BF /* LVCUGCLiveListController.m */,
+				D28F5FFD1E8BC7EF00914142 /* LVCUGCLiveListView.h */,
+				D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */,
 				D25BF87E1E7BD266007FB138 /* LVCUGCLivePlayerController.h */,
 				D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */,
 				81A483151E88BED00097A80A /* LVCTVLiveViewController.h */,
@@ -1902,6 +1902,7 @@
 				D2029CB81E6EADE10027CD92 /* SDImageCache.m in Sources */,
 				D2029CBB1E6EADE10027CD92 /* SDWebImageDownloader.m in Sources */,
 				D2029CA71E6EADE10027CD92 /* MJRefreshAutoGifFooter.m in Sources */,
+				D28F5FFF1E8BC7EF00914142 /* LVCUGCLiveListView.m in Sources */,
 				D2029CC11E6EADE10027CD92 /* UIImage+MultiFormat.m in Sources */,
 				D245715F1E83B09900AA85D6 /* userInfoModel.m in Sources */,
 				D2029C861E6EADE10027CD92 /* Tools.m in Sources */,
@@ -2034,7 +2035,6 @@
 				D2029D081E6EAE2E0027CD92 /* ZXDeviceInfo.m in Sources */,
 				D24571631E83C40B00AA85D6 /* PrivateView.m in Sources */,
 				D2029CC21E6EADE10027CD92 /* UIImage+WebP.m in Sources */,
-				D2CC7B871E891AA50034B8BF /* LVCUGCLiveListController.m in Sources */,
 				D2029BCD1E6EADD70027CD92 /* BaseViewController.m in Sources */,
 				810B64E01E779AE900133E15 /* LVCPlayer.m in Sources */,
 				810B64FF1E779B1F00133E15 /* MASConstraint.m in Sources */,
 //
-//  LVCUGCLiveListController.h
+//  LVCUGCLiveListView.h
 //  LiveVideoCloud
 //
-//  Created by cnliveJunBo on 17/3/27.
+//  Created by cnliveJunBo on 17/3/29.
 //  Copyright © 2017年 cnlive. All rights reserved.
 //
 #import <UIKit/UIKit.h>
-@interface LVCUGCLiveListController : UIViewController
+@interface LVCUGCLiveListView : UIView
 @end
 //
-//  LVCUGCLiveListController.m
+//  LVCUGCLiveListView.m
 //  LiveVideoCloud
 //
-//  Created by cnliveJunBo on 17/3/27.
+//  Created by cnliveJunBo on 17/3/29.
 //  Copyright © 2017年 cnlive. All rights reserved.
 //
-#import "LVCUGCLiveListController.h"
+#import "LVCUGCLiveListView.h"
 #import "LiveLIstService.h"
-#import "LVCUGCLiveListModel.h"
 #import "LVCUGCLivePlayerCell.h"
+#import "LVCUGCLiveListModel.h"
 #import "LVCUGCLivePlayerModel.h"
 static NSString *cellId = @"cellId";
-@interface LVCUGCLiveListController ()<UICollectionViewDelegate, UICollectionViewDataSource>
+@interface LVCUGCLiveListView()<UICollectionViewDelegate, UICollectionViewDataSource> {
+    
+    NSMutableArray *_arrayM;
+}
 @property (nonatomic, strong) UICollectionView *collectionView;
+
+
 @end
-@implementation LVCUGCLiveListController
+@implementation LVCUGCLiveListView
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    self.view.backgroundColor = [UIColor whiteColor];
-    
-    [self loadData];
-    
-    [self.view addSubview:self.collectionView];
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = [UIColor whiteColor];
+        
+        _arrayM = [[NSMutableArray alloc] init];
+        
+        [self loadData];
+        
+        [self addSubview:self.collectionView];
+    }
+    return self;
 }
 - (void)loadData {
@@ -44,8 +55,9 @@ static NSString *cellId = @&quot;cellId&quot;;
         LVCUGCLiveListModel *model = [LVCUGCLiveListModel modelWithDic:data];
         NSLog(@"%@",model.activityList);
+        _arrayM = model.activityList.mutableCopy;
     }];
-
+    
 }
 #pragma mark - UICollectionViewDelegate, UICollectionViewDataSource  !!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -56,7 +68,7 @@ static NSString *cellId = @&quot;cellId&quot;;
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
-    return 6;
+    return _arrayM.count;
 }
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
@@ -71,6 +83,11 @@ static NSString *cellId = @&quot;cellId&quot;;
     return cell;
 }
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+    
+    
+}
+
 #pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (UICollectionView *)collectionView {
@@ -78,8 +95,8 @@ static NSString *cellId = @&quot;cellId&quot;;
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
         layout.minimumLineSpacing = 10;
         layout.minimumInteritemSpacing = 0;
-        layout.itemSize = CGSizeMake(SCREEN_WIDTH, SCREEN_HEIGHT * 0.6);
-        _collectionView = [[UICollectionView alloc] initWithFrame:self.view.bounds collectionViewLayout:layout];
+        layout.itemSize = CGSizeMake(SCREEN_WIDTH, SCREEN_WIDTH + 70);
+        _collectionView = [[UICollectionView alloc] initWithFrame:self.bounds collectionViewLayout:layout];
         _collectionView.backgroundColor = [UIColor lightGrayColor];
         _collectionView.showsHorizontalScrollIndicator = NO;
         _collectionView.dataSource = self;
@@ -89,9 +106,5 @@ static NSString *cellId = @&quot;cellId&quot;;
     return _collectionView;
 }
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
 @end
@@ -17,8 +17,8 @@
     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"];
+                                      @"appId": AppId} mutableCopy];
+    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [self sortParameters:parameter], AppKey];
     NSString *signString = [[self sha1:string] uppercaseString];
     [parameter setObject:signString forKey:@"sign"];
@@ -18,6 +18,8 @@
 @property (nonatomic, strong) UILabel *countLabel;
+@property (nonatomic, strong) UILabel *lookLabel;
+
 @property (nonatomic, strong) UIImageView *imageView;
 @property (nonatomic, strong) UILabel *stateLabel;
@@ -35,6 +37,10 @@
         self.contentView.backgroundColor = [UIColor whiteColor];
         [self.contentView addSubview:self.iconView];
         [self.contentView addSubview:self.nameLabel];
+        [self.contentView addSubview:self.locationLabel];
+        [self.contentView addSubview:self.countLabel];
+        [self.contentView addSubview:self.lookLabel];
+        [self.contentView addSubview:self.imageView];
     }
     return self;
 }
@@ -63,29 +69,52 @@
 - (UILabel *)nameLabel {
     if (!_nameLabel) {
-        _nameLabel = [[UILabel alloc] initWithFrame:CGRectMake(70, 10, SCREEN_WIDTH - 100, 20)];
+        _nameLabel = [[UILabel alloc] initWithFrame:CGRectMake(70, 15, SCREEN_WIDTH - 140, 20)];
         _nameLabel.text = @"这是我的昵称";
+        _nameLabel.textColor = [UIColor grayColor];
     }
     return _nameLabel;
 }
 - (UILabel *)locationLabel {
     if (!_locationLabel) {
-        
+        _locationLabel = [[UILabel alloc] initWithFrame:CGRectMake(70, 40, SCREEN_WIDTH - 140, 20)];
+        _locationLabel.text = @"这是我的地址";
+        _locationLabel.font = [UIFont systemFontOfSize:13];
+        _locationLabel.textColor = [UIColor grayColor];
     }
     return _locationLabel;
 }
 - (UILabel *)countLabel {
     if (!_countLabel) {
-        
+        _countLabel = [[UILabel alloc] initWithFrame:CGRectMake(SCREEN_WIDTH - 65, 15, 60, 20)];
+        _countLabel.text = @"13244";
+        _countLabel.textAlignment = NSTextAlignmentRight;
+        _countLabel.textColor = [UIColor orangeColor];
     }
     return _countLabel;
 }
+- (UILabel *)lookLabel {
+    if (!_lookLabel) {
+        _lookLabel = [[UILabel alloc] initWithFrame:CGRectMake(SCREEN_WIDTH - 45, 35, 40, 20)];
+        _lookLabel.text = @"在看";
+        _lookLabel.font = [UIFont systemFontOfSize:13];
+        _lookLabel.textAlignment = NSTextAlignmentRight;
+        _lookLabel.textColor = [UIColor grayColor];
+    }
+    return _lookLabel;
+}
+
 - (UIImageView *)imageView {
     if (!_imageView) {
-        
+        NSString *path = [[NSBundle mainBundle] pathForResource:@"timg" ofType:@"jpeg"];
+        UIImage *image = [UIImage imageWithContentsOfFile:path];
+        _imageView = [[UIImageView alloc] initWithImage:image];
+        _imageView.frame = CGRectMake(0, 70, SCREEN_WIDTH, SCREEN_WIDTH);
+        _imageView.contentMode = UIViewContentModeScaleAspectFill;
+        _imageView.clipsToBounds = YES;
     }
     return _imageView;
 }